From 27ede2fea37f0cf772c370e82f0c7806519f5ace Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Sun, 21 May 2023 16:46:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=E5=A4=87?= =?UTF-8?q?=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APIServices/PackPurchaseTaskService.cs | 11 ++ .../PackPurchaseTask/PackTaskResponse.cs | 146 ++++++++++++++++++ .../ViewModels/Order/OrderViewModel.cs | 10 +- .../UpdatePurchaseTaskViewModel.cs | 79 +++++----- .../UpdatePurchaseTaskWindow.xaml | 22 ++- BBWYB.Client/appsettings.json | 4 +- 6 files changed, 219 insertions(+), 53 deletions(-) create mode 100644 BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/PackTaskResponse.cs diff --git a/BBWYB.Client/APIServices/PackPurchaseTaskService.cs b/BBWYB.Client/APIServices/PackPurchaseTaskService.cs index cbd4bf3..902443a 100644 --- a/BBWYB.Client/APIServices/PackPurchaseTaskService.cs +++ b/BBWYB.Client/APIServices/PackPurchaseTaskService.cs @@ -1,5 +1,6 @@ using BBWYB.Client.Models; using BBWYB.Client.Models.APIModel; +using BBWYB.Client.Models.APIModel.Response.PackPurchaseTask; using BBWYB.Common.Http; using BBWYB.Common.Models; using Microsoft.Extensions.Logging.Abstractions; @@ -121,6 +122,16 @@ namespace BBWYB.Client.APIServices }, null, HttpMethod.Post); } + public ApiResponse GetOrderTask(string skuId, string orderId) + { + + return SendRequest(globalContext.QKApiHost, $"api/PackPurchaseTask/GetOrderTask", new + { + skuId, + orderId + }, null, HttpMethod.Post); + + } } public class WareHourseDTO diff --git a/BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/PackTaskResponse.cs b/BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/PackTaskResponse.cs new file mode 100644 index 0000000..0f72d05 --- /dev/null +++ b/BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/PackTaskResponse.cs @@ -0,0 +1,146 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BBWYB.Client.Models.APIModel.Response.PackPurchaseTask +{ + public class PackTaskResponse + { + /// + /// 主键 + /// + [Key] + public long Id { get; set; } + + + /// + /// 需求方创建日期 + /// + public DateTime CreateTime { get; set; } + + /// + /// 任务状态（未完成=0,已完成=1，） + /// + public int TaskStatus { get; set; } + + /// + /// 项目完成时间 + /// + public DateTime? EndTime { get; set; } + + /// + /// 需求方团队id + /// + public string DepartmentId { get; set; } + + /// + /// 需求方店铺id + /// + public string ShopId { get; set; } + + /// + /// 货号品名（手写上传） + /// + public string BrandName { get; set; } + + /// + /// 对接人 + /// + public string UserId { get; set; } + + /// + /// skuid + /// + public string SkuId { get; set; } + + /// + /// sku数量 + /// + public int SkuCount { get; set; } + + /// + /// 打包类型（单件=0，多件=1） + /// + public int PackType { get; set; } + + /// + /// 落仓(本地仓=0，齐越仓=1，京东仓=2) + /// + public int PositionType { get; set; } + + /// + /// 基础包装（快递袋=0，纸箱=1，麻袋=2） + /// + public int BasicPack { get; set; } + + /// + /// 增量1() + /// + public string Increment1 { get; set; } + + /// + /// 条形码id + /// + public long? BarcodeId { get; set; } + + /// + /// 合格证 + /// + public long? CertificateId { get; set; } + /// + /// 新合格证 + /// + public string CerId { get; set; } + /// + /// 合格证位置（外部包装=0，产品包装=1,无=2） + /// + public int? CertificatePosition { get; set; } = 2; + + /// + /// sku配件名称 + /// + public string SkuGoodsTitle { get; set; } + + /// + /// 配件数 + /// + public int GoodsNumber { get; set; } + + /// + /// 气泡纸耗材（长=0，宽=1） + /// + public int? AirConsumables { get; set; } + + /// + /// 注意事项（对接备注） + /// + public string MarkMessage { get; set; } + /// + /// 到货情况(待收货=2，部分收货=1，已到货=0) + /// + public int Availability { get; set; } + + /// + /// 是否加急 + /// + public int IsWorry { get; set; } + + /// + /// 拳探订单id + /// + public string OrderId { get; set; } + + /// + /// 店铺归属 + /// + public string OriginShopId { get; set; } + + /// + /// 采购方案id + /// + public string SkuPurchaseSchemeId { get; set; } + } +} diff --git a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs index 05d7cab..b3f67b4 100644 --- a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs +++ b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs @@ -10,6 +10,7 @@ using SJ.Controls; using System; using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Globalization; using System.Linq; using System.Threading.Tasks; using System.Windows; @@ -107,13 +108,16 @@ namespace BBWYB.Client.ViewModels var objList = (object[])obj; var OriginShopName = (string)objList[0]; OrderSku order = (OrderSku)objList[1]; - var res = PackPurchaseTaskService.IsExitQikuTask(order.BelongSkuId, order.OrderId); + + + + var res = PackPurchaseTaskService.GetOrderTask(order.BelongSkuId, order.OrderId); if (res == null || !res.Success) { MessageBox.Show("网络异常!查不到任务"); return; } - if (!res.Data) + if (res.Data==null) { MessageBox.Show("打包任务,不存在或已被删除,请重新发起任务!"); return; @@ -122,7 +126,7 @@ namespace BBWYB.Client.ViewModels ViewModelLocator view = new(); var updatePackTask = view.UpdatePurchaseTask; - updatePackTask.SearchSku(obj); + updatePackTask.SearchSku(res.Data, OriginShopName, order); updatePackTask.ReflashWindow = () => { Task.Factory.StartNew(() => LoadOrder(PageIndex)); diff --git a/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs b/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs index 52038a6..c101be6 100644 --- a/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs +++ b/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs @@ -14,6 +14,7 @@ using System.Windows; using BBWYB.Client.Models.PackPurchaseTask; using BBWYB.Client.Views.PackPurchaseTask; using BBWYB.Client.Models.APIModel; +using BBWYB.Client.Models.APIModel.Response.PackPurchaseTask; namespace BBWYB.Client.ViewModels { @@ -301,7 +302,7 @@ namespace BBWYB.Client.ViewModels SetCertificateCommand = new RelayCommand(SetCertificate); LookBarCommand = new RelayCommand(LookBar); LookCerCommand = new RelayCommand(LookCer); - SearchSkuCommand = new RelayCommand(SearchSku); + IncreateList = new ObservableCollection(); foreach (var item in increates) { @@ -313,10 +314,7 @@ namespace BBWYB.Client.ViewModels } this.purchaseService = purchaseService; -#if DEBUG - //Test(); -#endif } PurchaseService purchaseService; public string OriginShopName { get; set; } @@ -325,12 +323,6 @@ namespace BBWYB.Client.ViewModels public string ShopId { get; set; } public string UserName { get; set; } - public void Test(OrderSku order) - { - SearchSku(order); - - - } #region 方法 public ICommand SetBarCodeCommand { get; set; } @@ -384,7 +376,8 @@ namespace BBWYB.Client.ViewModels if (model.CerDTO == null) { - model.CerDTO = new CertificateModel { + model.CerDTO = new CertificateModel + { ProductNo = ProductNo, Brand = Brand, SkuId = SkuId, @@ -430,14 +423,14 @@ namespace BBWYB.Client.ViewModels /// /// 搜索 skuId(todo:) /// - public void SearchSku(object obj) + public void SearchSku(PackTaskResponse obj, string shopname, OrderSku order) { InitData(); - var objList = (object[])obj; - + + MarkMessage = obj.MarkMessage; //SkuPurchaseSchemeId = "416647656341573"; - OriginShopName = (string)objList[0]; - OrderSku order= (OrderSku)objList[1]; + OriginShopName = shopname; + SkuId = order.BelongSkuId; OrderId = order.OrderId; @@ -487,7 +480,7 @@ namespace BBWYB.Client.ViewModels new TipsWindow(productSku.Msg).Show(); return; } - + SkuPurchaseSchemeId = productSku.Data.SkuPurchaseSchemeId; BarCodeModel = productSku.Data.BarCode; @@ -509,15 +502,17 @@ namespace BBWYB.Client.ViewModels var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId); if (list == null) continue; var skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId); - App.Current.Dispatcher.Invoke(new Action(() => { - PurchaseSkuList.Add(new Models.PackPurchaseTask.PurchaseSku { - Logo=skuItem.Logo, - Title=skuItem.Title, - IsNeedCer=item.IsNeedCer, - PurchaseSkuId=item.PurchaseSkuId, - CerDTO=item.CerDTO, - IsSetCertificate= item.CerDTO==null?true:false , - }); + App.Current.Dispatcher.Invoke(new Action(() => + { + PurchaseSkuList.Add(new Models.PackPurchaseTask.PurchaseSku + { + Logo = skuItem.Logo, + Title = skuItem.Title, + IsNeedCer = item.IsNeedCer, + PurchaseSkuId = item.PurchaseSkuId, + CerDTO = item.CerDTO, + IsSetCertificate = item.CerDTO == null ? true : false, + }); })); } @@ -533,10 +528,10 @@ namespace BBWYB.Client.ViewModels PackType = (PackType)config.PackType; BasicPack = (BasicPack)config.BasicPack; Availability = (TaskState)config.Availability; - MarkMessage = config.MarkMessage; + //MarkMessage = config.MarkMessage; CertificatePosition = config.CertificatePosition == null ? CertificatePosition.无 : (CertificatePosition)config.CertificatePosition.Value; // Increment1 = config.Increment1; - string[] increateDatas = config.Increment1.Split(','); + string[] increateDatas = config.Increment1?.Split(','); IsNeedBarCode = config.NeedBar ? Need.需要 : Need.不需要; IsNeedCertificateModel = config.NeedCer ? Need.需要 : Need.不需要; @@ -547,7 +542,7 @@ namespace BBWYB.Client.ViewModels foreach (var item in increates) { isSelected = false; - if (increateDatas.Contains(item)) + if (increateDatas != null && increateDatas.Count() > 0 && increateDatas.Contains(item)) { isSelected = true; } @@ -617,12 +612,12 @@ namespace BBWYB.Client.ViewModels PackType = PackType.单件; BasicPack = BasicPack.快递袋; // Availability = (TaskState.)config.Availability; - //MarkMessage = config.MarkMessage; + MarkMessage = ""; CertificatePosition = CertificatePosition.无; // Increment1 = config.Increment1; - - IsNeedBarCode = Need.需要 ; - IsNeedCertificateModel = Need.不需要; + + IsNeedBarCode = Need.需要; + IsNeedCertificateModel = Need.不需要; } private void OpenSkuDetail(object param) { @@ -645,7 +640,7 @@ namespace BBWYB.Client.ViewModels } private void CreateTask(object obj) { - + string increateStr = ""; var increates = IncreateList.Where(i => i.IsSelected).Select(i => i.IncreateName); if (increates != null && increates.Count() > 0) @@ -663,10 +658,10 @@ namespace BBWYB.Client.ViewModels BasicPack = (int)BasicPack, SkuId = SkuId, Increment1 = increateStr, - + CertificatePosition = (int)CertificatePosition, PackType = (int)PackType, - // MarkMessage = MarkMessage, + MarkMessage = MarkMessage, PositionType = (int)PositionType, GoodsNumber = GoodsNumber, SkuGoodsTitle = SkuTitle, @@ -675,8 +670,10 @@ namespace BBWYB.Client.ViewModels NeedCer = IsNeedCertificateModel == Need.需要, SkuPurchaseSchemeId = SkuPurchaseSchemeId, Brand = Brand, - PurchaseSkuSpecs = PurchaseSkuList.Select(p => new PurchaseSkuSpec { - IsNeedCer=p.IsNeedCer, PurchaseSkuId=p.PurchaseSkuId, + PurchaseSkuSpecs = PurchaseSkuList.Select(p => new PurchaseSkuSpec + { + IsNeedCer = p.IsNeedCer, + PurchaseSkuId = p.PurchaseSkuId, }).ToArray() //IsWorry = IsWorry @@ -685,15 +682,15 @@ namespace BBWYB.Client.ViewModels { if (BarCodeModel == null || IsSetBarCode || BarCodeModel.Id <= 0) { - new TipsWindow("请设置条形码模板").Show(); + new TipsWindow("请设置条形码模板").Show(); return; } createTaskModel.BarCodeId = BarCodeModel.Id; } if (IsNeedCertificateModel == Need.需要) { - var cerList = purchaseSkuList.Where(p => p.IsNeedCer).Select(p => p.CerDTO).Select(c=>c.Id).Where(c => c > 0).ToList(); - if ( purchaseSkuList.Count() <= 0|| cerList.Count<=0) + var cerList = purchaseSkuList.Where(p => p.IsNeedCer).Select(p => p.CerDTO).Select(c => c.Id).Where(c => c > 0).ToList(); + if (purchaseSkuList.Count() <= 0 || cerList.Count <= 0) { new TipsWindow("请设置合格证模板").Show(); return; diff --git a/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml b/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml index d0b228a..74bda14 100644 --- a/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml +++ b/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml @@ -16,7 +16,7 @@ MinButtonVisibility="Collapsed" MaxButtonVisibility="Collapsed" RightButtonGroupMargin="0,5,5,0" - Height="450" Width="1305"> + Height="520" Width="1305"> @@ -127,7 +127,7 @@ - - + @@ -240,8 +240,13 @@ - - + + + + + + + @@ -334,6 +339,9 @@ + + + diff --git a/BBWYB.Client/appsettings.json b/BBWYB.Client/appsettings.json index a5bfcc3..06f7aa8 100644 --- a/BBWYB.Client/appsettings.json +++ b/BBWYB.Client/appsettings.json @@ -3,7 +3,7 @@ "BBWYApiHost": "http://bbwyb.qiyue666.com", "MDSApiHost": "http://mdsapi.qiyue666.com", "BBWYCApiHost": "http://bbwytest.qiyue666.com", - "QKApiHost": "http://localhost:8080" - //"QKApiHost": "http://qiku.qiyue666.com" + //"QKApiHost": "http://localhost:8080" + "QKApiHost": "http://qiku.qiyue666.com" } \ No newline at end of file