From 44d0ed4d12b830d8acf5862d92e5795a1b796976 Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Sun, 12 Nov 2023 10:36:51 +0800 Subject: [PATCH] 1 --- .../APIServices/QiKu/QualityTaskService.cs | 39 ++- .../Request/CreatePackTaskV2Request.cs | 2 + .../APIModel/Request/QualityTaskRequest.cs | 8 +- .../Request/UpdatePackTaskV2Request.cs | 4 + .../PackPurchaseTask/QualityTaskResponse.cs | 6 + .../SearchQualityTaskListResponse.cs | 16 +- BBWY.Client/Models/Enums.cs | 7 + .../PackTask/PublishTaskViewModel.cs | 3 +- .../PackTask/WareHouseListViewModel.cs | 306 +++++++++++------- .../QualityTask/QualityViewModel.cs | 119 ++++--- .../Views/PackTask/WareHouseListControl.xaml | 2 +- .../Views/QualityTask/QualityWindow.xaml | 8 +- .../Views/QualityTask/QualityWindow.xaml.cs | 12 +- 13 files changed, 327 insertions(+), 205 deletions(-) diff --git a/BBWY.Client/APIServices/QiKu/QualityTaskService.cs b/BBWY.Client/APIServices/QiKu/QualityTaskService.cs index a093c742..a9384426 100644 --- a/BBWY.Client/APIServices/QiKu/QualityTaskService.cs +++ b/BBWY.Client/APIServices/QiKu/QualityTaskService.cs @@ -1,5 +1,7 @@ using BBWY.Client.Models; using BBWY.Client.Models.APIModel; +using BBWY.Client.Models.APIModel.Request; +using BBWY.Client.Models.APIModel.Response.PackPurchaseTask; using BBWY.Common.Http; using BBWY.Common.Models; using System; @@ -46,18 +48,19 @@ namespace BBWY.Client.APIServices.QiKu }, null, HttpMethod.Post); } - + public ApiResponse QualityTaskException(long TaskId, TaskExceptionType TaskExceptionType, string RemarkMsg) { return SendRequest(globalContext.QKApiHost, $"api/QualityTask/QualityTaskException", - new { + new + { TaskId, TaskExceptionType, RemarkMsg, - UserName=globalContext.User.Name + UserName = globalContext.User.Name } , null, HttpMethod.Post); } @@ -77,5 +80,35 @@ namespace BBWY.Client.APIServices.QiKu } , null, HttpMethod.Post); } + + + public ApiResponse SendMsgToPurchaseDepartment(long TaskId, string ModelTitle, string TipMsg) + { + return SendRequest(globalContext.QKApiHost, $"api/QualityTask/SendMsgToPurchaseDepartment", + new + { + TaskId, + ModelTitle, + TipMsg, + UserName = globalContext.User.Name + } + , null, HttpMethod.Post); + } + + + public ApiResponse GetQualityTask(long taskId) + { + + return SendRequest(globalContext.QKApiHost, $"api/QualityTask/GetQualityTask?taskId={taskId}", null, null, HttpMethod.Post); + + } + + public ApiResponse CompeteQualityTask(QualityTaskRequest competeQualityTask) + { + + return SendRequest(globalContext.QKApiHost, $"api/QualityTask/CompeteQualityTask", competeQualityTask, null, HttpMethod.Post); + + } + } } diff --git a/BBWY.Client/Models/APIModel/Request/CreatePackTaskV2Request.cs b/BBWY.Client/Models/APIModel/Request/CreatePackTaskV2Request.cs index 6955a210..65725ff7 100644 --- a/BBWY.Client/Models/APIModel/Request/CreatePackTaskV2Request.cs +++ b/BBWY.Client/Models/APIModel/Request/CreatePackTaskV2Request.cs @@ -115,6 +115,8 @@ namespace BBWY.Client.Models.APIModel.Request /// public List WayBillNoList { get; set; } + + } diff --git a/BBWY.Client/Models/APIModel/Request/QualityTaskRequest.cs b/BBWY.Client/Models/APIModel/Request/QualityTaskRequest.cs index 9dfb4894..482278f4 100644 --- a/BBWY.Client/Models/APIModel/Request/QualityTaskRequest.cs +++ b/BBWY.Client/Models/APIModel/Request/QualityTaskRequest.cs @@ -93,10 +93,10 @@ namespace BBWY.Client.Models.APIModel.Request ///// //public DateTime? PreCompeteTime { get; set; } - /// - /// 地拖摆放编号 - /// - public int? FloorDragNumber { get; set; } + ///// + ///// 地拖摆放编号 + ///// + //public int? FloorDragNumber { get; set; } } } diff --git a/BBWY.Client/Models/APIModel/Request/UpdatePackTaskV2Request.cs b/BBWY.Client/Models/APIModel/Request/UpdatePackTaskV2Request.cs index 3e9d4374..72eada8d 100644 --- a/BBWY.Client/Models/APIModel/Request/UpdatePackTaskV2Request.cs +++ b/BBWY.Client/Models/APIModel/Request/UpdatePackTaskV2Request.cs @@ -105,5 +105,9 @@ namespace BBWY.Client.Models.APIModel.Request /// 绑定快递单号 /// public List WayBillNoList { get; set; } + /// + /// + /// + public SaveType? SaveType { get; set; } } } diff --git a/BBWY.Client/Models/APIModel/Response/PackPurchaseTask/QualityTaskResponse.cs b/BBWY.Client/Models/APIModel/Response/PackPurchaseTask/QualityTaskResponse.cs index debf0ee6..51bb0e8f 100644 --- a/BBWY.Client/Models/APIModel/Response/PackPurchaseTask/QualityTaskResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/PackPurchaseTask/QualityTaskResponse.cs @@ -103,6 +103,12 @@ namespace BBWY.Client.Models.APIModel.Response.PackPurchaseTask /// 商家自取数 /// public int? StoreGetSelfCount { get; set; } + + + /// + /// 是否首次验收 + /// + public bool IsPassInspection { get; set; } } public class WareHourseDTO { diff --git a/BBWY.Client/Models/APIModel/Response/QualityTask/SearchQualityTaskListResponse.cs b/BBWY.Client/Models/APIModel/Response/QualityTask/SearchQualityTaskListResponse.cs index df409e7d..76ee6f9f 100644 --- a/BBWY.Client/Models/APIModel/Response/QualityTask/SearchQualityTaskListResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/QualityTask/SearchQualityTaskListResponse.cs @@ -120,15 +120,15 @@ namespace BBWY.Client.Models.APIModel - ///// - ///// 条形码数据 - ///// - //public BarCodeDTO BarCodeDTO { get; set; } + /// + /// 条形码数据 + /// + public BarCodeModel BarCodeDTO { get; set; } - ///// - ///// 合格证数据 - ///// - //public CerDTO[] Cers { get; set; } + /// + /// 合格证数据 + /// + public CertificateModel[] Cers { get; set; } /// /// 品牌 diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs index 012a80aa..a8ac66c0 100644 --- a/BBWY.Client/Models/Enums.cs +++ b/BBWY.Client/Models/Enums.cs @@ -586,4 +586,11 @@ { 待验收 = 1, 验收异常 = 2 } + + + + public enum BrandMarkType + { + 无需遮盖 = 1, 需遮盖 = 2, 无需贴商标=3 + } } diff --git a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs index 7d443b51..4c936b06 100644 --- a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs @@ -897,7 +897,7 @@ namespace BBWY.Client.ViewModels.PackTask NeedCer = IsNeedCertificateModel == Need.需要, DistributionMode = DistributionMode, WayBillNoList = PackTaskExpressList?.Select(p => p.WaybillNo)?.ToList() - + }; @@ -929,6 +929,7 @@ namespace BBWY.Client.ViewModels.PackTask var updateTaskModel = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(createTaskModel)); updateTaskModel.TaskId = TaskId; + updateTaskModel.SaveType = SaveType; res = packTaskService.UpdatePackTaskV2(updateTaskModel); } else diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs index 23eaafed..fa52bfd5 100644 --- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs @@ -33,6 +33,8 @@ using BBWY.Client.Views.QualityTask; using BBWY.Client.Views.QualityTipWindows; using System.Windows.Interop; using NPOI.SS.Formula.Functions; +using NPOI.SS.Util; +using System.Text; namespace BBWY.Client.ViewModels.PackTask { @@ -883,141 +885,210 @@ namespace BBWY.Client.ViewModels.PackTask MessageBox.Show($"查找不到店铺信息, {model.ShopName}"); return; } + + var packTaskRes = qualityTaskService.GetQualityTask(model.TaskId);//获取任务详情 + + if (packTaskRes == null) + { + MessageBox.Show("网络异常!"); + return; + } + if (!packTaskRes.Success || packTaskRes.Data == null) + { + MessageBox.Show(packTaskRes.Msg); + return; + } + if (packTaskRes == null || !packTaskRes.Success) return; + + + //获取品牌和适用年龄 var skuAttsDetailRes = qualityTaskService.SearchProductAttrsBySkuId(model.SkuId, shop.AppKey, shop.AppSecret, shop.AppToken, shop.Platform); if (skuAttsDetailRes == null || !skuAttsDetailRes.Success) { MessageBox.Show(skuAttsDetailRes?.Msg); return; } - var skuAttsDetail = skuAttsDetailRes.Data; + var IsPassInspection = packTaskRes.Data.IsPassInspection; + + + + var skuAttsDetail = skuAttsDetailRes.Data; + bool isqualityCer = false; //验收合格证 + StringBuilder sb = null; + Need IsNeedCer = Need.不需要; + BrandMarkType markType = BrandMarkType.无需遮盖; + bool? isCer3CValid = null; + + new QualityProductWindow("商品合格证情况", "商品包装有合格证信息", "商品包装无合格证信息", (ishaveCer) => + { + if (ishaveCer)//验收商品 有合格证 + { + if (skuAttsDetail.ApplyAge.IsNullOrEmpty() || (skuAttsDetail.IsApplyAgeOver14 != null && skuAttsDetail.IsApplyAgeOver14.Value))//不存在使用年龄 或者适用年龄大于14 + { + new QualityProductWindow("商品合格证情况", "商品包装合格证上有品牌信息", "商品包装合格证上无品牌信息", (iscerhavebrand) => + { + + if (iscerhavebrand) + { + + new QualityProductWindow("商品合格证情况", $"商品包装合格证上的品牌是{skuAttsDetail.Brand}", $"商品包装合格证上的品牌不是{skuAttsDetail.Brand}", (istruebrand) => + { + if (!istruebrand) + { + //需要合格证 + if (model.CertificateModel == null || !model.CertificateModel.Any())//未配置 + { + sb = new StringBuilder(); + sb.AppendLine("该任务未配置合格证,商品包装合格证上的品牌与详情页的品牌不符"); + if (skuAttsDetail.ApplyAge.IsNullOrEmpty()) + sb.Append("详情页未展示适用年龄"); + else + sb.Append("详情页展示适用年龄为14岁以上"); + sb.Append("请立即配置合格证信息,包装任务已被挂起."); + var res = qualityTaskService.SendMsgToPurchaseDepartment(model.TaskId, "任务未配置合格证", sb.ToString()); + if (res.Success) + { + ReflashTask();//刷新任务 + } + return; + } + //打印合格证 完全遮盖包装合格证信息 + } + isqualityCer = true;//验收合格证完毕 + }).ShowDialog(); + return; + } + isqualityCer = true;//验收合格证完毕 + }).ShowDialog(); + } + else + { - new QualityProductWindow("商品合格证情况", "商品包装有合格证信息", "商品包装无合格证信息", (ishaveCer) => - { - if (ishaveCer)//验收商品 有合格证 - { - if (skuAttsDetail.ApplyAge.IsNullOrEmpty() || (skuAttsDetail.IsApplyAgeOver14 != null && skuAttsDetail.IsApplyAgeOver14.Value))//不存在使用年龄 或者适用年龄大于14 - { - //todo: 判断是否首次验收 只支持供应链 有采购方案的 - new QualityProductWindow("商品合格证情况", "商品合格证类型有3C标", "商品合格证类型无3C标", (ishave3c) => - { - if (ishave3c) - { - //todo: 存配置 只支持供应链 有采购方案的 - - - //验收有效性 - - new QualityProductWindow("商品合格证情况", "商品合格证类型有3C标", "商品合格证类型无3C标", (iscanuser) => - { - - if (iscanuser) - { - isqualityCer = true;//验收正常 - return; - } - //当前合格证3c无效 - //todo: - // 通知采购方问题 咨询是否可替款 - MessageBox.Show("提示采购部门,当前任务详情页展示适用年龄为14岁以下, 实物商品配置的合格证当前合格证3c无效,任务已挂起"); - - }).ShowDialog(); - - - return; - } - - //todo: - // 通知采购方问题 咨询是否可替款 - MessageBox.Show("提示采购部门,当前任务详情页展示适用年龄为14岁以下, 实物商品配置的合格证没有3C,咨询是否可替款,任务已挂起"); - - - }).ShowDialog(); - } - - //验收商品合格证是否有品牌 - - new QualityProductWindow("商品合格证情况", "商品包装合格证上有品牌信息", "商品包装合格证上无品牌信息", (iscerhavebrand) => - { - - if (iscerhavebrand) - { - - new QualityProductWindow("商品合格证情况", $"商品包装合格证上的品牌是{skuAttsDetail.Brand}", $"商品包装合格证上的品牌不是{skuAttsDetail.Brand}", (istruebrand) => - { - if (!istruebrand) - { - //需要合格证 - if (model.CertificateModel == null || !model.CertificateModel.Any())//未配置 - { - //未配置 todo: 写接口通知采购方问题 - MessageBox.Show("提示采购部门,当前任务未配置合格证,赶紧配置,任务已挂起"); - return; - } - //打印合格证 完全遮盖包装合格证信息 - } - isqualityCer = true;//验收合格证完毕 - }).ShowDialog(); - } - - }).ShowDialog(); - } - else - { - //需要合格证 - if (model.CertificateModel == null || !model.CertificateModel.Any())//未配置 - { - //未配置 todo: 写接口通知采购方问题 - MessageBox.Show("提示采购部门,当前任务未配置合格证,赶紧配置,任务已挂起"); - return; - } - - if (skuAttsDetail.ApplyAge.IsNullOrEmpty() || (skuAttsDetail.IsApplyAgeOver14 != null && skuAttsDetail.IsApplyAgeOver14.Value))//不存在使用年龄 或者适用年龄大于14 - { - isqualityCer = true;//验收正常 - return; - } - //年龄低于14 - - if (!model.CertificateModel.Any(c => c.LabelModel != CertificateLabelModel.标准有3c))//所有配置的合格证都是标准3c - { - isqualityCer = true;//验收正常 - return; - } - //不存在 3c 通知采购方问题 - MessageBox.Show("提示采购部门,当前任务配置的合格证没有3C,赶紧配置,任务已挂起"); - return; - } - - }).ShowDialog(); + if (IsPassInspection)//验收过 跳过询问 + { + isqualityCer = true; + return; + } + //todo: 判断是否首次验收 只支持供应链 有采购方案的 + new QualityProductWindow("商品合格证情况", "商品合格证类型有3C标", "商品合格证类型无3C标", (ishave3c) => + { + if (ishave3c) + { + sb = new StringBuilder(); + sb.Append("该任务商品适用年龄为14岁以下,请验证合格证上的3C信息是否有效,包装任务已被挂起."); + var res = qualityTaskService.SendMsgToPurchaseDepartment(model.TaskId, "包装合格证有3C信息且详情页适用年龄小于14岁", sb.ToString()); + if (res.Success) + { + ReflashTask();//刷新任务 + } + return; + } + else + { + //todo: + // 通知采购方问题 咨询是否可替款 + // MessageBox.Show("提示采购部门,当前任务详情页展示适用年龄为14岁以下, 实物商品配置的合格证没有3C,咨询是否可替款,任务已挂起"); + sb = new StringBuilder(); + sb.AppendLine("该任务商品包装有合格证信息"); + sb.Append("详情页展示适用年龄为14岁以下,但是商品包装合格证无3C标"); + sb.Append("请立即配置3C类型的合格证信息"); + var res = qualityTaskService.SendMsgToPurchaseDepartment(model.TaskId, "包装有合格证信息且详情页适用年龄小于14岁", sb.ToString()); + if (res.Success) + { + ReflashTask();//刷新任务 + } + } + + + + }).ShowDialog(); + } + + //验收商品合格证是否有品牌 + + + } + else + { + IsNeedCer = Need.需要;//需要合格证 + //需要合格证 + if (model.CertificateModel == null || !model.CertificateModel.Any())//未配置 + { + sb = new StringBuilder(); + sb.AppendLine("该任务未配置合格证,请立即配置合格证信息"); + var res1 = qualityTaskService.SendMsgToPurchaseDepartment(model.TaskId, "任务未配置合格证", sb.ToString()); + if (res1.Success) + { + ReflashTask();//刷新任务 + } + return; + } + + if (skuAttsDetail.ApplyAge.IsNullOrEmpty() || (skuAttsDetail.IsApplyAgeOver14 != null && skuAttsDetail.IsApplyAgeOver14.Value))//不存在使用年龄 或者适用年龄大于14 + { + isqualityCer = true;//验收正常 + return; + } + //年龄低于14 + + if (!model.CertificateModel.Any(c => c.LabelModel != CertificateLabelModel.标准有3c))//所有有配置的合格证都是标准3c + { + isqualityCer = true;//验收正常 + return; + } + //不存在 3c 通知采购方问题 + // MessageBox.Show("提示采购部门,当前任务配置的合格证没有3C,赶紧配置,任务已挂起"); + + sb = new StringBuilder(); + sb.AppendLine("该任务商品包装无合格证信息"); + + sb.Append("详情页展示适用年龄为14岁以下,"); + sb.Append("请立即配置3C类型的合格证信息"); + var res = qualityTaskService.SendMsgToPurchaseDepartment(model.TaskId, "包装无合格证信息且详情页适用年龄小于14岁", sb.ToString()); + if (res.Success) + { + ReflashTask();//刷新任务 + } + + + return; + } + + }).ShowDialog(); if (isqualityCer)//合格证验收完毕 { - + bool isqualityBrand = false; new QualityProductWindow("商品品牌情况", "商品包装有品牌信息", "商品包装无品牌信息", (ishavebrand) => { if (ishavebrand && !skuAttsDetail.IsTeamBrand)//有品牌且品牌不是集团的 { - new QualityProductWindow($"商品品牌情况", $"商品包装品牌是{skuAttsDetail.Brand}", $"商品包装品牌不是{skuAttsDetail.Brand}", (istruebrand) => { + new QualityProductWindow($"商品品牌情况", $"商品包装品牌是{skuAttsDetail.Brand}", $"商品包装品牌不是{skuAttsDetail.Brand}", (istruebrand) => + { if (istruebrand) { //无需贴商标 + + markType = BrandMarkType.无需贴商标; } else { + markType = BrandMarkType.无需遮盖; //需覆盖商标 } + isqualityBrand = true; }).ShowDialog(); @@ -1025,17 +1096,20 @@ namespace BBWY.Client.ViewModels.PackTask } else { + isqualityBrand = true; //需贴商标 - } - - + markType = BrandMarkType.无需遮盖; + } }).ShowDialog(); + if (isqualityBrand) + { + QualityWindow service = new QualityWindow(model, ReflashTask, IsNeedCer, markType, packTaskRes.Data); + service.Show(); + } - QualityWindow service = new QualityWindow(model, ReflashTask); - service.Show(); } @@ -2116,19 +2190,19 @@ namespace BBWY.Client.ViewModels.PackTask data.EndTime = item.CreateTime; data.SkuTitle = item.SkuGoodsTitle; data.AcceptName = item.UserName; - //if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0) - //{ + if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0) + { - // data.BarCodeModel = item.BarCodeDTO; - // if (data.BarCodeModel.LabelModel == BarcodeLabelModel.无型号模板) - // data.BarCodeModel.LabelModel = BarcodeLabelModel.精简模板; + data.BarCodeModel = item.BarCodeDTO; + if (data.BarCodeModel.LabelModel == BarcodeLabelModel.无型号模板) + data.BarCodeModel.LabelModel = BarcodeLabelModel.精简模板; - //} - //if (item.Cers != null) - //{ - // data.CertificateModel = item.Cers; + } + if (item.Cers != null) + { + data.CertificateModel = item.Cers; - //} + } data.ReflashTask = ReflashTask; App.Current.Dispatcher.Invoke(new Action(() => diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs index b2ff65af..0b6396bf 100644 --- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs +++ b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs @@ -98,14 +98,14 @@ namespace BBWY.Client.ViewModels public ObservableCollection AvailabilityList { get => availabilityList; set { Set(ref availabilityList, value); } } - private int floorDragNumber; - public int FloorDragNumber { get => floorDragNumber; set { Set(ref floorDragNumber, value); } } + //private int floorDragNumber; + //public int FloorDragNumber { get => floorDragNumber; set { Set(ref floorDragNumber, value); } } - private ObservableCollection floorDragNumberList = new ObservableCollection - { + //private ObservableCollection floorDragNumberList = new ObservableCollection + //{ - }; - public ObservableCollection FloorDragNumberList { get => floorDragNumberList; set { Set(ref floorDragNumberList, value); } } + //}; + //public ObservableCollection FloorDragNumberList { get => floorDragNumberList; set { Set(ref floorDragNumberList, value); } } private ObservableCollection wareHourseList = new ObservableCollection { }; public ObservableCollection WareHourseList { get => wareHourseList; set { Set(ref wareHourseList, value); } } @@ -224,6 +224,21 @@ namespace BBWY.Client.ViewModels public Need IsNeedCertificateModel { get => isNeedCertificateModel; set { Set(ref isNeedCertificateModel, value); } } + private BrandMarkType brandMarkType; + /// + /// 是否需要条形码 + /// + public BrandMarkType BrandMarkType { get => brandMarkType; set { Set(ref brandMarkType, value); } } + + + + private List brandMarkTypeList = new List { BrandMarkType.无需遮盖, BrandMarkType.需遮盖, BrandMarkType.无需贴商标 }; + /// + /// 是否需要条形码 + /// + public List BrandMarkTypeList { get => brandMarkTypeList; set { Set(ref brandMarkTypeList, value); } } + + private BarCodeModel barCodeModel; /// /// 条形码 @@ -405,7 +420,7 @@ namespace BBWY.Client.ViewModels #region 方法 private void CompeteQualityTask(object obj) { - if (ArrivalQuantity==null) + if (ArrivalQuantity == null) { MessageBox.Show($"请输入到货数量"); return; @@ -416,11 +431,11 @@ namespace BBWY.Client.ViewModels return; } - if (FloorDragNumber <= 0) - { - MessageBox.Show($"请选择摆放地拖编号"); - return; - } + //if (FloorDragNumber <= 0) + //{ + // MessageBox.Show($"请选择摆放地拖编号"); + // return; + //} if (GoodProductQuantity > ArrivalQuantity) { @@ -455,11 +470,11 @@ namespace BBWY.Client.ViewModels IsNeedBar = IsNeedBarCode == Need.需要, IsNeedCer = IsNeedCertificateModel == Need.需要, TaskId = TaskId, - FloorDragNumber = FloorDragNumber + //FloorDragNumber = FloorDragNumber }; - if (CreateTime>Convert.ToDateTime("2023-08-21")) + if (CreateTime > Convert.ToDateTime("2023-08-21")) { if (IsNeedBarCode == Need.需要) { @@ -497,7 +512,7 @@ namespace BBWY.Client.ViewModels } } - + try { var competeRes = packPurchaseTaskService.CompeteQualityTask(request); @@ -519,7 +534,7 @@ namespace BBWY.Client.ViewModels // BarCodeModel.ShopName = OriginShopName; //} batchPrint.SetData(GoodProductQuantity.Value, - PurchaseSkuList.Where(p => p.IsNeedCer&& p.CerDTO!=null && p.CerDTO.Id > 0).Select(p => p.CerDTO).ToArray() + PurchaseSkuList.Where(p => p.IsNeedCer && p.CerDTO != null && p.CerDTO.Id > 0).Select(p => p.CerDTO).ToArray() , BarCodeModel); batchPrint.ShowDialog(); @@ -603,16 +618,16 @@ namespace BBWY.Client.ViewModels bool isNeedClick = true; - if (CreateTime { @@ -660,26 +675,14 @@ namespace BBWY.Client.ViewModels /// /// 搜索 skuId(todo:) /// - public void SearchSku(PackTaskModel model) + public void LoadData(PackTaskModel model, Need cer, BrandMarkType brandMarkType, QualityTaskResponse qualityTaskResponse) { - CreateTime = model.EndTime; + CreateTime = model.EndTime; OriginShopName = model.ShopName; - - FloorDragNumber = 0; + // FloorDragNumber = 0; PurchaseSkuList = new ObservableCollection(); WareHourseList = new ObservableCollection(); - - FloorDragNumberList = new ObservableCollection(); - - for (int i = 0; i < 30; i++) - { - App.Current.Dispatcher.Invoke((Action)(() => - { - - FloorDragNumberList.Add(i + 1); - })); - } TaskId = model.TaskId; OrderId = model.OrderId; SkuId = model.SkuId; @@ -694,10 +697,6 @@ namespace BBWY.Client.ViewModels SkuTitle = model.SkuTitle; BasicPack = model.BasicPack; CertificatePosition = model.CertificatePosition; - - //ArrivalQuantity = 0; - //GoodProductQuantity = 0; - IncreateList = new ObservableCollection(); string[] increateDatas = model.Increment1?.Split(','); bool isSelected = false; @@ -729,46 +728,34 @@ namespace BBWY.Client.ViewModels ShowMarkMessage = string.Join("\r\n", resShow.Data.Select(d => d.ToString())); } - var packTaskRes = packPurchaseTaskService.GetQualityTask(model.TaskId); - - if (packTaskRes == null) - { - MessageBox.Show("网络异常!"); - return; - } - if (!packTaskRes.Success || packTaskRes.Data == null) - { - MessageBox.Show(packTaskRes.Msg); - return; - } - StoreGetSelfCount = packTaskRes.Data.StoreGetSelfCount; + + StoreGetSelfCount = qualityTaskResponse.StoreGetSelfCount; - SkuPurchaseSchemeId = packTaskRes.Data.SkuPurchaseSchemeId; - saveType = packTaskRes.Data.SaveType; + SkuPurchaseSchemeId = qualityTaskResponse.SkuPurchaseSchemeId; + saveType = qualityTaskResponse.SaveType; if (saveType == null) { saveType = OrderId.IsNullOrEmpty() ? SaveType.C端 : SaveType.B端; } - if (packTaskRes == null || !packTaskRes.Success) return; - BarCodeModel = packTaskRes.Data.BarCodeDTO; - IsNeedBarCode = packTaskRes.Data.IsNeedBar ? Need.需要 : Need.不需要; - IsSetBarCode = packTaskRes.Data.BarCodeDTO == null ? true : false; - IsNeedCertificateModel = packTaskRes.Data.IsNeedCer ? Need.需要 : Need.不需要; - if (packTaskRes.Data.WareHourses != null) - packTaskRes.Data.WareHourses.ToList().ForEach(w => + BarCodeModel = qualityTaskResponse.BarCodeDTO; + IsNeedBarCode = qualityTaskResponse.IsNeedBar ? Need.需要 : Need.不需要; + IsSetBarCode = qualityTaskResponse.BarCodeDTO == null ? true : false; + IsNeedCertificateModel = qualityTaskResponse.IsNeedCer ? Need.需要 : Need.不需要; + if (qualityTaskResponse.WareHourses != null) + qualityTaskResponse.WareHourses.ToList().ForEach(w => { App.Current.Dispatcher.Invoke(new Action(() => { WareHourseList.Add(w); })); - + }); WareHourseCount = WareHourseList.Count(); - if (packTaskRes.Data.PurchaseSkus != null) + if (qualityTaskResponse.PurchaseSkus != null) { int goodsIndex = 0; - foreach (var item in packTaskRes.Data.PurchaseSkus) + foreach (var item in qualityTaskResponse.PurchaseSkus) { goodsIndex++; if (item.CerDTO != null) item.CerDTO.GoodsNumberIndex = goodsIndex; @@ -852,8 +839,12 @@ namespace BBWY.Client.ViewModels } } + if (cer == Need.不需要) + { + CertificatePosition = CertificatePosition.无需合格证; + } - + BrandMarkType = brandMarkType; }); diff --git a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml index ab657dd2..79147d15 100644 --- a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml +++ b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml @@ -270,7 +270,7 @@ diff --git a/BBWY.Client/Views/QualityTask/QualityWindow.xaml b/BBWY.Client/Views/QualityTask/QualityWindow.xaml index 31a3a749..d168c01e 100644 --- a/BBWY.Client/Views/QualityTask/QualityWindow.xaml +++ b/BBWY.Client/Views/QualityTask/QualityWindow.xaml @@ -373,8 +373,8 @@ - - + + @@ -400,7 +400,7 @@ - + @@ -445,7 +445,7 @@ - + diff --git a/BBWY.Client/Views/QualityTask/QualityWindow.xaml.cs b/BBWY.Client/Views/QualityTask/QualityWindow.xaml.cs index 950b840e..202c64db 100644 --- a/BBWY.Client/Views/QualityTask/QualityWindow.xaml.cs +++ b/BBWY.Client/Views/QualityTask/QualityWindow.xaml.cs @@ -1,6 +1,8 @@ using BBWY.Client.Models; +using BBWY.Client.Models.APIModel.Response.PackPurchaseTask; using BBWY.Client.ViewModels; using BBWY.Controls; +using NPOI.HSSF.Record.Chart; using System; namespace BBWY.Client.Views.QualityTask @@ -10,14 +12,16 @@ namespace BBWY.Client.Views.QualityTask /// public partial class QualityWindow : BWindow { - public QualityWindow(PackTaskModel model,Action ReflashTask) + public QualityWindow(PackTaskModel model, Action ReflashTask, Need IsNeedCer, BrandMarkType markType, QualityTaskResponse qualityTaskResponse) { - + InitializeComponent(); - var qualityViewModel =(QualityViewModel)this.DataContext; + var qualityViewModel = (QualityViewModel)this.DataContext; if (qualityViewModel.ReflashWindow == null) qualityViewModel.ReflashWindow = ReflashTask; - qualityViewModel.SearchSku(model); + qualityViewModel.LoadData(model, IsNeedCer, markType, qualityTaskResponse); } + + } }