合并

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);
+        }
+
+    }
+}

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);
+        }
+    }
+}

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,
@@ -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,
                 DepartmentName = departmentName,
@@ -122,7 +122,8 @@ namespace BBWY.Client.APIServices
         {
             return SendRequest<object>(globalContext.QKApiHost, "api/PackTask/DeletedPackTask",
                new { 
-               TaskId = taskId
+               TaskId = taskId,
+               UserId = globalContext.User.Id.ToString()
                }
             , null, HttpMethod.Post);
         }
@@ -238,7 +239,10 @@ namespace BBWY.Client.APIServices
     public class UploadServiceRequest
     {
 
-       
+        /// <summary>
+        /// 折扣
+        /// </summary>
+        public decimal Discount { get; set; } = 1;
 
         /// <summary>
         /// 任务id
@@ -268,6 +272,9 @@ namespace BBWY.Client.APIServices
         /// 增值服务数量
         /// </summary>
         public string IncreateServiceNos { get; set; }
+
+        public string PackServiceIds { get; set; }
+        public string PackServiceNos { get; set; }
         /// <summary>
         /// 任务单件费用
         /// </summary>
@@ -277,8 +284,16 @@ namespace BBWY.Client.APIServices
         /// </summary>
         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; }
 
@@ -296,22 +311,40 @@ namespace BBWY.Client.APIServices
         /// 打包人
         /// </summary>
         public string PackUserId { get; set; }
+
         /// <summary>
-        /// 增值服务ids
+        /// 服务id
         /// </summary>
-        public string IncreateServiceIds { get; set; }
+        public long ServiceId { get; set; }
         /// <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>
-        /// 工序ids
+        /// 
         /// </summary>
-        public string WorkProcessIds { get; set; }
+        public bool IsDeleted { get; set; }
         /// <summary>
-        /// 工序数量
+        /// 折扣
         /// </summary>
-        public string WorkProcessNos { get; set; }
+        public decimal Discount { get; set; } = 1;
         /// <summary>
         /// 总费用
         /// </summary>
@@ -320,6 +353,8 @@ namespace BBWY.Client.APIServices
         /// 时间
         /// </summary>
         public DateTime CreateTime { get; set; } = DateTime.Now;
+
+        public ServiceType ServiceType { get; set; }
     }
 
 
@@ -337,7 +372,8 @@ namespace BBWY.Client.APIServices
         public int ConsumableCount { get; set; }
     }
 
-   public class IncreateMemberModel
+
+    public class PackServiceMemberModel
     {
         public decimal Price { get; set; }
 
@@ -345,27 +381,44 @@ namespace BBWY.Client.APIServices
         /// <summary>
         /// 增值服务Id
         /// </summary>
-        public long IncreateId { get; set; }
+        public long PackServiceId { get; set; }
         /// <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; }
+    //}
 
 
 

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>();
 
         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;
 
-        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;
 
+        public decimal DiscountSingleFees { get => discountSingleFees; set { Set(ref discountSingleFees, value); } }
+        private decimal discountSingleFees;
+
 
         public decimal TaskId { get => taskId; set { Set(ref taskId, value); } }
         private decimal taskId;
+       
     }
 
     public enum ServiceType

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; }
+    }
+}

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

@@ -7,6 +7,7 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
 {
     public class PackServiceResponse
     {
+        public decimal Discount { get; set; }
         /// <summary>
         /// 增值服务数据
         /// </summary>
@@ -21,6 +22,14 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
         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
     {
 

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Text;
 
 namespace BBWY.Client.Models.APIModel.Response.PackTask
@@ -41,7 +42,7 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
         public string ProductId { get; set; }
 
 
-
+        public PackConfig PackConfig { get; set; }
 
 
         public BarCodeModel BarCodeModel { get; set; }
@@ -57,7 +58,75 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
         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; }
+
+
+    }
 
 
 }

BBWY.Client/Models/PackTask/PackItemModel.cs

@@ -1,4 +1,5 @@
 using BBWY.Client.APIServices;
+using BBWY.Client.Models.APIModel.Response.PackTask;
 using GalaSoft.MvvmLight.Command;
 using System;
 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
             {
@@ -57,8 +58,11 @@ namespace BBWY.Client.Models.PackTask
         public ObservableCollection<ConsumableModel> ConsumableList
         { 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>

BBWY.Client/Models/PackTask/PackTaskModel.cs

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

BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs

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

BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs

@@ -9,12 +9,14 @@ using BBWY.Client.Views.PackTask;
 using BBWY.Common.Models;
 using GalaSoft.MvvmLight.Command;
 using Microsoft.Extensions.Logging;
+using Org.BouncyCastle.Asn1.Crmf;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection.Metadata.Ecma335;
+using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Controls;
@@ -41,6 +43,8 @@ namespace BBWY.Client.ViewModels.PackTask
 
         readonly PackTaskService packTaskService;
         readonly ConsumableService consumableService;
+        readonly PackDetailService packDetailService;
+
         private ObservableCollection<PackItemModel> increateList = new ObservableCollection<PackItemModel>();
         public ObservableCollection<PackItemModel> IncreateList { get => increateList; set { Set(ref increateList, value); } } //
 
@@ -52,60 +56,63 @@ namespace BBWY.Client.ViewModels.PackTask
             consumableServiceList = new ObservableCollection<PackItemModel>();
         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<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;
             this.consumableService = consumableService;
             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(() =>
                             {
-                            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(() =>
                             {
-                            PackServiceList.Add(workProcess);//加载工序服务列表
+                                PackServiceList.Add(packService);//加载工序服务列表
                             });
-
                     }
                 }
             }
 
-            var res = this.packTaskService.GetPackMembers();
+
+
+            var res = this.packTaskService.GetPackMembers();//成员表
             if (res.Success)
             {
                 foreach (var item in res.Data)
@@ -155,6 +162,8 @@ namespace BBWY.Client.ViewModels.PackTask
 
 
 
+
+
             //加载数据
             //LoadPackDatas();
 
@@ -165,14 +174,16 @@ namespace BBWY.Client.ViewModels.PackTask
         /// </summary>
         public void LoadPackDatas()
         {
+            LoadList = new List<PackItemModel>();
             Task task = Task.Factory.StartNew(() =>
             {
-                var res = this.packTaskService.GetTaskService(TaskId);
+                var res = this.packDetailService.GetTaskService(TaskId);
                 if (res.Success)
                 {
                     if (res.Data.IncreateList != null)
                     {
                         IncreateList = new ObservableCollection<PackItemModel>();
+
                         foreach (var item in res.Data.IncreateList)
                         {
                             App.Current.Dispatcher.Invoke(() =>
@@ -190,6 +201,7 @@ namespace BBWY.Client.ViewModels.PackTask
                                 });
                             });
                         }
+
                     }
                     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;
         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>
         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();
+            uploadService.Discount = upDisCount;
+
+            List<PackItemModel> packServiceList = new List<PackItemModel>();
+
+
+
             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<PersonTaskModel> addDatas = new List<PersonTaskModel>();
+            List<PersonTaskModel> delDatas = 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>();
             FeesItemResponse feesItem = new FeesItemResponse(); ;
-
+            List<PackServiceMemberModel> PackServiceMembers = new List<PackServiceMemberModel>();
             //获取打包人员
             List<string> packUsers = new List<string>();
 
             decimal singleFees = 0;
             decimal AllFees = 0;
             decimal price = 0;
+
+
             foreach (var item in IncreateList)//增值服务上传
             {
                 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();
                     return;
                 }
-                price = IncreateServiceList.First(i => i.Id == item.SelectId).ServicePrice;
+                price = IncreateServiceList.First(i => i.Id == item.SelectId).Price;
                 singleFees += price;
                 AllFees += item.ItemCount * price;
 
 
 
 
-                if (allIncreateMembers.Select(a => a.IncreateId).Contains(item.SelectId))//相同服务 存在累加
+                if (PackServiceMembers.Select(a => a.PackServiceId).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)
-                        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);
-                    if (data != null) data.IncreateCount += item.ItemCount;
+                    if (data != null) data.PackServiceCount += 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;
                     }
 
                     continue;
                 }
 
-                increateMembers.Add(new IncreateMemberModel
+                PackServiceMembers.Add(new PackServiceMemberModel
                 {
                     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,
                     ItemPrice = price
                 });
-                allIncreateMembers.Add(new IncreateMemberModel
+
-                {
-                    UserId = item.SelectUserId,
-                    IncreateCount = item.ItemCount,
-                    IncreateId = item.SelectId
-                });
             }
 
             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;
                 AllFees += 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)
-                        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);
                     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;
                     }
                     continue;
                 }
-                processMembers.Add(new ProcessMemberModel
+                PackServiceMembers.Add(new PackServiceMemberModel
                 {
                     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
                 {
@@ -449,12 +451,7 @@ namespace BBWY.Client.ViewModels.PackTask
                     ItemName = item.ItemName,
                     ItemPrice = price
                 });
-                allProcessMembers.Add(new ProcessMemberModel
+
-                {
-                    UserId = item.SelectUserId,
-                    ProcessCount = item.ItemCount,
-                    ProcessId = item.SelectId
-                });
 
 
             }
@@ -502,70 +499,38 @@ namespace BBWY.Client.ViewModels.PackTask
             }
             uploadService.ConsumableIds = string.Join(",", allConsumableTasks.Select(a => a.ConsumableId));
             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.SingleFees = singleFees;
-            var res = packTaskService.UploadService(uploadService);
+            var res = packDetailService.UploadService(uploadService);
             if (res != null && res.Success)
             {
                 // new TipsWindow("上传成功!").Show();
@@ -573,10 +538,9 @@ namespace BBWY.Client.ViewModels.PackTask
                 feesItem.AllFees = AllFees;
                 feesItem.SingleFees = singleFees;
                 feesItem.TaskId = TaskId;
-
+                feesItem.DisCount = upDisCount;
-
+                if (SetAllFees != null)
                     SetAllFees(feesItem, packUsers);
-
                 win.Close();
             }
 

BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs

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

BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

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

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.Shop.Platform}" 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="v10095" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">

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=""[: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=""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""/>
              [: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=""[: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:]
         </Grid>";
 
@@ -198,7 +204,7 @@ namespace BBWY.Client.Views.PackTask
                 all.AddRange(consumableList);
 
 
-                var columnCount = 2 + all.Count;
+                var columnCount = 2 + all.Count + 2;
                 StringBuilder columns = new StringBuilder();
                 for (int i = 0; i < columnCount; i++)
                 {
@@ -241,30 +247,45 @@ namespace BBWY.Client.Views.PackTask
                 {
                     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())
                     .Replace("[:Columns:]", columns.ToString())
                     .Replace("[:ColumnCount:]", $"{columnCount}")
-                    .Replace("[:ColumnCount-2:]", $"{columnCount - 2}")
+                    .Replace("[:ColumnCount-2:]", $"{columnCount - 4}")
                     .Replace("[:1+IncreateCount:]", $"{increateCount + 1}")
                     .Replace("[:1+IncreateCount+ProcessCount:]", $"{1 + increateCount + processCount}")
                     .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("[:ProcessCount:]", $"{processCount}")
                     .Replace("[:ConsumableCount:]", $"{consumableCount}")
                     .Replace("[:TaskId:]", $"{FeesItem.TaskId}")
                     .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;
                 App.Current.Dispatcher.Invoke(() =>

BBWY.Client/Views/PackTask/ServiceWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
         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:b="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:ctr="clr-namespace:BBWY.Client.Converters"
@@ -33,11 +33,16 @@
         </Border>
         <Grid Grid.Row="1">
             <Grid.RowDefinitions>
+                <RowDefinition Height="40"/>
                 <RowDefinition/>
                 <RowDefinition/>
                 <RowDefinition Height="250"/>
             </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>
                     <RowDefinition Height="87"/>
                     <RowDefinition Height="auto"/>
@@ -73,7 +78,7 @@
                                         <ColumnDefinition Width="84"/>
                                         <ColumnDefinition Width="40"/>
                                     </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"/>
                                     <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"
@@ -94,7 +99,7 @@
 
             </Grid>
 
-            <Grid Grid.Row="1">
+            <Grid Grid.Row="2">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="87"/>
                     <RowDefinition Height="auto"/>
@@ -135,7 +140,7 @@
                                         <ColumnDefinition Width="84"/>
                                         <ColumnDefinition Width="40"/>
                                     </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"/>
                                     <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"
@@ -152,7 +157,7 @@
 
             </Grid>
 
-            <Grid Grid.Row="2">
+            <Grid Grid.Row="3">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="87"/>
                     <RowDefinition MaxHeight="200"/>

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

@@ -22,25 +22,6 @@ namespace BBWY.Client.Views.PackTask
     /// </summary>
     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()
         {
             InitializeComponent();

BBWY.Client/Views/PackTask/TaskListControl.xaml

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

BBWY.Client/Views/PackTask/WareHouseListControl.xaml

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

BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs

@@ -29,7 +29,7 @@ namespace BBWY.Server.Business
                 orderId = payPurchaseOrderRequest.OrderId,
                 userAccount = data.AccountName
             }, 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("已支付"))
             {