From a7594750643f3b623a36bb1177e3f3c7438cb906 Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Thu, 13 Jul 2023 15:16:48 +0800 Subject: [PATCH] 1 --- .../PackTask/PackTaskResultResponse.cs | 173 ------------------ .../PackTask/SearchTaskListResponse.cs | 27 ++- BBWY.Client/Models/PackTask/PackTaskModel.cs | 4 +- .../ViewModels/PackTask/TaskListViewModel.cs | 2 - .../PackTask/UpdatePurchaseTaskViewModel.cs | 11 +- .../PackTask/WareHouseListViewModel.cs | 19 +- .../QualityTask/QualityViewModel.cs | 10 +- .../Views/PackTask/WaitPackageControl.xaml | 11 +- .../Views/PackTask/WareHouseListControl.xaml | 28 +-- .../Views/QualityTask/WaitQualityControl.xaml | 7 - 10 files changed, 54 insertions(+), 238 deletions(-) delete mode 100644 BBWY.Client/Models/APIModel/Response/PackTask/PackTaskResultResponse.cs diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/PackTaskResultResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/PackTaskResultResponse.cs deleted file mode 100644 index 1ffffef6..00000000 --- a/BBWY.Client/Models/APIModel/Response/PackTask/PackTaskResultResponse.cs +++ /dev/null @@ -1,173 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Windows.Automation.Peers; -using WebSocketSharp; - -namespace BBWY.Client.Models.APIModel.Response.PackTask -{ - //public class PackTaskResultResponse - //{ - // /// - // /// 查询总数据(判断总页数) - // /// - // public int TotalCount { get; set; } - - // /// - // /// 页面返回的数据 - // /// - // public GetPackTaskDTO[] Items { get; set; } - //} - //public class GetPackTaskDTO - //{ - // /// - // /// SKU标题 - // /// - // public string SkuName { get; set; } - // /// - // /// 图片链接 - // /// - // public string Logo { get; set; } - // /// - // /// 任务id - // /// - // public long TaskId { get; set; } - - // /// - // /// 需求方创建日期 - // /// - // public DateTime CreateTime { get; set; } - - // /// - // /// 任务状态（未完成=0,已完成=1，） - // /// - // public int TaskStatus { get; set; } - - // /// - // /// 需求方团队 - // /// - // public string DepartmentName { get; set; } - - // /// - // /// 需求方店铺 - // /// - // public string ShopName { get; set; } - - // /// - // /// 货号 - // /// - // public string ProductItemNum { get; set; } - - // /// - // /// 货号品名 - // /// - // public string BrandName { get; set; } - - // /// - // /// 对接人 - // /// - // public string UserName { get; set; } - - // /// - // /// 打包人 - // /// - // public string[] PackUserName { get; set; } - - // /// - // /// skuid - // /// - // public string SkuId { get; set; } - - // /// - // /// sku数量 - // /// - // public int SkuCount { get; set; } - // /// - // /// 打包类型（单件=0，多件=1） - // /// - // public int PackType { get; set; } - - // /// - // /// 落仓(商家仓=0，云仓=1，京仓=2,3=聚水潭) - // /// - // public int PositionType { get; set; } - - // /// - // /// 基础包装（快递袋=0，纸箱=1，麻袋=2） - // /// - // public int BasicPack { get; set; } - - // /// - // /// 增量1() - // /// - // public string Increment1 { get; set; } - - - // /// - // /// 工序道数 - // /// - // public int? ProcessCount { get; set; } - - // /// - // /// 到货情况(待收货=0，部分收货=1，已到货=2) - // /// - // public int Availability { get; set; } - - // //todo: 条形码数据 合格证数据 - - // ///// - // ///// 打包费用 - // ///// - // //public FeesItemTypeDTO FeesItemTypeDTO { get; set; } - // /// - // /// - // /// - // public FeesItemResponse FeesItemResponse { get; set; } - // /// - // /// 合格证位置（外部包装=0，产品包装=1） - // /// - // public int? CertificatePosition { get; set; } - - // /// - // /// 箱子耗材（自带=0，4-13号纸箱=1-10，） - // /// - // public int? BoxConsumables { get; set; } - - // /// - // /// sku配件名称 - // /// - // public string SkuGoodsTitle { get; set; } - - // /// - // /// 配件数 - // /// - // public int GoodsNumber { get; set; } - - // /// - // /// 气泡纸耗材（长=0，宽=1） - // /// - // public int? AirConsumables { get; set; } - - // /// - // /// 注意事项（对接备注） - // /// - // public string MarkMessage { get; set; } - - // public BarCodeModel BarCodeDTO { get; set; } - // public CertificateModel[] cers { get; set; } - // /// - // /// 是否加急 - // /// - // public int IsWorry { get; set; } - - - // /// - // /// 品牌 - // /// - // public string Brand { get; set; } - // public string OrderId { get; set; } - //} - - - -} diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs index 0e8ffa8f..3145ae00 100644 --- a/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs @@ -105,10 +105,10 @@ namespace BBWY.Client.Models.APIModel public string Increment1 { get; set; } - /// - /// 到货情况(待收货=0，部分收货=1，已到货=2) - /// - public int Availability { get; set; } + ///// + ///// 到货情况(待收货=0，部分收货=1，已到货=2) + ///// + //public int Availability { get; set; } /// @@ -134,10 +134,10 @@ namespace BBWY.Client.Models.APIModel public int GoodsNumber { get; set; } - /// - /// 注意事项（对接备注） - /// - public string MarkMessage { get; set; } + ///// + ///// 注意事项（对接备注） + ///// + //public string MarkMessage { get; set; } /// @@ -151,10 +151,10 @@ namespace BBWY.Client.Models.APIModel public CertificateModel[] Cers { get; set; } - /// - /// 品牌 - /// - public string Brand { get; set; } + ///// + ///// 品牌 + ///// + //public string Brand { get; set; } public string OrderId { get; set; } @@ -188,9 +188,6 @@ namespace BBWY.Client.Models.APIModel /// 打包超时备注信息 /// public string PackOverTimeMarkMsg { get; set; } - - - /// /// 备注消息列表 /// diff --git a/BBWY.Client/Models/PackTask/PackTaskModel.cs b/BBWY.Client/Models/PackTask/PackTaskModel.cs index 9d64d4e9..06a8ea72 100644 --- a/BBWY.Client/Models/PackTask/PackTaskModel.cs +++ b/BBWY.Client/Models/PackTask/PackTaskModel.cs @@ -45,14 +45,14 @@ namespace BBWY.Client.Models { - if (!this.SkuPurchaseSchemeId.IsNullOrEmpty()) + if (!this.SkuPurchaseSchemeId.IsNullOrEmpty())//B端有采购方案 { UpdatePurchaseTaskWindow updatePurchaseWindow = new UpdatePurchaseTaskWindow(this,ReflashTask); updatePurchaseWindow.ShowDialog(); return; } - if (!OrderId.IsNullOrEmpty()&& SkuPurchaseSchemeId.IsNullOrEmpty())//B端手动添加合格证 + if (!OrderId.IsNullOrEmpty()&& SkuPurchaseSchemeId.IsNullOrEmpty())//B端无采购方案 ,手动添加合格证 { PublishTaskWindow publishB = new PublishTaskWindow(ReflashTask, this,SaveType.B端); publishB.ShowDialog(); diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs index 14867e89..d77f68ca 100644 --- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs @@ -547,10 +547,8 @@ namespace BBWY.Client.ViewModels.PackTask var data = new PackTaskModel() { - Brand = item.Brand, SkuId = item.SkuId, AcceptName = item.UserName, - Availability = (Availability)item.Availability, BasicPack = (BasicPack)item.BasicPack, DepartmentName = item.DepartmentName, CertificatePosition = (CertificatePosition)item.CertificatePosition, diff --git a/BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs index 40330280..b03fc3e8 100644 --- a/BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs @@ -319,7 +319,7 @@ namespace BBWY.Client.ViewModels.PackTask IncreateList = new ObservableCollection(); foreach (var item in increates) { - + IncreateList.Add(new IncreateModel { IncreateName = item, @@ -369,7 +369,7 @@ namespace BBWY.Client.ViewModels.PackTask - public SaveType SaveType { get; set; } + public SaveType SaveType { get; set; } #region 方法 public ICommand SetBarCodeCommand { get; set; } @@ -436,7 +436,7 @@ namespace BBWY.Client.ViewModels.PackTask if (!string.IsNullOrEmpty(BrandName)) model.CerDTO.BrandName = BrandName; - QualitySetCerWindow setCerWindow = new QualitySetCerWindow(); + QualitySetCerWindow setCerWindow = new QualitySetCerWindow(); setCerWindow.LoadData(model.IsNeedCer, model.CerDTO, packPurchaseTaskService, spuCertificateModel, IsSetSpuCertificate, SaveType); setCerWindow.SaveResult = (s, PackCerState) => { @@ -487,7 +487,7 @@ namespace BBWY.Client.ViewModels.PackTask OriginShopName = obj.ShopName; - SkuId =obj.SkuId; + SkuId = obj.SkuId; OrderId = obj.OrderId; var shopList = globalContext.User.ShopList; @@ -552,7 +552,8 @@ namespace BBWY.Client.ViewModels.PackTask foreach (var item in productSku.Data.PurchaseSkus) { var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId); - if (list == null) continue; + if (list == null ||!list.Success|| list.Data == null) + continue; var skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId); if (skuItem == null) { diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs index 7c51ba09..c8d34beb 100644 --- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs @@ -1064,6 +1064,14 @@ namespace BBWY.Client.ViewModels.PackTask System.Windows.MessageBox.Show("该任务采购单未进行发货,请联系业务进行发货后在确认收货", "提示"); return; } + } + if (System.Windows.MessageBox.Show("是否确认收货?", "提示", + MessageBoxButton.YesNo, + MessageBoxImage.Warning) != MessageBoxResult.Yes) + return; + + if (!model.OrderId.IsNullOrEmpty()) + { var manualSigns = packTaskService.BatchManualSign(model.ExpressOrderList.Select(e => e.WaybillNo).ToArray()); if (manualSigns == null || !manualSigns.Success) { @@ -1074,11 +1082,6 @@ namespace BBWY.Client.ViewModels.PackTask } } } - if (System.Windows.MessageBox.Show("是否确认收货?", "提示", - MessageBoxButton.YesNo, - MessageBoxImage.Warning) != MessageBoxResult.Yes) - return; - res = packTaskService.SetPackTaskState(taskId, Models.TaskState.待验收); break; case Models.TaskState.待验收: @@ -1088,7 +1091,7 @@ namespace BBWY.Client.ViewModels.PackTask var packModel = PackTaskList.SingleOrDefault(p => p.TaskId == taskId); if (packModel == null || packModel.FeesItemResponse == null || packModel.FeesItemResponse.DiscountAllFees == 0) { - System.Windows.MessageBox.Show("请先设置打包费用!"); + System.Windows.MessageBox.Show("请先设置打包费用0!"); return; } if (System.Windows.MessageBox.Show("是否完成打包?", "提示", @@ -1469,7 +1472,7 @@ namespace BBWY.Client.ViewModels.PackTask foreach (var item in dataModel.WaitSealBoxModels) { - App.Current.Dispatcher.BeginInvoke(new Action(() => + App.Current.Dispatcher.Invoke(new Action(() => { WareNoSealBoxModels.Add(new WareNoSealBoxModel { @@ -1477,7 +1480,6 @@ namespace BBWY.Client.ViewModels.PackTask DepartmentName = item.DepartmentName, SealBoxSkus = item.SealBoxSkus.Select(s => { - s.Logo = s.Logo.Replace("80x80", $"{randNum}x{randNum}"); return s; }).ToList(), @@ -1516,7 +1518,6 @@ namespace BBWY.Client.ViewModels.PackTask var data = new PackTaskModel() { AcceptName = item.UserName, - Availability = (Availability)item.Availability, BasicPack = (BasicPack)item.BasicPack, DepartmentName = item.DepartmentName, CertificatePosition = (CertificatePosition)item.CertificatePosition, diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs index 6a0c9190..12a4b4a8 100644 --- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs +++ b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs @@ -638,7 +638,6 @@ namespace BBWY.Client.ViewModels FloorDragNumberList.Add(i + 1); })); - } TaskId = model.TaskId; OrderId = model.OrderId; @@ -700,9 +699,6 @@ namespace BBWY.Client.ViewModels MessageBox.Show(packTaskRes.Msg); return; } - - - SkuPurchaseSchemeId = packTaskRes.Data.SkuPurchaseSchemeId; saveType = packTaskRes.Data.SaveType; if (saveType == null) @@ -741,9 +737,8 @@ namespace BBWY.Client.ViewModels })); continue; } - var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId); - if (list == null && !list.Success) + if (list == null && !list.Success && list.Data == null) { App.Current.Dispatcher.Invoke(new Action(() => { @@ -752,7 +747,8 @@ namespace BBWY.Client.ViewModels continue; } PurchaseSkuItemBasicInfoResponse skuItem = null; - if (list.Data != null) skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId); + if (list.Data != null) + skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId); App.Current.Dispatcher.Invoke(new Action(() => diff --git a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml index ac7eee8a..573b718c 100644 --- a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml +++ b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml @@ -152,7 +152,7 @@ - + @@ -161,7 +161,6 @@ - @@ -212,7 +211,7 @@ - + @@ -284,7 +283,7 @@ - + @@ -578,8 +577,8 @@ + Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}" + /> - + - + @@ -172,7 +172,7 @@ - + @@ -214,11 +214,11 @@ - + - + @@ -272,11 +272,11 @@ - + - + @@ -454,7 +454,7 @@ - + @@ -517,11 +517,15 @@ Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" /> - + + - - -