Browse Source

Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

AddValidOverTime
shanji 2 years ago
parent
commit
451deb5abd
  1. 32
      BBWY.Client/APIServices/PackDetailService.cs
  2. 49
      BBWY.Client/APIServices/PackServiceService.cs
  3. 178
      BBWY.Client/APIServices/PackTaskService.cs
  4. 16
      BBWY.Client/Models/APIModel/Response/PackTask/FeesItemResponse.cs
  5. 15
      BBWY.Client/Models/APIModel/Response/PackTask/PackServiceRequest.cs
  6. 9
      BBWY.Client/Models/APIModel/Response/PackTask/PackServiceResponse.cs
  7. 71
      BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuResponse.cs
  8. 5
      BBWY.Client/Models/Enums.cs
  9. 12
      BBWY.Client/Models/PackTask/PackItemModel.cs
  10. 1
      BBWY.Client/Models/PackTask/PackTaskModel.cs
  11. 81
      BBWY.Client/Models/PackTask/ShopTotal.cs
  12. 5
      BBWY.Client/Models/PackTask/WorkProcessModel.cs
  13. 7
      BBWY.Client/ViewModels/MainViewModel.cs
  14. 54
      BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
  15. 301
      BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs
  16. 246
      BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
  17. 3
      BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
  18. 2
      BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
  19. 11
      BBWY.Client/ViewModels/ViewModelLocator.cs
  20. 2
      BBWY.Client/Views/MainWindow.xaml
  21. 49
      BBWY.Client/Views/PackTask/FeesExcelControl.xaml.cs
  22. 329
      BBWY.Client/Views/PackTask/PackTaskTotal.xaml
  23. 26
      BBWY.Client/Views/PackTask/PackTaskTotal.xaml.cs
  24. 17
      BBWY.Client/Views/PackTask/ServiceWindow.xaml
  25. 19
      BBWY.Client/Views/PackTask/ServiceWindow.xaml.cs
  26. 2
      BBWY.Client/Views/PackTask/TaskListControl.xaml
  27. 2
      BBWY.Client/Views/PackTask/WareHouseListControl.xaml
  28. 2
      BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs

32
BBWY.Client/APIServices/PackDetailService.cs

@ -0,0 +1,32 @@
using BBWY.Client.Models.APIModel.Response.PackTask;
using BBWY.Common.Http;
using BBWY.Common.Models;
using System;
using System.Collections.Generic;
using System.Net.Http;
using System.Text;
namespace BBWY.Client.APIServices
{
public class PackDetailService : BaseApiService, IDenpendency
{
public PackDetailService(RestApiService restApiService, GlobalContext globalContext) : base(restApiService, globalContext)
{
}
public ApiResponse<PackServiceResponse> GetTaskService(long TaskId)
{
return SendRequest<PackServiceResponse>(globalContext.QKApiHost, $"api/PackDetail/GetTaskService?taskId={TaskId}",
null
, null, HttpMethod.Get);
}
public ApiResponse<object> UploadService(UploadServiceRequest consumable)
{
return SendRequest<object>(globalContext.QKApiHost, "api/PackDetail/UploadService",
consumable
, null, HttpMethod.Post);
}
}
}

49
BBWY.Client/APIServices/PackServiceService.cs

@ -0,0 +1,49 @@
using BBWY.Client.Models.APIModel.Response.PackTask;
using BBWY.Client.Models.PackTask;
using BBWY.Common.Http;
using BBWY.Common.Models;
using System;
using System.Collections.Generic;
using System.Net.Http;
using System.Text;
namespace BBWY.Client.APIServices
{
public class PackServiceService : BaseApiService,IDenpendency
{
public PackServiceService(RestApiService restApiService, GlobalContext globalContext) : base(restApiService, globalContext)
{
}
public ApiResponse<PackServiceDTO[]> SearchAll()
{
return SendRequest<PackServiceDTO[]>(globalContext.QKApiHost, "api/PackService/SearchAll",
null
, null, HttpMethod.Get);
}
public ApiResponse<object> Add(PackServiceDTO consumable)
{
return SendRequest<object>(globalContext.QKApiHost, "api/PackService/Add",
consumable
, null, HttpMethod.Post);
}
public ApiResponse<object> Edit(PackServiceDTO consumable)
{
return SendRequest<object>(globalContext.QKApiHost, "api/PackService/Edit",
consumable
, null, HttpMethod.Post);
}
public ApiResponse<object> Deleted(long id)
{
return SendRequest<object>(globalContext.QKApiHost, "api/PackService/Deleted",
new
{
id = id
}
, null, HttpMethod.Get);
}
}
}

178
BBWY.Client/APIServices/PackTaskService.cs

@ -35,7 +35,7 @@ namespace BBWY.Client.APIServices
) )
{ {
return SendRequest<PackTaskResultResponse>(globalContext.QKApiHost, "api/PackTask/GetPackTaskList", new return SendRequest<PackTaskResultResponse>(globalContext.QKApiHost, "api/PackTask/SearchNewPackTaskList", new
{ {
SkuId = skuId, SkuId = skuId,
@ -59,7 +59,7 @@ namespace BBWY.Client.APIServices
) )
{ {
return SendRequest<PackTaskResultResponse>(globalContext.QKApiHost, "api/PackTask/GetPackTaskList", new return SendRequest<PackTaskResultResponse>(globalContext.QKApiHost, "api/PackTask/SearchNewPackTaskList", new
{ {
IsWorry=isWorry, IsWorry=isWorry,
DepartmentName = departmentName, DepartmentName = departmentName,
@ -122,7 +122,8 @@ namespace BBWY.Client.APIServices
{ {
return SendRequest<object>(globalContext.QKApiHost, "api/PackTask/DeletedPackTask", return SendRequest<object>(globalContext.QKApiHost, "api/PackTask/DeletedPackTask",
new { new {
TaskId = taskId TaskId = taskId,
UserId = globalContext.User.Id.ToString()
} }
, null, HttpMethod.Post); , null, HttpMethod.Post);
} }
@ -190,40 +191,39 @@ namespace BBWY.Client.APIServices
} }
//public ApiResponse<object> AddTaskPeople(long taskId, string packUserId, int FeesTypeId, public ApiResponse<ShopTotalResponse> ShopTotal(string skuId = null, string taskId = null,
// int FeesItemId, decimal PackNumber) DateTime? startTime = null,
//{ DateTime? endTime = null,
string ShopName = null,
string DepartmentName = null,
int pageIndex = 1,
// return SendRequest<object>(globalContext.QKApiHost, "api/PackTask/AddTaskPeople", new int pageSize = 10
// {
// taskId = taskId,
// packUserId = packUserId,
// FeesTypeId = FeesTypeId,
// FeesItemId = FeesItemId,
// PackNumber = PackNumber
// }
// , null, HttpMethod.Post);
//} )
{
return SendRequest<ShopTotalResponse>(globalContext.QKApiHost, "api/PackTask/ShopTotal", new
{
//public ApiResponse<object> AddTaskPeople(List<PackUserRequest> packUsers) SkuId = skuId,
//{ TaskId = taskId,
// return SendRequest<object>(globalContext.QKApiHost, "api/PackTask/AddTaskPeoples", packUsers StartTime = startTime,
// , null, HttpMethod.Post); EndTime = endTime,
//} DepartmentName,
ShopName,
PageIndex = pageIndex,
PageSize = pageSize
}, null, HttpMethod.Post);
}
public ApiResponse<ShopTotalResponse> BatchSettle(params long[] taskIds)
{
return SendRequest<ShopTotalResponse>(globalContext.QKApiHost, "api/PackTask/BatchSettle", new
{
taskIds= taskIds,
userId= globalContext.User.Id.ToString(),
//public ApiResponse<object> AddConsumables(long taskId, long[] consumableIds) }, null, HttpMethod.Post);
//{ }
// return SendRequest<object>(globalContext.QKApiHost, "api/PackTask/AddConsumables", new AddConsumableRequest
// {
// TaskId= taskId,
// ConsumableIds = consumableIds
// }
// , null, HttpMethod.Post);
//}
} }
public class AddConsumableRequest public class AddConsumableRequest
@ -238,7 +238,10 @@ namespace BBWY.Client.APIServices
public class UploadServiceRequest public class UploadServiceRequest
{ {
/// <summary>
/// 折扣
/// </summary>
public decimal Discount { get; set; } = 1;
/// <summary> /// <summary>
/// 任务id /// 任务id
@ -268,6 +271,9 @@ namespace BBWY.Client.APIServices
/// 增值服务数量 /// 增值服务数量
/// </summary> /// </summary>
public string IncreateServiceNos { get; set; } public string IncreateServiceNos { get; set; }
public string PackServiceIds { get; set; }
public string PackServiceNos { get; set; }
/// <summary> /// <summary>
/// 任务单件费用 /// 任务单件费用
/// </summary> /// </summary>
@ -277,12 +283,28 @@ namespace BBWY.Client.APIServices
/// </summary> /// </summary>
public decimal AllFees { get; set; } public decimal AllFees { get; set; }
/// <summary>
/// 增加数据
/// </summary>
public List<PersonTaskModel> AddPackServices { get; set; }
/// <summary>
/// 删除的数据
/// </summary>
public List<long> DeletedPackServices { get; set; }
public PersonTaskModel[] PersonTaskModels { get; set; } //public PersonTaskModel[] PersonTaskModels { get; set; }
//public IncreateMemberModel[] IncreateMembers { get; set; } //public IncreateMemberModel[] IncreateMembers { get; set; }
//public ProcessMemberModel[] ProcessMembers { get; set; } //public ProcessMemberModel[] ProcessMembers { get; set; }
public decimal? IncreaseFees { get; set; }
public decimal? PackFees { get; set; }
public decimal? ConsumableFees { get; set; }
public decimal? DiscountPrice { get; set; }
} }
public class PersonTaskModel public class PersonTaskModel
@ -296,22 +318,40 @@ namespace BBWY.Client.APIServices
/// 打包人 /// 打包人
/// </summary> /// </summary>
public string PackUserId { get; set; } public string PackUserId { get; set; }
/// <summary> /// <summary>
/// 增值服务ids /// 服务id
/// </summary> /// </summary>
public string IncreateServiceIds { get; set; } public long ServiceId { get; set; }
/// <summary> /// <summary>
/// 增值服务数量 /// 服务数量
/// </summary> /// </summary>
public string IncreateServiceNos { get; set; } public int ServiceCount { get; set; }
///// <summary>
///// 增值服务ids
///// </summary>
//public string IncreateServiceIds { get; set; }
///// <summary>
///// 增值服务数量
///// </summary>
//public string IncreateServiceNos { get; set; }
///// <summary>
///// 工序ids
///// </summary>
//public string WorkProcessIds { get; set; }
///// <summary>
///// 工序数量
///// </summary>
//public string WorkProcessNos { get; set; }
/// <summary> /// <summary>
/// 工序ids ///
/// </summary> /// </summary>
public string WorkProcessIds { get; set; } public bool IsDeleted { get; set; }
/// <summary> /// <summary>
/// 工序数量 /// 折扣
/// </summary> /// </summary>
public string WorkProcessNos { get; set; } public decimal Discount { get; set; } = 1;
/// <summary> /// <summary>
/// 总费用 /// 总费用
/// </summary> /// </summary>
@ -320,6 +360,8 @@ namespace BBWY.Client.APIServices
/// 时间 /// 时间
/// </summary> /// </summary>
public DateTime CreateTime { get; set; } = DateTime.Now; public DateTime CreateTime { get; set; } = DateTime.Now;
public ServiceType ServiceType { get; set; }
} }
@ -337,7 +379,8 @@ namespace BBWY.Client.APIServices
public int ConsumableCount { get; set; } public int ConsumableCount { get; set; }
} }
public class IncreateMemberModel
public class PackServiceMemberModel
{ {
public decimal Price { get; set; } public decimal Price { get; set; }
@ -345,27 +388,44 @@ namespace BBWY.Client.APIServices
/// <summary> /// <summary>
/// 增值服务Id /// 增值服务Id
/// </summary> /// </summary>
public long IncreateId { get; set; } public long PackServiceId { get; set; }
/// <summary> /// <summary>
/// 数量 /// 数量
/// </summary> /// </summary>
public int IncreateCount { get; set; } public int PackServiceCount { get; set; }
public ServiceType ServiceType { get; set; }
} }
public class ProcessMemberModel
{
public decimal Price { get; set; }
public string UserId { get; set; }
/// <summary>
/// 工序服务Id
/// </summary>
public long ProcessId { get; set; }
/// <summary> //public class IncreateMemberModel
/// 工序服务数量 //{
/// </summary> // public decimal Price { get; set; }
public int ProcessCount { get; set; }
} // public string UserId { get; set; }
// /// <summary>
// /// 增值服务Id
// /// </summary>
// public long IncreateId { get; set; }
// /// <summary>
// /// 数量
// /// </summary>
// public int IncreateCount { get; set; }
//}
//public class ProcessMemberModel
//{
// public decimal Price { get; set; }
// public string UserId { get; set; }
// /// <summary>
// /// 工序服务Id
// /// </summary>
// public long ProcessId { get; set; }
// /// <summary>
// /// 工序服务数量
// /// </summary>
// public int ProcessCount { get; set; }
//}

16
BBWY.Client/Models/APIModel/Response/PackTask/FeesItemResponse.cs

@ -13,16 +13,28 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
private List<ServiceItemResponse> serviceList = new List<ServiceItemResponse>(); private List<ServiceItemResponse> serviceList = new List<ServiceItemResponse>();
public List<ServiceItemResponse> ServiceList { get => serviceList; set { Set(ref serviceList, value); } } public List<ServiceItemResponse> ServiceList { get => serviceList; set { Set(ref serviceList, value); } }
public decimal disCount;
public decimal DisCount { get => disCount; set { Set(ref disCount, value); } }
public decimal AllFees { get=> allFees; set { Set(ref allFees, value);
public decimal AllFees { get=> allFees; set { Set(ref allFees, value); } } } }
private decimal allFees; private decimal allFees;
public decimal SingleFees { get => singleFees; set { Set(ref singleFees, value); } } private decimal discountAllFees;
public decimal DiscountAllFees { get => discountAllFees; set { Set(ref discountAllFees, value); } }
public decimal SingleFees { get => singleFees; set { Set(ref singleFees, value);
} }
private decimal singleFees; private decimal singleFees;
public decimal DiscountSingleFees { get => discountSingleFees; set { Set(ref discountSingleFees, value); } }
private decimal discountSingleFees;
public decimal TaskId { get => taskId; set { Set(ref taskId, value); } } public decimal TaskId { get => taskId; set { Set(ref taskId, value); } }
private decimal taskId; private decimal taskId;
} }
public enum ServiceType public enum ServiceType

15
BBWY.Client/Models/APIModel/Response/PackTask/PackServiceRequest.cs

@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace BBWY.Client.Models.APIModel.Response.PackTask
{
public class PackServiceRequest
{
public long Id { get; set; }
public string Name { get; set; }
public decimal Price { get; set; }
public ServiceType ServiceType { get; set; }
}
}

9
BBWY.Client/Models/APIModel/Response/PackTask/PackServiceResponse.cs

@ -7,6 +7,7 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
{ {
public class PackServiceResponse public class PackServiceResponse
{ {
public decimal Discount { get; set; }
/// <summary> /// <summary>
/// 增值服务数据 /// 增值服务数据
/// </summary> /// </summary>
@ -21,6 +22,14 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
public List<PackItemModelResponse> ConsumableServiceList { get; set; } public List<PackItemModelResponse> ConsumableServiceList { get; set; }
} }
public class PackServiceDTO
{
public long Id { get; set; }
public string Name { get; set; }
public decimal Price { get; set; }
public ServiceType ServiceType { get; set; }
}
public class PackItemModelResponse public class PackItemModelResponse
{ {

71
BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuResponse.cs

@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Text; using System.Text;
namespace BBWY.Client.Models.APIModel.Response.PackTask namespace BBWY.Client.Models.APIModel.Response.PackTask
@ -41,7 +42,7 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
public string ProductId { get; set; } public string ProductId { get; set; }
public PackConfig PackConfig { get; set; }
public BarCodeModel BarCodeModel { get; set; } public BarCodeModel BarCodeModel { get; set; }
@ -57,7 +58,75 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
public CertificateModel SpuCertificate { get; set; } public CertificateModel SpuCertificate { get; set; }
} }
public class PackConfig
{
/// <summary>
/// skuid
/// </summary>
[Key]
public string SkuId { get; set; }
/// <summary>
/// 货号品名(手写上传)
/// </summary>
public string BrandName { get; set; }
/// <summary>
/// 组合类型(单件=0,多件=1)
/// </summary>
public int PackType { get; set; }
/// <summary>
/// 基础包装(快递袋=0,纸箱=1,麻袋=2)
/// </summary>
public int BasicPack { get; set; }
/// <summary>
/// 增量1()
/// </summary>
public string Increment1 { get; set; }
/// <summary>
/// 条形码id
/// </summary>
public long? BarcodeId { get; set; }
/// <summary>
/// 合格证
/// </summary>
public long? CertificateId { get; set; }
/// <summary>
/// 合格证位置(外部包装=0,产品包装=1)
/// </summary>
public int? CertificatePosition { get; set; }
/// <summary>
/// sku配件名称
/// </summary>
public string SkuGoodsTitle { get; set; }
/// <summary>
/// 配件数
/// </summary>
public int GoodsNumber { get; set; }
/// <summary>
/// 注意事项(对接备注)
/// </summary>
public string MarkMessage { get; set; }
/// <summary>
/// 到货情况(待收货=2,部分收货=1,已到货=0)
/// </summary>
public int Availability { get; set; }
}
} }

5
BBWY.Client/Models/Enums.cs

@ -379,4 +379,9 @@
{ {
= 0, = 1, = 2, = 3, = 4, = 5, = 6, = 7 = 0, = 1, = 2, = 3, = 4, = 5, = 6, = 7
} }
public enum Settle
{
= 0,
= 1
}
} }

12
BBWY.Client/Models/PackTask/PackItemModel.cs

@ -1,4 +1,5 @@
using BBWY.Client.APIServices; using BBWY.Client.APIServices;
using BBWY.Client.Models.APIModel.Response.PackTask;
using GalaSoft.MvvmLight.Command; using GalaSoft.MvvmLight.Command;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -36,8 +37,8 @@ namespace BBWY.Client.Models.PackTask
private ObservableCollection<IncreateServiceModel> increateServiceList; private ObservableCollection<PackServiceDTO> increateServiceList;
public ObservableCollection<IncreateServiceModel> IncreateServiceList public ObservableCollection<PackServiceDTO> IncreateServiceList
{ {
get => increateServiceList; set get => increateServiceList; set
{ {
@ -57,8 +58,11 @@ namespace BBWY.Client.Models.PackTask
public ObservableCollection<ConsumableModel> ConsumableList public ObservableCollection<ConsumableModel> ConsumableList
{ get => consumableList; set { Set(ref consumableList, value); } } { get => consumableList; set { Set(ref consumableList, value); } }
private ObservableCollection<WorkProcessModel> packServiceList; /// <summary>
public ObservableCollection<WorkProcessModel> PackServiceList { get => packServiceList; set { Set(ref packServiceList, value); } } /// 工序服务
/// </summary>
private ObservableCollection<PackServiceDTO> packServiceList;
public ObservableCollection<PackServiceDTO> PackServiceList { get => packServiceList; set { Set(ref packServiceList, value); } }
/// <summary> /// <summary>
/// 设置列表的 是否编辑属性 /// 设置列表的 是否编辑属性
/// </summary> /// </summary>

1
BBWY.Client/Models/PackTask/PackTaskModel.cs

@ -113,6 +113,7 @@ namespace BBWY.Client.Models
{ {
FeesItemResponse = feesItem; FeesItemResponse = feesItem;
PackUser = string.Join("\r\n", packUsers); PackUser = string.Join("\r\n", packUsers);
IsShowFees = feesItem.AllFees > 0 ? true : false; IsShowFees = feesItem.AllFees > 0 ? true : false;
}); });
service.Show(); service.Show();

81
BBWY.Client/Models/PackTask/ShopTotal.cs

@ -0,0 +1,81 @@
using BBWY.Client.ViewModels;
using System;
using System.Collections.Generic;
using System.Text;
namespace BBWY.Client.Models.PackTask
{
public class ShopTotal :NotifyObject
{
private long id;
public long Id { get => id; set { Set(ref id, value); } }
private bool taskChecked;
public bool TaskChecked { get => taskChecked; set { Set(ref taskChecked, value); } }
public long TaskId { get; set; }
/// <summary>
/// 需求方创建日期
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 是否结清
/// </summary>
//
public Settle IsSettle { get; set; }
/// <summary>
/// 部门
/// </summary>
public string DepartmentName { get; set; }
/// <summary>
/// 店铺
/// </summary>
public string ShopName { get; set; }
/// <summary>
/// 对接人
/// </summary>
public string AcceptUserName { get; set; }
/// <summary>
/// sku
/// </summary>
public string SkuName { get; set; }
/// <summary>
/// sku数量(任务数量)
/// </summary>
public int SkuCount { get; set; }
public decimal IncreaseFees { get; set; }
public decimal PackFees { get; set; }
public decimal ConsumableFees { get; set; }
public decimal Price { get; set; }
public decimal Discount { get; set; }
public decimal DiscountPrice { get; set; }
/// <summary>
/// 注意事项(对接备注)
/// </summary>
public string MarkMessage { get; set; }
public override string ToString()
{
return $"{TaskId},{CreateTime.ToString("yyyy-MM-dd")},{IsSettle},{DepartmentName},{ShopName}" +
$",{AcceptUserName},{SkuName},{SkuCount},{IncreaseFees},{PackFees},{ConsumableFees},{Price},{Discount},{DiscountPrice},{MarkMessage}";
}
}
public class ShopTotalResponse
{
/// <summary>
///
/// </summary>
public int TotalCount { get; set; }
public ShopTotal[] ShopTotals { get; set; }
}
}

5
BBWY.Client/Models/PackTask/WorkProcessModel.cs

@ -1,7 +1,4 @@
using Org.BouncyCastle.Asn1.Esf; 
using System;
using System.Collections.Generic;
using System.Text;
namespace BBWY.Client.Models.PackTask namespace BBWY.Client.Models.PackTask
{ {

7
BBWY.Client/ViewModels/MainViewModel.cs

@ -130,7 +130,8 @@ namespace BBWY.Client.ViewModels
ChildList = new List<MenuModel>() ChildList = new List<MenuModel>()
{ {
new MenuModel(){ Name="打包任务",Url="/Views/PackTask/WareHouseList.xaml" }, new MenuModel(){ Name="打包任务",Url="/Views/PackTask/WareHouseList.xaml" },
new MenuModel(){ Name="耗材管理",Url="/Views/PackTask/Consumable.xaml" } new MenuModel(){ Name="耗材管理",Url="/Views/PackTask/Consumable.xaml" },
new MenuModel(){ Name="账单管理",Url="/Views/PackTask/PackTaskTotal.xaml" }
} }
}); });
@ -208,8 +209,8 @@ namespace BBWY.Client.ViewModels
ChildList = new List<MenuModel>() ChildList = new List<MenuModel>()
{ {
new MenuModel(){ Name="打包任务",Url="/Views/PackTask/WareHouseList.xaml" }, new MenuModel(){ Name="打包任务",Url="/Views/PackTask/WareHouseList.xaml" },
new MenuModel(){ Name="耗材管理",Url="/Views/PackTask/Consumable.xaml" } new MenuModel(){ Name="耗材管理",Url="/Views/PackTask/Consumable.xaml" },
new MenuModel(){ Name="账单管理",Url="/Views/PackTask/PackTaskTotal.xaml" }
} }
}); });
}); });

54
BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs

@ -9,23 +9,15 @@ using BBWY.Common.Models;
using BBWY.Common.Trigger; using BBWY.Common.Trigger;
using GalaSoft.MvvmLight.Command; using GalaSoft.MvvmLight.Command;
using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Messaging;
using NPOI.Util;
using Org.BouncyCastle.Asn1.Crmf;
using Org.BouncyCastle.Asn1.Ocsp;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Data; using System.Data;
using System.Linq; using System.Linq;
using System.Runtime.CompilerServices;
using System.Security.AccessControl;
using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
namespace BBWY.Client.ViewModels.PackTask namespace BBWY.Client.ViewModels.PackTask
{ {
@ -407,10 +399,10 @@ namespace BBWY.Client.ViewModels.PackTask
public ICommand SetSpuCerCommand { get; set; } public ICommand SetSpuCerCommand { get; set; }
public ICommand SaveSpuCerCommand { get; set; } public ICommand SaveSpuCerCommand { get; set; }
public ICommand InseartCerCommand { get; set; } public ICommand InseartCerCommand { get; set; }
string[] increates = new string[] { "气泡纸", "气泡袋", "POP袋", "折纸箱", "气泡纸封边", "彩盒", "剪胶", "剪彩带", "快递袋", "收纳盒", "纸箱子", "装纸箱", "封边", "胶带", "折彩盒" };
public void InitData(PackTaskModel model = null) public void InitData(PackTaskModel model = null)
{ {
string[] increates = new string[] { "气泡纸", "气泡袋", "POP袋", "折纸箱", "气泡纸封边", "彩盒", "剪胶", "剪彩带", "快递袋", "收纳盒", "纸箱子", "装纸箱", "封边", "胶带", "折彩盒" };
IncreateList = new ObservableCollection<IncreateModel>(); IncreateList = new ObservableCollection<IncreateModel>();
SpuId = string.Empty; SpuId = string.Empty;
if (model == null) if (model == null)
@ -446,11 +438,8 @@ namespace BBWY.Client.ViewModels.PackTask
return; return;
} }
SaveTask = "保存"; SaveTask = "保存";
Logo = model.ItemList[0].Logo; Logo = model.ItemList[0].Logo;
SearchSkuId = model.SkuId; SearchSkuId = model.SkuId;
SkuId = model.SkuId; SkuId = model.SkuId;
SkuCount = model.SkuCount; SkuCount = model.SkuCount;
SkuName = model.ItemList[0].SkuName; SkuName = model.ItemList[0].SkuName;
@ -483,11 +472,13 @@ namespace BBWY.Client.ViewModels.PackTask
{ {
isSelected = true; isSelected = true;
} }
App.Current.Dispatcher.Invoke(() => {
IncreateList.Add(new IncreateModel IncreateList.Add(new IncreateModel
{ {
IncreateName = item, IncreateName = item,
IsSelected = isSelected IsSelected = isSelected
}); });
});
} }
SearchSku(); SearchSku();
@ -510,7 +501,7 @@ namespace BBWY.Client.ViewModels.PackTask
IsSetCertificate = true; IsSetCertificate = true;
//数据库获取增量耗材数据 //数据库获取增量耗材数据
string[] increates = new string[] { "气泡纸", "气泡袋", "POP袋", "折纸箱", "气泡纸封边", "彩盒", "剪胶", "剪彩带", "快递袋", "收纳盒", "纸箱子", "装纸箱", "封边", "胶带", "折彩盒" };
IncreateList = new ObservableCollection<IncreateModel>(); IncreateList = new ObservableCollection<IncreateModel>();
foreach (var item in increates) foreach (var item in increates)
{ {
@ -979,6 +970,39 @@ namespace BBWY.Client.ViewModels.PackTask
IsLoading = false; IsLoading = false;
return; return;
} }
if (productSku.Data.PackConfig!=null)
{
var config = productSku.Data.PackConfig;
SkuTitle = config.SkuGoodsTitle;
GoodsNumber = config.GoodsNumber;
PackType = (PackType)config.PackType;
BasicPack=(BasicPack)config.BasicPack;
Availability =(TaskState)config.Availability;
MarkMessage = config.MarkMessage;
CertificatePosition = config.CertificatePosition==null? CertificatePosition .: (CertificatePosition)config.CertificatePosition.Value;
// Increment1 = config.Increment1;
string[] increateDatas = config.Increment1.Split(',');
bool isSelected = false;
foreach (var item in increates)
{
isSelected = false;
if (increateDatas.Contains(item))
{
isSelected = true;
}
App.Current.Dispatcher.Invoke(() => {
IncreateList.Add(new IncreateModel
{
IncreateName = item,
IsSelected = isSelected
});
});
}
}
BrandName = productSku.Data.BrandName; BrandName = productSku.Data.BrandName;

301
BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs

@ -9,12 +9,14 @@ using BBWY.Client.Views.PackTask;
using BBWY.Common.Models; using BBWY.Common.Models;
using GalaSoft.MvvmLight.Command; using GalaSoft.MvvmLight.Command;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Org.BouncyCastle.Asn1.Crmf;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Reflection.Metadata.Ecma335; using System.Reflection.Metadata.Ecma335;
using System.Runtime.CompilerServices;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Controls; using System.Windows.Controls;
@ -41,6 +43,8 @@ namespace BBWY.Client.ViewModels.PackTask
readonly PackTaskService packTaskService; readonly PackTaskService packTaskService;
readonly ConsumableService consumableService; readonly ConsumableService consumableService;
readonly PackDetailService packDetailService;
private ObservableCollection<PackItemModel> increateList = new ObservableCollection<PackItemModel>(); private ObservableCollection<PackItemModel> increateList = new ObservableCollection<PackItemModel>();
public ObservableCollection<PackItemModel> IncreateList { get => increateList; set { Set(ref increateList, value); } } // public ObservableCollection<PackItemModel> IncreateList { get => increateList; set { Set(ref increateList, value); } } //
@ -52,60 +56,63 @@ namespace BBWY.Client.ViewModels.PackTask
consumableServiceList = new ObservableCollection<PackItemModel>(); consumableServiceList = new ObservableCollection<PackItemModel>();
public ObservableCollection<PackItemModel> ConsumableServiceList { get => consumableServiceList; set { Set(ref consumableServiceList, value); } } // public ObservableCollection<PackItemModel> ConsumableServiceList { get => consumableServiceList; set { Set(ref consumableServiceList, value); } } //
private string discount = "1";
/// <summary>
/// 折扣
/// </summary>
public string Discount { get => discount; set { Set(ref discount, value); } } //
public ObservableCollection<IncreateServiceModel> IncreateServiceList { get; set; } = new ObservableCollection<IncreateServiceModel>(); public ObservableCollection<PackServiceDTO> IncreateServiceList { get; set; } = new ObservableCollection<PackServiceDTO>();
public ObservableCollection<PackUser> MemberList { get; set; } = new ObservableCollection<PackUser>(); public ObservableCollection<PackUser> MemberList { get; set; } = new ObservableCollection<PackUser>();
public ObservableCollection<ConsumableModel> ConsumableList { get; set; } = new ObservableCollection<ConsumableModel>(); public ObservableCollection<ConsumableModel> ConsumableList { get; set; } = new ObservableCollection<ConsumableModel>();
public ObservableCollection<WorkProcessModel> PackServiceList { get; set; } = new ObservableCollection<WorkProcessModel>(); public ObservableCollection<PackServiceDTO> PackServiceList { get; set; } = new ObservableCollection<PackServiceDTO>();
private readonly PackServiceService packServiceService;
/// <summary>
/// 加载原数据
/// </summary>
public List<PackItemModel> LoadList = new List<PackItemModel>();
readonly WorkProcessService workProcessService; public PackServiceViewModel(PackTaskService packTaskService, ConsumableService consumableService, PackServiceService packServiceService, PackDetailService packDetailService)//, long taskId
readonly IncreateServiceService increateService;
public PackServiceViewModel(PackTaskService packTaskService, ConsumableService consumableService, WorkProcessService workProcessService, IncreateServiceService increateService)//, long taskId
{ {
//TaskId = taskId; //TaskId = taskId;
this.consumableService = consumableService; this.consumableService = consumableService;
this.packTaskService = packTaskService; this.packTaskService = packTaskService;
this.workProcessService = workProcessService; this.packServiceService = packServiceService;
this.increateService = increateService; this.packDetailService = packDetailService;
var packServiceRes = this.packServiceService.SearchAll();
var increateRes = this.increateService.SearchAll(); if (packServiceRes.Success)
if (increateRes.Success)
{ {
if (increateRes.Data != null && increateRes.Data.Count() > 0) if (packServiceRes.Data != null && packServiceRes.Data.Count() > 0)
{ {
foreach (var workProcess in increateRes.Data)
foreach (var packService in packServiceRes.Data)
{ {
if (packService.ServiceType == ServiceType.)
App.Current.Dispatcher.Invoke(() => App.Current.Dispatcher.Invoke(() =>
{ {
IncreateServiceList.Add(workProcess);//加载增值服务列表 IncreateServiceList.Add(packService);//加载增值服务列表
}); });
if (packService.ServiceType == ServiceType.)
}
}
}
var result = this.workProcessService.SearchAll();
if (result.Success)
{
if (result.Data != null && result.Data.Count() > 0)
{
foreach (var workProcess in result.Data)
{
App.Current.Dispatcher.Invoke(() => App.Current.Dispatcher.Invoke(() =>
{ {
PackServiceList.Add(workProcess);//加载工序服务列表 PackServiceList.Add(packService);//加载工序服务列表
}); });
} }
} }
} }
var res = this.packTaskService.GetPackMembers();
var res = this.packTaskService.GetPackMembers();//成员表
if (res.Success) if (res.Success)
{ {
foreach (var item in res.Data) foreach (var item in res.Data)
@ -155,6 +162,8 @@ namespace BBWY.Client.ViewModels.PackTask
//加载数据 //加载数据
//LoadPackDatas(); //LoadPackDatas();
@ -165,14 +174,16 @@ namespace BBWY.Client.ViewModels.PackTask
/// </summary> /// </summary>
public void LoadPackDatas() public void LoadPackDatas()
{ {
LoadList = new List<PackItemModel>();
Task task = Task.Factory.StartNew(() => Task task = Task.Factory.StartNew(() =>
{ {
var res = this.packTaskService.GetTaskService(TaskId); var res = this.packDetailService.GetTaskService(TaskId);
if (res.Success) if (res.Success)
{ {
if (res.Data.IncreateList != null) if (res.Data.IncreateList != null)
{ {
IncreateList = new ObservableCollection<PackItemModel>(); IncreateList = new ObservableCollection<PackItemModel>();
foreach (var item in res.Data.IncreateList) foreach (var item in res.Data.IncreateList)
{ {
App.Current.Dispatcher.Invoke(() => App.Current.Dispatcher.Invoke(() =>
@ -190,6 +201,7 @@ namespace BBWY.Client.ViewModels.PackTask
}); });
}); });
} }
} }
if (res.Data.PackList != null) if (res.Data.PackList != null)
{ {
@ -232,6 +244,9 @@ namespace BBWY.Client.ViewModels.PackTask
}); });
} }
} }
LoadList.AddRange(IncreateList);
LoadList.AddRange(PackList);
Discount =res.Data.Discount.ToString();
} }
}); });
@ -270,60 +285,50 @@ namespace BBWY.Client.ViewModels.PackTask
private int taskCount; private int taskCount;
public int TaskCount { get => taskCount; set { Set(ref taskCount, value); } } // public int TaskCount { get => taskCount; set { Set(ref taskCount, value); } } //
//private string selectBox;
///// <summary>
///// 箱子类型
///// </summary>
//public string SelectBox { get => selectBox; set { Set(ref selectBox, value); } }
//private int boxCount;
///// <summary>
///// 箱子数
///// </summary>
//public int BoxCount { get => boxCount; set { Set(ref boxCount, value); } }
//private int airPaperWidth;
///// <summary>
///// 气泡宽
///// </summary>
//public int AirPaperWidth { get => airPaperWidth; set { Set(ref airPaperWidth, value); } }
//private decimal airPaperHeigth;
///// <summary>
///// 气泡长
///// </summary>
//public decimal AirPaperHeigth { get => airPaperHeigth; set { Set(ref airPaperHeigth, value); } }
//private string selectMemberId;
//public string SelectMemberId { get => selectMemberId; set { Set(ref selectMemberId, value); } }
//private decimal jiaoDai;
//public decimal JiaoDai { get => jiaoDai; set { Set(ref jiaoDai, value); } }
/// <summary> /// <summary>
/// 上传数据 (判断是否超量) 统一上传 /// 上传数据 (判断是否超量) 统一上传
/// </summary> /// </summary>
private void UpLoadPack(object obj) private void UpLoadPack(object obj)
{ {
decimal upDisCount = 1;
if (string.IsNullOrEmpty(Discount)) upDisCount = 1;
decimal.TryParse(Discount, out upDisCount);
if (upDisCount == 0)
{
new TipsWindow("折扣输入有误");
return;
}
UploadServiceRequest uploadService = new UploadServiceRequest(); UploadServiceRequest uploadService = new UploadServiceRequest();
uploadService.Discount = upDisCount;
List<PackItemModel> packServiceList = new List<PackItemModel>();
uploadService.TaskId = TaskId; uploadService.TaskId = TaskId;
List<IncreateMemberModel> increateMembers = new List<IncreateMemberModel>(); List<PackServiceDTO> uploadServices = new List<PackServiceDTO>();
List<ProcessMemberModel> processMembers = new List<ProcessMemberModel>();
// List<ConsumableTaskModel> consumableTasks = new List<ConsumableTaskModel>(); // List<ConsumableTaskModel> consumableTasks = new List<ConsumableTaskModel>();
///上传 删除的数据 //上传保存数据 //上传总数据
List<PersonTaskModel> addDatas = new List<PersonTaskModel>();
List<PersonTaskModel> delDatas = new List<PersonTaskModel>();
List<PersonTaskModel> PersonTaskModels = new List<PersonTaskModel>(); List<PersonTaskModel> PersonTaskModels = new List<PersonTaskModel>();
List<IncreateMemberModel> allIncreateMembers = new List<IncreateMemberModel>();//所有数据数量不能超过总数据
List<ProcessMemberModel> allProcessMembers = new List<ProcessMemberModel>(); List<PackServiceMemberModel> allPackServiceTasks = new List<PackServiceMemberModel>();
List<ConsumableTaskModel> allConsumableTasks = new List<ConsumableTaskModel>(); List<ConsumableTaskModel> allConsumableTasks = new List<ConsumableTaskModel>();
FeesItemResponse feesItem = new FeesItemResponse(); ; FeesItemResponse feesItem = new FeesItemResponse(); ;
List<PackServiceMemberModel> PackServiceMembers = new List<PackServiceMemberModel>();
//获取打包人员 //获取打包人员
List<string> packUsers = new List<string>(); List<string> packUsers = new List<string>();
decimal singleFees = 0; decimal singleFees = 0;
decimal AllFees = 0; decimal AllFees = 0;
decimal price = 0; decimal price = 0;
decimal IncreateFees = 0,PackFees=0,ConsumableFees=0,DiscountPrice=0;
foreach (var item in IncreateList)//增值服务上传 foreach (var item in IncreateList)//增值服务上传
{ {
if (item.SelectId <= 0 || string.IsNullOrEmpty(item.SelectUserId) || item.ItemCount <= 0) if (item.SelectId <= 0 || string.IsNullOrEmpty(item.SelectUserId) || item.ItemCount <= 0)
@ -342,40 +347,41 @@ namespace BBWY.Client.ViewModels.PackTask
new TipsWindow($"{item.ItemName}:{item.ItemCount}超出任务量{TaskCount}").Show(); new TipsWindow($"{item.ItemName}:{item.ItemCount}超出任务量{TaskCount}").Show();
return; return;
} }
price = IncreateServiceList.First(i => i.Id == item.SelectId).ServicePrice; price = IncreateServiceList.First(i => i.Id == item.SelectId).Price;
singleFees += price; singleFees += price;
AllFees += item.ItemCount * price; AllFees += item.ItemCount * price;
IncreateFees += item.ItemCount * price;
if (PackServiceMembers.Select(a => a.PackServiceId).Contains(item.SelectId))//相同服务 存在累加
if (allIncreateMembers.Select(a => a.IncreateId).Contains(item.SelectId))//相同服务 存在累加
{ {
var inMembers = increateMembers.SingleOrDefault(a => a.UserId == item.SelectUserId && a.IncreateId == item.SelectId); var inMembers = PackServiceMembers.SingleOrDefault(a => a.UserId == item.SelectUserId && a.PackServiceId == item.SelectId);
if (inMembers != null) if (inMembers != null)
inMembers.IncreateCount += item.ItemCount; inMembers.PackServiceCount += item.ItemCount;
var data = allIncreateMembers.SingleOrDefault(a => a.IncreateId == item.SelectId); var data = PackServiceMembers.SingleOrDefault(a => a.PackServiceId == item.SelectId);
var feeItem = feesItem.ServiceList.SingleOrDefault(f => f.ItemName == item.ItemName); var feeItem = feesItem.ServiceList.SingleOrDefault(f => f.ItemName == item.ItemName);
if (data != null) data.IncreateCount += item.ItemCount; if (data != null) data.PackServiceCount += item.ItemCount;
if (feeItem != null) feeItem.ItemCount += item.ItemCount; if (feeItem != null) feeItem.ItemCount += item.ItemCount;
if (data.IncreateCount > TaskCount)//累积超出任务量 if (data.PackServiceCount > TaskCount)//累积超出任务量
{ {
new TipsWindow($"{item.ItemName}:{data.IncreateCount}超出任务量{TaskCount}").Show(); new TipsWindow($"{item.ItemName}:{data.PackServiceCount}超出任务量{TaskCount}").Show();
return; return;
} }
continue; continue;
} }
increateMembers.Add(new IncreateMemberModel PackServiceMembers.Add(new PackServiceMemberModel
{ {
UserId = item.SelectUserId, UserId = item.SelectUserId,
IncreateCount = item.ItemCount, PackServiceCount = item.ItemCount,
IncreateId = item.SelectId, PackServiceId = item.SelectId,
Price = price Price = price,
ServiceType = ServiceType.
}); });
@ -386,12 +392,7 @@ namespace BBWY.Client.ViewModels.PackTask
ItemName = item.ItemName, ItemName = item.ItemName,
ItemPrice = price ItemPrice = price
}); });
allIncreateMembers.Add(new IncreateMemberModel
{
UserId = item.SelectUserId,
IncreateCount = item.ItemCount,
IncreateId = item.SelectId
});
} }
foreach (var item in PackList)//打包服务 foreach (var item in PackList)//打包服务
@ -413,34 +414,35 @@ namespace BBWY.Client.ViewModels.PackTask
} }
price = PackServiceList.First(i => i.Id == item.SelectId).ProcessPrice; price = PackServiceList.First(i => i.Id == item.SelectId).Price;
singleFees += price; singleFees += price;
AllFees += item.ItemCount * price; AllFees += item.ItemCount * price;
PackFees += item.ItemCount * price;
if (allProcessMembers.Select(a => a.ProcessId).Contains(item.SelectId))//存在累加 if (PackServiceMembers.Select(a => a.PackServiceId).Contains(item.SelectId))//存在累加
{ {
var inMembers = processMembers.SingleOrDefault(a => a.UserId == item.SelectUserId && a.ProcessId == item.SelectId); var inMembers = PackServiceMembers.SingleOrDefault(a => a.UserId == item.SelectUserId && a.PackServiceId == item.SelectId);
if (inMembers != null) if (inMembers != null)
inMembers.ProcessCount += item.ItemCount; inMembers.PackServiceCount += item.ItemCount;
var data = allProcessMembers.SingleOrDefault(a => a.ProcessId == item.SelectId); var data = PackServiceMembers.SingleOrDefault(a => a.PackServiceId == item.SelectId);
var feeItem = feesItem.ServiceList.SingleOrDefault(f => f.ItemName == item.ItemName); var feeItem = feesItem.ServiceList.SingleOrDefault(f => f.ItemName == item.ItemName);
feeItem.ItemCount += item.ItemCount; feeItem.ItemCount += item.ItemCount;
data.ProcessCount += item.ItemCount; data.PackServiceCount += item.ItemCount;
if (data.ProcessCount > TaskCount)//累积超出任务量 if (data.PackServiceCount > TaskCount)//累积超出任务量
{ {
new TipsWindow($"{item.ItemName}:{data.ProcessCount}超出任务量{TaskCount}").Show(); new TipsWindow($"{item.ItemName}:{data.PackServiceCount}超出任务量{TaskCount}").Show();
return; return;
} }
continue; continue;
} }
processMembers.Add(new ProcessMemberModel PackServiceMembers.Add(new PackServiceMemberModel
{ {
UserId = item.SelectUserId, UserId = item.SelectUserId,
ProcessCount = item.ItemCount, PackServiceCount = item.ItemCount,
ProcessId = item.SelectId, PackServiceId = item.SelectId,
Price = price Price = price,
ServiceType = ServiceType.
}); });
feesItem.ServiceList.Add(new ServiceItemResponse feesItem.ServiceList.Add(new ServiceItemResponse
{ {
@ -449,12 +451,7 @@ namespace BBWY.Client.ViewModels.PackTask
ItemName = item.ItemName, ItemName = item.ItemName,
ItemPrice = price ItemPrice = price
}); });
allProcessMembers.Add(new ProcessMemberModel
{
UserId = item.SelectUserId,
ProcessCount = item.ItemCount,
ProcessId = item.SelectId
});
} }
@ -474,6 +471,7 @@ namespace BBWY.Client.ViewModels.PackTask
price = ConsumableList.First(i => i.Id == item.SelectId).Price.Value; price = ConsumableList.First(i => i.Id == item.SelectId).Price.Value;
singleFees += price; singleFees += price;
AllFees += item.ItemCount * price; AllFees += item.ItemCount * price;
ConsumableFees += item.ItemCount * price;
if (allConsumableTasks.Select(a => a.ConsumableId).Contains(item.SelectId))//存在累加 if (allConsumableTasks.Select(a => a.ConsumableId).Contains(item.SelectId))//存在累加
{ {
var data = allConsumableTasks.SingleOrDefault(a => a.ConsumableId == item.SelectId); var data = allConsumableTasks.SingleOrDefault(a => a.ConsumableId == item.SelectId);
@ -502,70 +500,42 @@ namespace BBWY.Client.ViewModels.PackTask
} }
uploadService.ConsumableIds = string.Join(",", allConsumableTasks.Select(a => a.ConsumableId)); uploadService.ConsumableIds = string.Join(",", allConsumableTasks.Select(a => a.ConsumableId));
uploadService.ConsumableNos = string.Join(",", allConsumableTasks.Select(a => a.ConsumableCount)); uploadService.ConsumableNos = string.Join(",", allConsumableTasks.Select(a => a.ConsumableCount));
uploadService.WorkProcessIds = string.Join(",", allProcessMembers.Select(a => a.ProcessId)); uploadService.WorkProcessIds = string.Join(",", PackServiceMembers.Where(p => p.ServiceType == ServiceType.).Select(a => a.PackServiceId));
uploadService.WorkProcessNos = string.Join(",", allProcessMembers.Select(a => a.ProcessCount)); uploadService.WorkProcessNos = string.Join(",", PackServiceMembers.Where(p => p.ServiceType == ServiceType.).Select(a => a.PackServiceCount));
uploadService.IncreateServiceIds = string.Join(",", allIncreateMembers.Select(a => a.IncreateId)); uploadService.IncreateServiceIds = string.Join(",", PackServiceMembers.Where(p => p.ServiceType == ServiceType.).Select(a => a.PackServiceId));
uploadService.IncreateServiceNos = string.Join(",", allIncreateMembers.Select(a => a.IncreateCount)); uploadService.IncreateServiceNos = string.Join(",", PackServiceMembers.Where(p => p.ServiceType == ServiceType.).Select(a => a.PackServiceCount));
//List<IncreateMemberModel> increateMembers = new List<IncreateMemberModel>(); uploadService.PackServiceIds = string.Join(",", PackServiceMembers.Select(a => a.PackServiceId));
//List<ProcessMemberModel> processMembers = new List<ProcessMemberModel>(); uploadService.PackServiceNos = string.Join(",", PackServiceMembers.Select(a => a.PackServiceCount));
foreach (var item in increateMembers) var orgIds = LoadList.Select(p => p.SelectId).ToList();
{ var nowIds = PackServiceMembers.Select(p => p.PackServiceId).ToList();
var allFees = item.Price * item.IncreateCount;
var person = PersonTaskModels.SingleOrDefault(p => p.PackUserId == item.UserId); //var add = nowIds.Except(orgIds);
if (person != null) var del = orgIds.Except(nowIds).ToList();
{
person.AllFees += allFees; foreach (var PackServiceMember in PackServiceMembers)
person.IncreateServiceIds += $",{item.IncreateId}"; {
person.IncreateServiceNos += $",{item.IncreateCount}"; addDatas.Add(new PersonTaskModel
continue; {
} TaskId = taskId,
CreateTime = DateTime.Now,
var inMember = new PersonTaskModel(); IsDeleted = false,
inMember.IncreateServiceIds = item.IncreateId.ToString(); ServiceCount = PackServiceMember.PackServiceCount,
inMember.IncreateServiceNos = item.IncreateCount.ToString(); PackUserId = PackServiceMember.UserId,
inMember.AllFees += allFees; ServiceId = PackServiceMember.PackServiceId,
inMember.TaskId = TaskId; inMember.PackUserId = item.UserId; ServiceType = PackServiceMember.ServiceType
});
PersonTaskModels.Add(inMember);
}
foreach (var item in processMembers)
{
var allFees = item.Price * item.ProcessCount;
var person = PersonTaskModels.SingleOrDefault(p => p.PackUserId == item.UserId);
if (person != null)
{
person.AllFees += allFees;
if (string.IsNullOrEmpty(person.WorkProcessIds))
{
person.WorkProcessIds += $"{item.ProcessId}";
person.WorkProcessNos += $"{item.ProcessCount}";
continue;
}
person.WorkProcessIds += $",{item.ProcessId}";
person.WorkProcessNos += $",{item.ProcessCount}";
continue;
}
var inMember = new PersonTaskModel();
inMember.WorkProcessNos = item.ProcessCount.ToString();
inMember.WorkProcessIds = item.ProcessId.ToString();
inMember.AllFees += allFees;
inMember.TaskId = TaskId; inMember.PackUserId = item.UserId;
PersonTaskModels.Add(inMember);
} }
uploadService.PersonTaskModels = PersonTaskModels.ToArray(); uploadService.AddPackServices = addDatas;
uploadService.DeletedPackServices = del;
uploadService.AllFees = AllFees; uploadService.AllFees = Convert.ToDecimal((AllFees).ToString("0.00")); ;
uploadService.SingleFees = singleFees; uploadService.SingleFees = singleFees;
var res = packTaskService.UploadService(uploadService); uploadService.IncreaseFees = Convert.ToDecimal((IncreateFees).ToString("0.00"));
uploadService.PackFees = Convert.ToDecimal((PackFees).ToString("0.00"));
uploadService.ConsumableFees = Convert.ToDecimal((ConsumableFees).ToString("0.00"));
uploadService. DiscountPrice = Convert.ToDecimal( (AllFees * upDisCount).ToString("0.00"));
var res = packDetailService.UploadService(uploadService);
if (res != null && res.Success) if (res != null && res.Success)
{ {
// new TipsWindow("上传成功!").Show(); // new TipsWindow("上传成功!").Show();
@ -573,10 +543,11 @@ namespace BBWY.Client.ViewModels.PackTask
feesItem.AllFees = AllFees; feesItem.AllFees = AllFees;
feesItem.SingleFees = singleFees; feesItem.SingleFees = singleFees;
feesItem.TaskId = TaskId; feesItem.TaskId = TaskId;
feesItem.DisCount = upDisCount;
feesItem.DiscountAllFees = upDisCount * AllFees;
feesItem.DiscountSingleFees = singleFees * upDisCount;
if (SetAllFees != null)
SetAllFees(feesItem, packUsers); SetAllFees(feesItem, packUsers);
win.Close(); win.Close();
} }

246
BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs

@ -0,0 +1,246 @@
using AutoMapper.Internal;
using BBWY.Client.APIServices;
using BBWY.Client.Helpers;
using BBWY.Client.Models;
using BBWY.Client.Models.PackTask;
using BBWY.Client.Views.Order;
using BBWY.Client.Views.PackTask;
using BBWY.Common.Models;
using BBWY.Controls;
using GalaSoft.MvvmLight.Command;
using Microsoft.Win32;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Input;
namespace BBWY.Client.ViewModels.PackTask
{
public class PackTaskTotalViewModel : BaseVM, IDenpendency
{
private readonly PackTaskService packTaskService;
private bool isLoading;
private DateTime startDate;
private DateTime endDate;
private int pageIndex = 1;
private int pageSize = 15;
private int orderCount;
private string searchTaskId;
private string searchDepartment;
private string searchShopName;
private string searchSkuId;
private ObservableCollection<ShopTotal> packTaskTotalList;
private bool isBatchChecked;
public bool IsBatchChecked { get => isBatchChecked; set { Set(ref isBatchChecked, value); } }
public ObservableCollection<ShopTotal> PackTaskTotalList { get => packTaskTotalList; set { Set(ref packTaskTotalList, value); } }
public string SearchSkuId { get => searchSkuId; set { Set(ref searchSkuId, value); } }
public string SearchShopName { get => searchShopName; set { Set(ref searchShopName, value); } }
public string SearchDepartment { get => searchDepartment; set { Set(ref searchDepartment, value); } }
public string SearchTaskId { get => searchTaskId; set { Set(ref searchTaskId, value); } }
public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } }
public DateTime StartDate { get => startDate; set { Set(ref startDate, value); } }
public DateTime EndDate { get => endDate; set { Set(ref endDate, value); } }
public int PageIndex { get => pageIndex; set { Set(ref pageIndex, value); } }
public int PageSize { get => pageSize; set { Set(ref pageSize, value); } }
public int OrderCount { get => orderCount; set { Set(ref orderCount, value); } }
public ICommand SetSearchDateCommand { get; set; }
public ICommand SearchTaskTotalCommand { get; set; }
public ICommand ExportCommand { get; set; }
public ICommand BatchSettleCommand { get; set; }
public ICommand SettleCommand { get; set; }
public ICommand OrderPageIndexChangedCommand { get; set; }
public ICommand BatchCheckedCommand { get; set; }
public ICommand CopyTextCommand { get; set; }
public PackTaskTotalViewModel(PackTaskService packTaskService)
{
this.packTaskService = packTaskService;
EndDate = DateTime.Now;
StartDate = DateTime.Now.Date;
SearchTaskTotalCommand = new RelayCommand(SearchTaskTotal);
SetSearchDateCommand = new RelayCommand<int>(d =>
{
EndDate = d == 1 ? DateTime.Now.Date.AddDays(-1) : DateTime.Now;
StartDate = DateTime.Now.Date.AddDays(d * -1);
PageIndex = 1;
Task.Factory.StartNew(() => LoadOrder(1)); //点击日期查询订单
});
OrderPageIndexChangedCommand = new RelayCommand<PageArgs>(p =>
{
LoadOrder(p.PageIndex);
});
BatchCheckedCommand = new RelayCommand(BatchCheck);
CopyTextCommand = new RelayCommand<object>((obj) =>
{
try
{
Clipboard.SetText(obj.ToString());
}
catch (Exception ex)
{
Console.ForegroundColor = ConsoleColor.Red;
Console.WriteLine(ex);
Console.ResetColor();
}
});
BatchSettleCommand = new RelayCommand(BatchSettle);
SettleCommand = new RelayCommand<long>(SettleTask);
ExportCommand = new RelayCommand(Export);
SearchTaskTotal();
}
private void Export()
{
SaveFileDialog save = new SaveFileDialog();
save.Filter = "csv files(*.csv)|*.csv";
var result = save.ShowDialog();
if (result == null || !result.Value)
{
return;
}
string fileName = save.FileName;
Task.Factory.StartNew(() =>
{
IsLoading = true;
var res = packTaskService.ShopTotal(SearchSkuId, SearchTaskId, StartDate, EndDate, SearchShopName,
SearchDepartment, 0, 0);//获取全部数据
if (res.Success)
{
string title = "任务ID,日期,是否结清,部门,店铺,对接人,sku名称,sku数量,增值服务,打包服务,耗材服务,原价,促销折扣,结算价格,对接备注";
var excelList = res.Data.ShopTotals.Select(x => x.ToString()).ToList();
excelList.Insert(0, title);
System.IO.File.WriteAllLines(fileName, excelList, Encoding.UTF8);
}
IsLoading = false;
});
}
private void BatchCheck()
{
if (PackTaskTotalList.Count > 0)
App.Current.Dispatcher.Invoke(() =>
{
PackTaskTotalList.ForAll(s =>
{
s.TaskChecked = IsBatchChecked;
});
});
}
private void SettleTask(long obj)
{
MessageBoxResult result = MessageBox.Show($"是否结清任务:{obj} ?", "提示",
MessageBoxButton.YesNo,
MessageBoxImage.Warning);
if (result != MessageBoxResult.Yes) return;
SettlePackTask(obj);
}
private void BatchSettle()
{
var ids = PackTaskTotalList.Where(p => p.TaskChecked).Select(p => p.TaskId).ToArray();
if (ids.Length <= 0)
return;
MessageBoxResult result = MessageBox.Show("是否批量结清?", "提示",
MessageBoxButton.YesNo,
MessageBoxImage.Warning);
if (result != MessageBoxResult.Yes) return;
SettlePackTask(ids);
}
private void SettlePackTask(params long[] ids)
{
Task.Factory.StartNew(() =>
{
IsLoading = true;
var res = packTaskService.BatchSettle(ids);
if (res.Success)
{
SearchTaskTotal();
}
IsLoading = false;
});
}
private void SearchTaskTotal()
{
if (IsBatchChecked)
{
BatchCheck();
}
PackTaskTotalList = new ObservableCollection<ShopTotal>();
Task.Factory.StartNew(() =>
{
IsLoading = true;
var res = packTaskService.ShopTotal(SearchSkuId, SearchTaskId, StartDate, EndDate, SearchShopName,
SearchDepartment, PageIndex, PageSize);
if (res != null && res.Success)
{
OrderCount = res.Data.TotalCount;
foreach (var shopTotal in res.Data.ShopTotals)
{
App.Current.Dispatcher.Invoke(() =>
{
PackTaskTotalList.Add(shopTotal);
});
}
}
IsLoading = false;
});
}
private void LoadOrder(int pageIndex)
{
SearchTask(pageIndex);
}
private void SearchTask(int pageIndex)
{
PageIndex = pageIndex;
SearchTaskTotal();
}
}
}

3
BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs

@ -340,6 +340,9 @@ namespace BBWY.Client.ViewModels.PackTask
data.FeesItemResponse = item.FeesItemResponse; data.FeesItemResponse = item.FeesItemResponse;
data.FeesMoney = item.FeesItemResponse.SingleFees; data.FeesMoney = item.FeesItemResponse.SingleFees;
data.IsShowFees = data.FeesMoney > 0 ? true : false; data.IsShowFees = data.FeesMoney > 0 ? true : false;
data.FeesItemResponse.DiscountSingleFees = item.FeesItemResponse.SingleFees *item.FeesItemResponse.disCount;
data.FeesItemResponse.DiscountAllFees = item.FeesItemResponse.AllFees * item.FeesItemResponse.disCount;
} }
else else
{ {

2
BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

@ -327,6 +327,8 @@ namespace BBWY.Client.ViewModels.PackTask
data.FeesItemResponse = item.FeesItemResponse; data.FeesItemResponse = item.FeesItemResponse;
data.FeesMoney = item.FeesItemResponse.SingleFees; data.FeesMoney = item.FeesItemResponse.SingleFees;
data.FeesItemResponse.DiscountAllFees = item.FeesItemResponse.AllFees *
item.FeesItemResponse.disCount;
data.IsShowFees = data.FeesMoney > 0 ? true : false; data.IsShowFees = data.FeesMoney > 0 ? true : false;
} }

11
BBWY.Client/ViewModels/ViewModelLocator.cs

@ -86,6 +86,17 @@ namespace BBWY.Client.ViewModels
} }
} }
public PackTaskTotalViewModel PackTaskTotal
{
get
{
using (var s = sp.CreateScope())
{
return s.ServiceProvider.GetRequiredService<PackTaskTotalViewModel>();
}
}
}
public ServiceOrderViewModel ServiceOrderList public ServiceOrderViewModel ServiceOrderList
{ {
get get

2
BBWY.Client/Views/MainWindow.xaml

@ -26,7 +26,7 @@
<!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/> <!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/>
<TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>--> <TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>-->
<TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}" Margin="5,0,0,0"/> <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}" Margin="5,0,0,0"/>
<TextBlock Text="v10094" Margin="5,0,0,0"/> <TextBlock Text="v10096" Margin="5,0,0,0"/>
</StackPanel> </StackPanel>
</Border> </Border>
<Grid Grid.Row="1"> <Grid Grid.Row="1">

49
BBWY.Client/Views/PackTask/FeesExcelControl.xaml.cs

@ -126,6 +126,8 @@ namespace BBWY.Client.Views.PackTask
<Border Width=""1"" HorizontalAlignment=""Right"" BorderBrush=""#D7D7D7"" Grid.Column=""[:1+IncreateCount+ProcessCount:+ConsumableCount]"" Grid.Row=""0"" Grid.RowSpan=""3"" BorderThickness=""0,0,1,0""/> <Border Width=""1"" HorizontalAlignment=""Right"" BorderBrush=""#D7D7D7"" Grid.Column=""[:1+IncreateCount+ProcessCount:+ConsumableCount]"" Grid.Row=""0"" Grid.RowSpan=""3"" BorderThickness=""0,0,1,0""/>
<Border Width=""1"" HorizontalAlignment=""Right"" BorderBrush=""#D7D7D7"" Grid.Column=""[:2+IncreateCount+ProcessCount:+ConsumableCount]"" Grid.Row=""0"" Grid.RowSpan=""3"" BorderThickness=""0,0,1,0""/>
<Border Width=""1"" HorizontalAlignment=""Right"" BorderBrush=""#D7D7D7"" Grid.Column=""[:3+IncreateCount+ProcessCount:+ConsumableCount]"" Grid.Row=""0"" Grid.RowSpan=""3"" BorderThickness=""0,0,1,0""/>
<Border Height=""1"" VerticalAlignment=""Top"" BorderBrush=""#D7D7D7"" Grid.Column=""0"" Grid.Row=""0"" Grid.ColumnSpan=""[:ColumnCount:]"" BorderThickness=""0,1,0,0""/> <Border Height=""1"" VerticalAlignment=""Top"" BorderBrush=""#D7D7D7"" Grid.Column=""0"" Grid.Row=""0"" Grid.ColumnSpan=""[:ColumnCount:]"" BorderThickness=""0,1,0,0""/>
<Border Height=""1"" VerticalAlignment=""Top"" BorderBrush=""#D7D7D7"" Grid.Column=""1"" Grid.Row=""1"" Grid.ColumnSpan=""[:ColumnCount-2:]"" BorderThickness=""0,1,0,0""/> <Border Height=""1"" VerticalAlignment=""Top"" BorderBrush=""#D7D7D7"" Grid.Column=""1"" Grid.Row=""1"" Grid.ColumnSpan=""[:ColumnCount-2:]"" BorderThickness=""0,1,0,0""/>
@ -134,9 +136,13 @@ namespace BBWY.Client.Views.PackTask
<TextBlock MinWidth=""84"" Text=""ID"" TextAlignment=""Center"" Grid.Column=""0"" Grid.RowSpan=""2"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/> <TextBlock MinWidth=""84"" Text=""ID"" TextAlignment=""Center"" Grid.Column=""0"" Grid.RowSpan=""2"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
[:Header:] [:Header:]
<TextBlock MinWidth=""101"" TextAlignment=""Center"" Text="""" Grid.Column=""[:1+IncreateCount+ProcessCount:+ConsumableCount]"" Grid.RowSpan=""2"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/> <TextBlock MinWidth=""101"" TextAlignment=""Center"" Text="""" Grid.Column=""[:1+IncreateCount+ProcessCount:+ConsumableCount]"" Grid.RowSpan=""2"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
<TextBlock MinWidth=""101"" TextAlignment=""Center"" Text="""" Grid.Column=""[:2+IncreateCount+ProcessCount:+ConsumableCount]"" Grid.RowSpan=""2"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
<TextBlock MinWidth=""101"" TextAlignment=""Center"" Text="""" Grid.Column=""[:3+IncreateCount+ProcessCount:+ConsumableCount]"" Grid.RowSpan=""2"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
<TextBlock Text=""[:TaskId:]"" Grid.Row=""2"" Grid.Column=""0"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/> <TextBlock Text=""[:TaskId:]"" Grid.Row=""2"" Grid.Column=""0"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
<TextBlock Text=""[:AllFees:]"" Grid.Row=""2"" Grid.Column=""[:1+IncreateCount+ProcessCount:+ConsumableCount]"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/> <TextBlock Text=""[:AllFees:]"" Grid.Row=""2"" Grid.Column=""[:1+IncreateCount+ProcessCount:+ConsumableCount]"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
<TextBlock Text=""[:Discount:]"" Grid.Row=""2"" Grid.Column=""[:2+IncreateCount+ProcessCount:+ConsumableCount]"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
<TextBlock Text=""[:DiscountFees:]"" Grid.Row=""2"" Grid.Column=""[:3+IncreateCount+ProcessCount:+ConsumableCount]"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
[:ListData:] [:ListData:]
</Grid>"; </Grid>";
@ -173,7 +179,7 @@ namespace BBWY.Client.Views.PackTask
private void LoadData(bool isPrice) private void LoadData(bool isPrice)
{ {
isPrice = false;
if (FeesItem == null || FeesItem.ServiceList.Count <= 0) if (FeesItem == null || FeesItem.ServiceList.Count <= 0)
{ {
return; return;
@ -198,7 +204,7 @@ namespace BBWY.Client.Views.PackTask
all.AddRange(consumableList); all.AddRange(consumableList);
var columnCount = 2 + all.Count; var columnCount = 2 + all.Count + 2;
StringBuilder columns = new StringBuilder(); StringBuilder columns = new StringBuilder();
for (int i = 0; i < columnCount; i++) for (int i = 0; i < columnCount; i++)
{ {
@ -241,30 +247,45 @@ namespace BBWY.Client.Views.PackTask
{ {
header.AppendLine(consumableService); header.AppendLine(consumableService);
} }
decimal allFees = 0;
decimal discount = 0;
decimal discountFees = 0;
discount = FeesItem.disCount;
if (isPrice)
{
allFees = FeesItem.SingleFees;
}
else
{
allFees = FeesItem.AllFees;
}
discountFees = allFees * discount;
string discountStr = "原价";
if (discount > 1)
discountStr = $"{discount.ToString("0.0")}倍";
if (discount < 1)
discountStr = $"{(discount * 10).ToString("0.0")}折";
var newGrid = xaml.Replace("[:Header:]", header.ToString()) var newGrid = xaml.Replace("[:Header:]", header.ToString())
.Replace("[:Columns:]", columns.ToString()) .Replace("[:Columns:]", columns.ToString())
.Replace("[:ColumnCount:]", $"{columnCount}") .Replace("[:ColumnCount:]", $"{columnCount}")
.Replace("[:ColumnCount-2:]", $"{columnCount - 2}") .Replace("[:ColumnCount-2:]", $"{columnCount - 4}")
.Replace("[:1+IncreateCount:]", $"{increateCount + 1}") .Replace("[:1+IncreateCount:]", $"{increateCount + 1}")
.Replace("[:1+IncreateCount+ProcessCount:]", $"{1 + increateCount + processCount}") .Replace("[:1+IncreateCount+ProcessCount:]", $"{1 + increateCount + processCount}")
.Replace("[:1+IncreateCount+ProcessCount:+ConsumableCount]", $"{1 + increateCount + processCount + consumableCount}") .Replace("[:1+IncreateCount+ProcessCount:+ConsumableCount]", $"{1 + increateCount + processCount + consumableCount}")
.Replace("[:2+IncreateCount+ProcessCount:+ConsumableCount]", $"{2 + increateCount + processCount + consumableCount}")
.Replace("[:3+IncreateCount+ProcessCount:+ConsumableCount]", $"{3 + increateCount + processCount + consumableCount}")
.Replace("[:IncreateCount:]", $"{increateCount}") .Replace("[:IncreateCount:]", $"{increateCount}")
.Replace("[:ProcessCount:]", $"{processCount}") .Replace("[:ProcessCount:]", $"{processCount}")
.Replace("[:ConsumableCount:]", $"{consumableCount}") .Replace("[:ConsumableCount:]", $"{consumableCount}")
.Replace("[:TaskId:]", $"{FeesItem.TaskId}") .Replace("[:TaskId:]", $"{FeesItem.TaskId}")
.Replace("[:ListData:]", serviceData.ToString()) .Replace("[:ListData:]", serviceData.ToString())
; .Replace("[:AllFees:]", $"{allFees}")
.Replace("[:Discount:]", discountStr)
.Replace("[:DiscountFees:]", $"{discountFees.ToString(" 0.00")}");
if (isPrice)
{
newGrid = newGrid.Replace("[:AllFees:]", $"{FeesItem.SingleFees}");
}
else
{
newGrid = newGrid.Replace("[:AllFees:]", $"{FeesItem.AllFees}");
}
var grid = XamlReader.Parse(newGrid) as Grid; var grid = XamlReader.Parse(newGrid) as Grid;
App.Current.Dispatcher.Invoke(() => App.Current.Dispatcher.Invoke(() =>

329
BBWY.Client/Views/PackTask/PackTaskTotal.xaml

@ -0,0 +1,329 @@
<Page x:Class="BBWY.Client.Views.PackTask.PackTaskTotal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
mc:Ignorable="d"
xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
DataContext="{Binding PackTaskTotal,Source={StaticResource Locator}}"
xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
Background="White"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
d:DesignHeight="450" d:DesignWidth="2048"
Title="OrderList">
<Page.Resources>
<sys:Int32 x:Key="d0">0</sys:Int32>
<sys:Int32 x:Key="d1">1</sys:Int32>
<sys:Int32 x:Key="d3">2</sys:Int32>
<sys:Int32 x:Key="d7">6</sys:Int32>
<sys:Int32 x:Key="d15">14</sys:Int32>
<sys:Int32 x:Key="d30">29</sys:Int32>
</Page.Resources>
<Grid>
<c:RoundWaitProgress Play="{Binding IsLoading}" Panel.ZIndex="999"/>
<Grid Margin="5,0">
<Grid.RowDefinitions>
<RowDefinition Height="90"/>
<RowDefinition Height="30"/>
<RowDefinition/>
<RowDefinition Height="30"/>
</Grid.RowDefinitions>
<Grid Background="{StaticResource Border.Background}" HorizontalAlignment="Left" Height="75" Panel.ZIndex="999">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="5"/>
<RowDefinition Height="0.5*"/>
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" Margin="0,5,0,0" Height="30">
<StackPanel.Resources>
<Style TargetType="DatePickerTextBox">
<Setter Property="IsReadOnly" Value="True"/>
</Style>
</StackPanel.Resources>
<TextBlock Text="下单时间" VerticalAlignment="Center" Margin="5,0,0,0"/>
<DatePicker SelectedDate="{Binding StartDate}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="5,0,0,0"/>
<DatePicker SelectedDate="{Binding EndDate}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="5,0,0,0"/>
<TextBlock Text="任务ID:" Width="40" VerticalAlignment="Center" Margin="5,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchTaskId}" WaterRemark="精确匹配"/>
<TextBlock Text="部门:" VerticalAlignment="Center" Margin="5,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="精确匹配" Text="{Binding SearchDepartment}"/>
<TextBlock Text="店铺:" VerticalAlignment="Center" Margin="5,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchShopName}" WaterRemark="精确匹配"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="2" Margin="0,0,0,5" Height="30">
<c:BButton Content="今天" Width="50" Height="25" Margin="5,0,0,0"
Command="{Binding SetSearchDateCommand}"
CommandParameter="{StaticResource d0}"/>
<c:BButton Content="昨天" Width="50" Height="25" Margin="5,0,0,0"
Command="{Binding SetSearchDateCommand}"
CommandParameter="{StaticResource d1}"/>
<c:BButton Content="近3天" Width="50" Height="25" Margin="5,0,0,0"
Command="{Binding SetSearchDateCommand}"
CommandParameter="{StaticResource d3}"/>
<c:BButton Content="近7天" Width="50" Height="24" Margin="5,0,0,0"
Command="{Binding SetSearchDateCommand}"
CommandParameter="{StaticResource d7}"/>
<c:BButton Content="近15天" Width="50" Height="25" Margin="5,0,0,0"
Command="{Binding SetSearchDateCommand}"
CommandParameter="{StaticResource d15}"/>
<c:BButton Content="近30天" Width="50" Height="25" Margin="5,0,0,0"
Command="{Binding SetSearchDateCommand}"
CommandParameter="{StaticResource d30}"/>
<TextBlock Width="40" Text=" SKU:" VerticalAlignment="Center" Margin="5,0,0,0"
/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchSkuId}"
/>
</StackPanel>
<Grid Grid.Column="1" Grid.RowSpan="3">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Button Content="搜索" Width="50" VerticalAlignment="Stretch" Margin="5,0,0,0" Command="{Binding SearchTaskTotalCommand}"
Grid.RowSpan="2" Background="#8080ff" BorderThickness="0" Foreground="White"/>
<Button Grid.RowSpan="2" Content="导出" Command="{Binding ExportCommand}" Width="50" Grid.Column="1"
Background="#02a7f0" BorderThickness="0" Foreground="White"/>
</Grid>
</Grid>
<Grid Grid.Row="1" HorizontalAlignment="Left">
<Button Content="批量结清" Width="100" VerticalAlignment="Stretch" Command="{Binding BatchSettleCommand}"
Grid.RowSpan="2" Background="#8080ff" BorderThickness="0" Foreground="White"/>
</Grid>
<Grid Grid.Row="2" Margin="0 5 0 0">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="30"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="130"/>
<ColumnDefinition Width="130"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition MinWidth="80"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="60"/>
</Grid.ColumnDefinitions>
<CheckBox HorizontalAlignment="Center" IsChecked="{Binding IsBatchChecked,Mode=TwoWay}" Command="{Binding BatchCheckedCommand}" HorizontalContentAlignment="Center" Grid.Column="0"/>
<TextBlock Text="任务ID" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="日期" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="状态" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="部门" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="店铺名" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="对接人员" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="采购SKU名称" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="SKU数量" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="增值服务" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包服务" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="耗材服务" Grid.Column="11" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="原始金额" Grid.Column="12" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="促销折扣" Grid.Column="13" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="结算金额" Grid.Column="14" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="注意事项/对接备注" Grid.Column="15" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="操作" Grid.Column="16" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="8"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="13"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="14"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="15"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="16"/>
<Border Height="1" VerticalAlignment="Top" Grid.ColumnSpan="17" Background="{StaticResource Border.Brush}" Grid.Row="0"/>
<ListBox x:Name="listbox_order"
Grid.Row="1" Grid.ColumnSpan="17"
ItemsSource="{Binding PackTaskTotalList}"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
BorderBrush="{StaticResource Border.Brush}"
BorderThickness="1,1,1,0"
Foreground="{StaticResource Text.Color}">
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Width="{Binding ActualWidth,ElementName=listbox_order,Converter={StaticResource widthConverter},ConverterParameter=-0}"
MinHeight="40">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="30"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="130"/>
<ColumnDefinition Width="130"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition MinWidth="80"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="60"/>
</Grid.ColumnDefinitions>
<Grid Margin="0 0 1 0">
<CheckBox Grid.Column="8" IsChecked="{Binding TaskChecked,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" HorizontalContentAlignment="Center" />
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="1" Margin="0 0 1 0" >
<c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Center" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding TaskId}"
Margin=" 5,0,0,0"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="2" Margin="0 0 1 0">
<TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="3" Margin="0 0 1 0">
<TextBlock TextWrapping="Wrap" Text="{Binding IsSettle}" Foreground="{Binding IsSettle,Converter={StaticResource objConverter},ConverterParameter=未结算:#ec808d:#00aaaa}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="4" Margin="0 0 1 0">
<c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Center" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding DepartmentName}"
Margin=" 5,0,0,0"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="5" Margin="0 0 1 0">
<c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Center" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding ShopName}"
Margin=" 5,0,0,0"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="6" Margin="0 0 1 0">
<TextBlock Text="{Binding AcceptUserName}" TextWrapping="Wrap" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="7" Margin="0 0 1 0">
<TextBlock Text="{Binding SkuName}" Style="{StaticResource middleTextBlock}" TextTrimming="CharacterEllipsis">
<TextBlock.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="{Binding SkuName}"/>
</ToolTip>
</TextBlock.ToolTip>
</TextBlock>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="8" Margin="0 0 1 0">
<TextBlock Text="{Binding SkuCount}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="9" Margin="0 0 1 0">
<TextBlock Text="{Binding IncreaseFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="10" Margin="0 0 1 0">
<TextBlock Text="{Binding PackFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="11" Margin="0 0 1 0" >
<TextBlock Text="{Binding ConsumableFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="12" Margin="0 0 1 0">
<TextBlock Text="{Binding Price,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="13" Margin="0 0 1 0">
<TextBlock Text="{Binding Discount,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="14" Margin="0 0 1 0">
<TextBlock Text="{Binding DiscountPrice,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="15" Margin="0 0 1 0">
<TextBlock Text="{Binding MarkMessage}" Style="{StaticResource middleTextBlock}" TextTrimming="CharacterEllipsis">
<TextBlock.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="{Binding MarkMessage}"/>
</ToolTip>
</TextBlock.ToolTip>
</TextBlock>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="16" Margin="0 0 1 0">
<c:BButton HorizontalAlignment="Center" Height="20" VerticalAlignment="Center" Background="Transparent" Foreground="#02a7f0" Grid.Row="1" Content="结清"
Command="{Binding DataContext.SettleCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding TaskId}"
Visibility="Visible" />
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
</Grid>
<Border Grid.Row="1" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
</Grid>
</Grid>
<c:PageControl PageIndex="{Binding PageIndex}"
PageSize="{Binding PageSize}"
RecordCount="{Binding OrderCount}"
Grid.Row="3"
HorizontalAlignment="Left">
<b:Interaction.Triggers>
<b:EventTrigger EventName="OnPageIndexChanged">
<b:InvokeCommandAction Command="{Binding OrderPageIndexChangedCommand}" PassEventArgsToCommand="True"/>
</b:EventTrigger>
</b:Interaction.Triggers>
</c:PageControl>
</Grid>
</Grid>
</Page>

26
BBWY.Client/Views/PackTask/PackTaskTotal.xaml.cs

@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace BBWY.Client.Views.PackTask
{
/// <summary>
/// PackTaskTotal.xaml 的交互逻辑
/// </summary>
public partial class PackTaskTotal : Page
{
public PackTaskTotal()
{
InitializeComponent();
}
}
}

17
BBWY.Client/Views/PackTask/ServiceWindow.xaml

@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:BBWY.Client.Views.PackTask" xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
mc:Ignorable="d" mc:Ignorable="d"
Title="TipsWindow" Height="769" Width="360" Title="TipsWindow" Height="820" Width="360"
xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls" xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
xmlns:b="http://schemas.microsoft.com/xaml/behaviors" xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
xmlns:ctr="clr-namespace:BBWY.Client.Converters" xmlns:ctr="clr-namespace:BBWY.Client.Converters"
@ -33,11 +33,16 @@
</Border> </Border>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="40"/>
<RowDefinition/> <RowDefinition/>
<RowDefinition/> <RowDefinition/>
<RowDefinition Height="250"/> <RowDefinition Height="250"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Grid.Row="0"> <StackPanel Orientation="Horizontal">
<TextBlock Text="促销折扣:" HorizontalAlignment="Left" Margin="19 0 0 0" VerticalAlignment="Center"/>
<c:BTextBox Text="{Binding Discount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100"/>
</StackPanel>
<Grid Grid.Row="1">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="87"/> <RowDefinition Height="87"/>
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
@ -73,7 +78,7 @@
<ColumnDefinition Width="84"/> <ColumnDefinition Width="84"/>
<ColumnDefinition Width="40"/> <ColumnDefinition Width="40"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<ComboBox VerticalContentAlignment="Center" Grid.Column="0" ItemsSource="{Binding IncreateServiceList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" DisplayMemberPath="ServiceName" SelectedValuePath="Id" SelectedValue="{Binding SelectId}" Text="{Binding ItemName}" Width="116" Height="30"/> <ComboBox VerticalContentAlignment="Center" Grid.Column="0" ItemsSource="{Binding IncreateServiceList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" DisplayMemberPath="Name" SelectedValuePath="Id" SelectedValue="{Binding SelectId}" Text="{Binding ItemName}" Width="116" Height="30"/>
<ComboBox VerticalContentAlignment="Center" Grid.Column="1" ItemsSource="{Binding MemberList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" DisplayMemberPath="UserName" SelectedValuePath="Id" SelectedValue="{Binding SelectUserId}" Width="84" Height="30"/> <ComboBox VerticalContentAlignment="Center" Grid.Column="1" ItemsSource="{Binding MemberList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" DisplayMemberPath="UserName" SelectedValuePath="Id" SelectedValue="{Binding SelectUserId}" Width="84" Height="30"/>
<TextBox VerticalContentAlignment="Center" Grid.Column="2" Height="30" Text="{Binding ItemCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="84"/> <TextBox VerticalContentAlignment="Center" Grid.Column="2" Height="30" Text="{Binding ItemCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="84"/>
<c:BButton Foreground="Blue" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Background="Transparent" HorizontalAlignment="Stretch" <c:BButton Foreground="Blue" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Background="Transparent" HorizontalAlignment="Stretch"
@ -94,7 +99,7 @@
</Grid> </Grid>
<Grid Grid.Row="1"> <Grid Grid.Row="2">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="87"/> <RowDefinition Height="87"/>
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
@ -135,7 +140,7 @@
<ColumnDefinition Width="84"/> <ColumnDefinition Width="84"/>
<ColumnDefinition Width="40"/> <ColumnDefinition Width="40"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<ComboBox VerticalContentAlignment="Center" Grid.Column="0" DisplayMemberPath="ProcessName" ItemsSource="{Binding PackServiceList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" SelectedValuePath="Id" SelectedValue="{Binding SelectId}" Text="{Binding ItemName}" Width="116" Height="30"/> <ComboBox VerticalContentAlignment="Center" Grid.Column="0" DisplayMemberPath="Name" ItemsSource="{Binding PackServiceList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" SelectedValuePath="Id" SelectedValue="{Binding SelectId}" Text="{Binding ItemName}" Width="116" Height="30"/>
<ComboBox VerticalContentAlignment="Center" Grid.Column="1" ItemsSource="{Binding MemberList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" DisplayMemberPath="UserName" SelectedValuePath="Id" SelectedValue="{Binding SelectUserId}" Width="84" Height="30"/> <ComboBox VerticalContentAlignment="Center" Grid.Column="1" ItemsSource="{Binding MemberList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" DisplayMemberPath="UserName" SelectedValuePath="Id" SelectedValue="{Binding SelectUserId}" Width="84" Height="30"/>
<TextBox VerticalContentAlignment="Center" Grid.Column="2" Height="30" Text="{Binding ItemCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="84"/> <TextBox VerticalContentAlignment="Center" Grid.Column="2" Height="30" Text="{Binding ItemCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="84"/>
<c:BButton Foreground="Blue" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Background="Transparent" HorizontalAlignment="Stretch" <c:BButton Foreground="Blue" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Background="Transparent" HorizontalAlignment="Stretch"
@ -152,7 +157,7 @@
</Grid> </Grid>
<Grid Grid.Row="2"> <Grid Grid.Row="3">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="87"/> <RowDefinition Height="87"/>
<RowDefinition MaxHeight="200"/> <RowDefinition MaxHeight="200"/>

19
BBWY.Client/Views/PackTask/ServiceWindow.xaml.cs

@ -22,25 +22,6 @@ namespace BBWY.Client.Views.PackTask
/// </summary> /// </summary>
public partial class ServiceWindow : BWindow public partial class ServiceWindow : BWindow
{ {
/*
public PackServiceViewModel model { get; set; }
public PackTaskService packTaskService;
public ConsumableService consumableService;
public WorkProcessService workProcessService;
public IncreateServiceService increateService;
public ServiceWindow(PackTaskService packTaskService, long taskId, int taskCount, ConsumableService consumableService, WorkProcessService workProcessService, IncreateServiceService increateService)
{
InitializeComponent();
this.consumableService = consumableService;
this.workProcessService = workProcessService;
this.packTaskService = packTaskService;
this.increateService = increateService;
model = new PackServiceViewModel(packTaskService, consumableService, workProcessService, increateService, taskId);
model.TaskId = taskId;
model.TaskCount = taskCount;
this.DataContext = model;
}
*/
public ServiceWindow() public ServiceWindow()
{ {
InitializeComponent(); InitializeComponent();

2
BBWY.Client/Views/PackTask/TaskListControl.xaml

@ -342,7 +342,7 @@
<TextBlock TextWrapping="Wrap" <TextBlock TextWrapping="Wrap"
TextAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" > TextAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" >
<Run Text="收费:"/> <Run Text="收费:"/>
<Run Text="{Binding FeesMoney}" <Run Text="{Binding FeesItemResponse.DiscountAllFees,StringFormat=0.00}"
/> />
</TextBlock> </TextBlock>
<Path x:Name="path_purchaseAmount_question" <Path x:Name="path_purchaseAmount_question"

2
BBWY.Client/Views/PackTask/WareHouseListControl.xaml

@ -342,7 +342,7 @@
<StackPanel Margin="20,0,0,0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" > <StackPanel Margin="20,0,0,0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="收费:"/> <TextBlock Text="收费:"/>
<TextBlock <TextBlock
Text="{Binding FeesItemResponse.AllFees, StringFormat={}{0:F2}}" Text="{Binding FeesItemResponse.DiscountAllFees, StringFormat={}{0:F2}}"
TextWrapping="Wrap" TextWrapping="Wrap"
HorizontalAlignment="Center" HorizontalAlignment="Center"
/> />

2
BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs

@ -29,7 +29,7 @@ namespace BBWY.Server.Business
orderId = payPurchaseOrderRequest.OrderId, orderId = payPurchaseOrderRequest.OrderId,
userAccount = data.AccountName userAccount = data.AccountName
}, payPurchaseOrderRequest.PurchaseAccount.AppKey, payPurchaseOrderRequest.PurchaseAccount.AppSecret); }, payPurchaseOrderRequest.PurchaseAccount.AppKey, payPurchaseOrderRequest.PurchaseAccount.AppSecret);
if (qtResponse.Status == 200) return new PayPurchaseOrderResponse { Success = true, PurchaseOrderState= PurchaseOrderState. }; if (qtResponse.Status == 200) return new PayPurchaseOrderResponse { Success = true, PurchaseOrderState= PurchaseOrderState. };
if (qtResponse.Message != null && qtResponse.Message.Contains("已支付")) if (qtResponse.Message != null && qtResponse.Message.Contains("已支付"))
{ {

Loading…
Cancel
Save