From 3eeffc16689423f6f5840eda2f5569f9dfa528ae Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Fri, 7 Jul 2023 21:04:09 +0800 Subject: [PATCH 1/6] 10145 --- BBWY.Client/GlobalContext.cs | 2 +- BBWY.Client/Models/PackTask/PackTaskModel.cs | 6 +++--- BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs | 8 ++++---- BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 280cc5c6..930f2138 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -13,7 +13,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10144"; + ClientVersion = "10145"; } private User user; diff --git a/BBWY.Client/Models/PackTask/PackTaskModel.cs b/BBWY.Client/Models/PackTask/PackTaskModel.cs index 239593f7..bd65823b 100644 --- a/BBWY.Client/Models/PackTask/PackTaskModel.cs +++ b/BBWY.Client/Models/PackTask/PackTaskModel.cs @@ -94,7 +94,7 @@ namespace BBWY.Client.Models return; } LookCerWindow lookCerWindow = new LookCerWindow(CertificateModel); - lookCerWindow.Show(); + lookCerWindow.ShowDialog(); } @@ -134,7 +134,7 @@ namespace BBWY.Client.Models printWindow.CertificateModel = certificateModel; printWindow.LoadData(); //printWindow.Datas = LoadCerLabelModels(); - printWindow.Show(); + printWindow.ShowDialog(); } /// @@ -160,7 +160,7 @@ namespace BBWY.Client.Models }; printWindow.LoadData(); //printWindow.Datas = LoadBarLabelModels(); - printWindow.Show(); + printWindow.ShowDialog(); } diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs index d66ed015..f17c215c 100644 --- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs @@ -269,7 +269,7 @@ namespace BBWY.Client.ViewModels.PackTask var id = (long)paramList[0]; var markMsg = paramList[1].ToString(); SubmitOverTimeMarkMsgWindow submitOverTimeMarkMsgWindow = new SubmitOverTimeMarkMsgWindow(OverTimeTaskType.待落仓, id, markMsg, packTaskService, ReflashTask) ; - submitOverTimeMarkMsgWindow.Show(); + submitOverTimeMarkMsgWindow.ShowDialog(); } private void SetFallWareConfigured(object obj) @@ -324,7 +324,7 @@ namespace BBWY.Client.ViewModels.PackTask SealBoxConfigureWindow sealBoxConfigureWindow = new SealBoxConfigureWindow(updateSealBoxConfig.Data.UpdateSealBoxConfiguredTaskDatas, ReflashTask, sealBoxId); - sealBoxConfigureWindow.Show(); + sealBoxConfigureWindow.ShowDialog(); } private void ConfiguredSealBox() @@ -360,7 +360,7 @@ namespace BBWY.Client.ViewModels.PackTask return; } SealBoxConfigureWindow sealBoxConfigureWindow = new SealBoxConfigureWindow(updateSealBoxConfig.Data.UpdateSealBoxConfiguredTaskDatas, ReflashTask, 0); - sealBoxConfigureWindow.Show(); + sealBoxConfigureWindow.ShowDialog(); } @@ -1017,7 +1017,7 @@ namespace BBWY.Client.ViewModels.PackTask public void CreateTask() { PublishTaskWindow publish = new PublishTaskWindow(ReflashTask); - publish.Show(); + publish.ShowDialog(); } /// diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs index 48fcd228..fc6eafed 100644 --- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs @@ -435,7 +435,7 @@ namespace BBWY.Client.ViewModels.PackTask } SubmitOverTimeMarkMsgWindow submitOverTimeMarkMsgWindow = new SubmitOverTimeMarkMsgWindow(overTimeTaskType, id, markMsg, packTaskService, ReflashTask); - submitOverTimeMarkMsgWindow.Show(); + submitOverTimeMarkMsgWindow.ShowDialog(); } private void LookLSOrderConfigure(object obj) @@ -487,7 +487,7 @@ namespace BBWY.Client.ViewModels.PackTask var totalPageIndex = data.GetWareLSOrderPurchases.Count() % 10 == 0 ? data.GetWareLSOrderPurchases.Count() / 10 : data.GetWareLSOrderPurchases.Count() / 10 + 1; WareLSAcceptOrderWindow wareLSAcceptOrderWindow = new WareLSAcceptOrderWindow(lsdTaskMsg, lookData, 1, totalPageIndex, model.BoxConfigureData.PrewOrder); - wareLSAcceptOrderWindow.Show(); + wareLSAcceptOrderWindow.ShowDialog(); } private void PrintLSOrderConfigure(object obj) @@ -691,14 +691,14 @@ namespace BBWY.Client.ViewModels.PackTask if (fallware.WareType == WareType.京仓) { SetJDWareBoxWindow window = new SetJDWareBoxWindow(model); - window.Show(); + window.ShowDialog(); //var w = new SetJDWareBoxWindow2(model, sealBoxService, fallware.WareType, ReflashTask, false); //w.ShowDialog(); } if (fallware.WareType == WareType.云仓 || fallware.WareType == WareType.聚水潭齐越仓) { SetCloudWareBoxWindow window = new SetCloudWareBoxWindow(model, fallware.WareType); - window.Show(); + window.ShowDialog(); } } From fcef5e14029ad0582d64dbc1e08721ad46ea772b Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Fri, 7 Jul 2023 23:05:21 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=89=93=E5=8D=B0=20=E5=93=81=E5=90=8D?= =?UTF-8?q?=E6=8D=A2=E6=88=90=E5=BA=97=E9=93=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/Helpers/MyPrintHelper.cs | 16 ++++++++--- BBWY.Client/Models/PackTask/BarCodeModel.cs | 6 +++-- BBWY.Client/Models/PackTask/PackTaskModel.cs | 3 ++- .../QualityTask/QualityViewModel.cs | 7 ++++- .../Views/PackTask/MinBarcodeControl.xaml | 27 ++++++++++--------- BBWY.Client/Views/PackTask/ServiceWindow.xaml | 1 + .../Views/PackTask/ServiceWindow.xaml.cs | 6 +++++ .../QualityTask/BatchPrintWindow.xaml.cs | 2 +- 8 files changed, 47 insertions(+), 21 deletions(-) diff --git a/BBWY.Client/Helpers/MyPrintHelper.cs b/BBWY.Client/Helpers/MyPrintHelper.cs index 59a6e039..06117333 100644 --- a/BBWY.Client/Helpers/MyPrintHelper.cs +++ b/BBWY.Client/Helpers/MyPrintHelper.cs @@ -79,8 +79,8 @@ namespace BBWY.Client.Helpers - args.Graphics.DrawString($"品名: {barCode.BrandName}", font, System.Drawing.Brushes.Black, new PointF(10, topHeigth)); - topHeigth += (heightSpace + sizeHeight); + //args.Graphics.DrawString($"品名: {barCode.BrandName}", font, System.Drawing.Brushes.Black, new PointF(10, topHeigth)); + //topHeigth += (heightSpace + sizeHeight); switch (barCode.LabelModel) @@ -99,6 +99,10 @@ namespace BBWY.Client.Helpers // g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias; size = args.Graphics.MeasureString(barcodeSku, font); topHeigth += (heightSpace + sizeHeight); + + args.Graphics.DrawString($"店铺: {barCode.ShopName}", font, System.Drawing.Brushes.Black, new PointF(10, topHeigth)); + topHeigth += (heightSpace + sizeHeight); + args.Graphics.DrawImage(img, 1, topHeigth, 234, 50); topHeigth += (50 + 5); args.Graphics.DrawString(barcodeSku, font, System.Drawing.Brushes.Black, new PointF((236 - size.Width) / 2, topHeigth)); @@ -145,8 +149,12 @@ namespace BBWY.Client.Helpers string barcodeSku = $"POP{barCode.SkuId}"; Barcode barcode = new Barcode(); System.Drawing.Image img = barcode.Encode(TYPE.CODE128, barcodeSku, 500, 60); - args.Graphics.DrawString($"品名: {barCode.BrandName}", font, System.Drawing.Brushes.Black, new PointF(10, 10)); - args.Graphics.DrawString($"规格: {barCode.SkuName}", font, System.Drawing.Brushes.Black, new PointF(10, 40)); + //args.Graphics.DrawString($"品名: {barCode.BrandName}", font, System.Drawing.Brushes.Black, new PointF(10, 10)); + //args.Graphics.DrawString($"规格: {barCode.SkuName}", font, System.Drawing.Brushes.Black, new PointF(10, 40)); + + + args.Graphics.DrawString($"规格: {barCode.SkuName}", font, System.Drawing.Brushes.Black, new PointF(10, 10)); + args.Graphics.DrawString($"店铺: {barCode.ShopName}", font, System.Drawing.Brushes.Black, new PointF(10, 40)); // g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias; SizeF size = args.Graphics.MeasureString(barcodeSku, font); args.Graphics.DrawString(barcodeSku, font, System.Drawing.Brushes.Black, new PointF((236 - size.Width) / 2, 130)); diff --git a/BBWY.Client/Models/PackTask/BarCodeModel.cs b/BBWY.Client/Models/PackTask/BarCodeModel.cs index 9131979a..d6c4e695 100644 --- a/BBWY.Client/Models/PackTask/BarCodeModel.cs +++ b/BBWY.Client/Models/PackTask/BarCodeModel.cs @@ -64,8 +64,10 @@ namespace BBWY.Client.Models /// public BarcodeLabelModel LabelModel { get => labelModel; set { Set(ref labelModel, value); } } + /// + /// 店铺名 + /// + public string ShopName { get; set; } - - } } diff --git a/BBWY.Client/Models/PackTask/PackTaskModel.cs b/BBWY.Client/Models/PackTask/PackTaskModel.cs index bd65823b..e3817e6f 100644 --- a/BBWY.Client/Models/PackTask/PackTaskModel.cs +++ b/BBWY.Client/Models/PackTask/PackTaskModel.cs @@ -156,7 +156,8 @@ namespace BBWY.Client.Models LabelModel = BarCodeModel.LabelModel, ProductNo = BarCodeModel.ProductNo, SkuId = BarCodeModel.SkuId, - SkuName = BarCodeModel.SkuName + SkuName = BarCodeModel.SkuName, + ShopName= ShopName }; printWindow.LoadData(); //printWindow.Datas = LoadBarLabelModels(); diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs index c2dec7f5..343430d9 100644 --- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs +++ b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs @@ -587,6 +587,11 @@ namespace BBWY.Client.ViewModels } BatchPrintWindow batchPrint = new BatchPrintWindow(); + + if (BarCodeModel!=null) + { + BarCodeModel.ShopName = OriginShopName; + } batchPrint.SetData(GoodProductQuantity, PurchaseSkuList.Where(p => p.IsNeedCer && p.CerDTO.Id > 0).Select(p => p.CerDTO).ToArray() , BarCodeModel); @@ -809,7 +814,7 @@ namespace BBWY.Client.ViewModels /// public void SearchSku(PackTaskModel model) { - + OriginShopName = model.ShopName; InitData(); TaskId = model.TaskId; OrderId = model.OrderId; diff --git a/BBWY.Client/Views/PackTask/MinBarcodeControl.xaml b/BBWY.Client/Views/PackTask/MinBarcodeControl.xaml index 7dc25ac8..222338cb 100644 --- a/BBWY.Client/Views/PackTask/MinBarcodeControl.xaml +++ b/BBWY.Client/Views/PackTask/MinBarcodeControl.xaml @@ -10,14 +10,15 @@ - - - - + + + + + @@ -31,10 +32,7 @@ - - - - + @@ -43,6 +41,10 @@ + + + + @@ -55,14 +57,15 @@ - - - - + + + + + diff --git a/BBWY.Client/Views/PackTask/ServiceWindow.xaml b/BBWY.Client/Views/PackTask/ServiceWindow.xaml index d61023d7..7cea7a55 100644 --- a/BBWY.Client/Views/PackTask/ServiceWindow.xaml +++ b/BBWY.Client/Views/PackTask/ServiceWindow.xaml @@ -709,6 +709,7 @@ + diff --git a/BBWY.Client/Views/PackTask/ServiceWindow.xaml.cs b/BBWY.Client/Views/PackTask/ServiceWindow.xaml.cs index 8881d92b..004a0bcc 100644 --- a/BBWY.Client/Views/PackTask/ServiceWindow.xaml.cs +++ b/BBWY.Client/Views/PackTask/ServiceWindow.xaml.cs @@ -39,6 +39,12 @@ namespace BBWY.Client.Views.PackTask var serviceViewModel= this.DataContext as PackServiceViewModel; //加载数据 + + if (model.BarCodeModel!=null) + { + model.BarCodeModel.ShopName= model.ShopName; + } + serviceViewModel.PackTaskModel = model; serviceViewModel.PackTaskList = new System.Collections.ObjectModel.ObservableCollection { model }; serviceViewModel.FloorDragNumber = model.FloorDragNumber; diff --git a/BBWY.Client/Views/QualityTask/BatchPrintWindow.xaml.cs b/BBWY.Client/Views/QualityTask/BatchPrintWindow.xaml.cs index 8f7a5be7..a27123b4 100644 --- a/BBWY.Client/Views/QualityTask/BatchPrintWindow.xaml.cs +++ b/BBWY.Client/Views/QualityTask/BatchPrintWindow.xaml.cs @@ -41,7 +41,7 @@ namespace BBWY.Client.Views.QualityTask this.DataContext = this; } - + public CertificateModel[] CertificateModel { get; set; } From 071f36ce83301ebaa21068fcd391de0011cc90e9 Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Sun, 9 Jul 2023 14:12:58 +0800 Subject: [PATCH 3/6] 1 --- .../Models/APIModel/Request/BarCodeRequest.cs | 8 +-- BBWY.Client/Models/Enums.cs | 8 +-- BBWY.Client/Models/PackTask/BarCodeModel.cs | 9 --- BBWY.Client/Models/PackTask/PackTaskModel.cs | 11 +--- .../PackTask/PublishTaskViewModel.cs | 3 +- .../Views/PackTask/BarcodeControl.xaml | 36 ++++++----- BBWY.Client/Views/PackTask/SetBarCode.xaml | 62 +++++++++---------- BBWY.Client/Views/PackTask/SetBarCode.xaml.cs | 3 +- .../BatchPurchase/BatchPurchaseBusiness.cs | 1 - 9 files changed, 63 insertions(+), 78 deletions(-) diff --git a/BBWY.Client/Models/APIModel/Request/BarCodeRequest.cs b/BBWY.Client/Models/APIModel/Request/BarCodeRequest.cs index 42e69d2d..5ff03e71 100644 --- a/BBWY.Client/Models/APIModel/Request/BarCodeRequest.cs +++ b/BBWY.Client/Models/APIModel/Request/BarCodeRequest.cs @@ -43,9 +43,9 @@ namespace BBWY.Client.Models.APIModel.Request /// public BarcodeLabelModel LabelModel { get; set; } - ///// - ///// 型号 - ///// - //public string ModelNo { get; set; } + /// + /// 店铺名 + /// + public string ShopName { get; set; } } } diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs index 24d5acd5..b9e1fd54 100644 --- a/BBWY.Client/Models/Enums.cs +++ b/BBWY.Client/Models/Enums.cs @@ -310,10 +310,10 @@ /// 精简模板 /// 精简模板 = 1, - /// - /// 无型号模板 - /// - 无型号模板 = 2 + ///// + ///// 无型号模板 + ///// + //无型号模板 = 2 } diff --git a/BBWY.Client/Models/PackTask/BarCodeModel.cs b/BBWY.Client/Models/PackTask/BarCodeModel.cs index d6c4e695..b3f46ea4 100644 --- a/BBWY.Client/Models/PackTask/BarCodeModel.cs +++ b/BBWY.Client/Models/PackTask/BarCodeModel.cs @@ -49,15 +49,6 @@ namespace BBWY.Client.Models public string SkuId { get => skuId; set { Set(ref skuId, value); } } - private string modelNo; - /// - /// 型号 - /// - public string ModelNo { get => modelNo; set { Set(ref modelNo, value); } } - - - - private BarcodeLabelModel labelModel= BarcodeLabelModel.精简模板; /// /// 模板标签 diff --git a/BBWY.Client/Models/PackTask/PackTaskModel.cs b/BBWY.Client/Models/PackTask/PackTaskModel.cs index e3817e6f..e7899405 100644 --- a/BBWY.Client/Models/PackTask/PackTaskModel.cs +++ b/BBWY.Client/Models/PackTask/PackTaskModel.cs @@ -6,6 +6,7 @@ using BBWY.Client.ViewModels.PackTask; using BBWY.Client.Views.PackTask; using BBWY.Client.Views.QualityTask; using GalaSoft.MvvmLight.Command; +using NPOI.Util; using System; using System.Collections.Generic; @@ -110,15 +111,7 @@ namespace BBWY.Client.Models return; } LookBarCodeWindow look = new LookBarCodeWindow(); - look.SetData(new BarCodeModel - { - Brand = BarCodeModel.Brand, - BrandName = BarCodeModel.BrandName, - LabelModel = BarCodeModel.LabelModel, - ProductNo = BarCodeModel.ProductNo, - SkuId = BarCodeModel.SkuId, - SkuName = BarCodeModel.SkuName - }); + look.SetData(BarCodeModel.Copy()); look.Show(); } diff --git a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs index ae3f115b..30ff4435 100644 --- a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs @@ -338,6 +338,7 @@ namespace BBWY.Client.ViewModels.PackTask BarCodeModel.Brand = Brand; BarCodeModel.SkuId = SkuId; BarCodeModel.SkuName = SkuName; + BarCodeModel.ShopName = globalContext.User.Shop.ShopName; } if (!string.IsNullOrEmpty(BrandName)) BarCodeModel.BrandName = BrandName; @@ -568,7 +569,7 @@ namespace BBWY.Client.ViewModels.PackTask } - + public Action ReflashWindow { get; set; } public void InitData(PackTaskModel model = null) { diff --git a/BBWY.Client/Views/PackTask/BarcodeControl.xaml b/BBWY.Client/Views/PackTask/BarcodeControl.xaml index eaf5ef5f..a34df80e 100644 --- a/BBWY.Client/Views/PackTask/BarcodeControl.xaml +++ b/BBWY.Client/Views/PackTask/BarcodeControl.xaml @@ -9,28 +9,27 @@ - - + + - + - + - + - + + + + + - + - - - - - @@ -43,6 +42,10 @@ + + + + @@ -51,10 +54,7 @@ - - - - + @@ -63,6 +63,10 @@ + + + + diff --git a/BBWY.Client/Views/PackTask/SetBarCode.xaml b/BBWY.Client/Views/PackTask/SetBarCode.xaml index 8dc050ee..48cc8274 100644 --- a/BBWY.Client/Views/PackTask/SetBarCode.xaml +++ b/BBWY.Client/Views/PackTask/SetBarCode.xaml @@ -8,7 +8,7 @@ mc:Ignorable="d" Style="{StaticResource bwstyle}" xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls" - Height="651" Width="577" + Height="380" Width="577" xmlns:b="http://schemas.microsoft.com/xaml/behaviors" xmlns:ctr="clr-namespace:BBWY.Client.Converters" xmlns:cmodel="clr-namespace:BBWY.Client.Models" @@ -31,49 +31,44 @@ - - - - + - - + + - + + + - + - + - + - + + + + + - + - - - - - - - - - + @@ -86,6 +81,10 @@ + + + + @@ -99,15 +98,12 @@ - - + diff --git a/BBWY.Client/Views/PackTask/SetBarCode.xaml.cs b/BBWY.Client/Views/PackTask/SetBarCode.xaml.cs index cea59e15..323d1b2d 100644 --- a/BBWY.Client/Views/PackTask/SetBarCode.xaml.cs +++ b/BBWY.Client/Views/PackTask/SetBarCode.xaml.cs @@ -60,7 +60,8 @@ namespace BBWY.Client.Views.PackTask ProductNo = BarCodeModel.ProductNo, SkuId = BarCodeModel.SkuId, SkuName = BarCodeModel.SkuName, - LabelModel = BarCodeModel.LabelModel + LabelModel = BarCodeModel.LabelModel, + ShopName = BarCodeModel.ShopName, }); if (resData == null) diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs index 867e9144..b058e95d 100644 --- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs +++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs @@ -973,7 +973,6 @@ namespace BBWY.Server.Business if (payOrderResponse.Success) { var order = fsql.Select().Where(p => p.Id == request.OrderId).ToOne(); - fsql.Update(order) .Set(a => a.OrderState, payOrderResponse.PurchaseOrderState) .ExecuteAffrows(); From 7a992d30ea9f7529cfd5d63220ba10cb861bba1d Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Sun, 9 Jul 2023 14:13:40 +0800 Subject: [PATCH 4/6] 1 --- BBWY.Client/Models/Enums.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs index b9e1fd54..24d5acd5 100644 --- a/BBWY.Client/Models/Enums.cs +++ b/BBWY.Client/Models/Enums.cs @@ -310,10 +310,10 @@ /// 精简模板 /// 精简模板 = 1, - ///// - ///// 无型号模板 - ///// - //无型号模板 = 2 + /// + /// 无型号模板 + /// + 无型号模板 = 2 } From 5bf16f602bd575c149cf6d01a9258300a3869a6e Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Sun, 9 Jul 2023 15:51:23 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=9D=A1=E5=BD=A2=E7=A0=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=BA=97=E9=93=BA=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/Models/PackTask/PackTaskModel.cs | 2 +- BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BBWY.Client/Models/PackTask/PackTaskModel.cs b/BBWY.Client/Models/PackTask/PackTaskModel.cs index e7899405..ee33a18c 100644 --- a/BBWY.Client/Models/PackTask/PackTaskModel.cs +++ b/BBWY.Client/Models/PackTask/PackTaskModel.cs @@ -150,7 +150,7 @@ namespace BBWY.Client.Models ProductNo = BarCodeModel.ProductNo, SkuId = BarCodeModel.SkuId, SkuName = BarCodeModel.SkuName, - ShopName= ShopName + ShopName = BarCodeModel.ShopName }; printWindow.LoadData(); //printWindow.Datas = LoadBarLabelModels(); diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs index 343430d9..94050546 100644 --- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs +++ b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs @@ -588,10 +588,10 @@ namespace BBWY.Client.ViewModels BatchPrintWindow batchPrint = new BatchPrintWindow(); - if (BarCodeModel!=null) - { - BarCodeModel.ShopName = OriginShopName; - } + //if (BarCodeModel!=null) + //{ + // BarCodeModel.ShopName = OriginShopName; + //} batchPrint.SetData(GoodProductQuantity, PurchaseSkuList.Where(p => p.IsNeedCer && p.CerDTO.Id > 0).Select(p => p.CerDTO).ToArray() , BarCodeModel); From 4b142236e2697168c610d62167eb3640607af43f Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Mon, 10 Jul 2023 15:15:07 +0800 Subject: [PATCH 6/6] 1 --- .../APIServices/QiKu/PackTaskService.cs | 22 +++---------------- .../Models/BatchPurchase/BatchPublishTask.cs | 6 ++++- .../PackTask/CreatePackTaskViewModel.cs | 6 ++++- .../PackTask/PublishTaskViewModel.cs | 22 +++++++++++-------- .../ViewModels/PackTask/TaskListViewModel.cs | 4 +++- .../PackTask/WareHouseListViewModel.cs | 6 +++-- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/BBWY.Client/APIServices/QiKu/PackTaskService.cs b/BBWY.Client/APIServices/QiKu/PackTaskService.cs index ab5511d9..3206967a 100644 --- a/BBWY.Client/APIServices/QiKu/PackTaskService.cs +++ b/BBWY.Client/APIServices/QiKu/PackTaskService.cs @@ -27,7 +27,7 @@ namespace BBWY.Client.APIServices - public ApiResponse GetTaskList(string skuId = null, string taskId = null, + public ApiResponse SearchTaskList(string skuId = null, string taskId = null, TaskState? TaskState = null, int pageIndex = 1, @@ -36,15 +36,6 @@ namespace BBWY.Client.APIServices ) { - if (taskId != null && !string.IsNullOrEmpty(taskId.Trim())) - { - return SendRequest(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new - { - TaskId = taskId, - ShopId = globalContext.User.Shop.ShopId.ToString() - - }, null, HttpMethod.Post); - } return SendRequest(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new { @@ -56,7 +47,7 @@ namespace BBWY.Client.APIServices ShopId = globalContext.User.Shop.ShopId.ToString() }, null, HttpMethod.Post); } - public ApiResponse GetWareHouseList(string WayBillNo = null, string SourceExpressName = null, string departmentName = null, string skuId = null, string taskId = null, + public ApiResponse SearchTaskList(string WayBillNo = null, string SourceExpressName = null, string departmentName = null, string skuId = null, string taskId = null, TaskState? TaskState = null, string ShopName = null, @@ -64,14 +55,7 @@ namespace BBWY.Client.APIServices int pageSize = 10 ) { - if (taskId != null && !string.IsNullOrEmpty(taskId.Trim())) - { - return SendRequest(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new - { - TaskId = taskId - }, null, HttpMethod.Post); - } return SendRequest(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new { DepartmentName = departmentName, @@ -96,7 +80,7 @@ namespace BBWY.Client.APIServices } - public ApiResponse GetProductSku(string skuId) + public ApiResponse SearchProduct(string skuId) { HttpClientHelper helper = new HttpClientHelper(globalContext.QKApiHost); diff --git a/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs b/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs index e2070218..f36fa522 100644 --- a/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs +++ b/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs @@ -419,7 +419,7 @@ namespace BBWY.Client.Models Brand = productApiResponse.Data.Items[0].BrandName; } - var productSku = packTaskService.GetProductSku(skuid); + var productSku = packTaskService.SearchProduct(skuid); if (productSku == null || !productSku.Success) { @@ -452,6 +452,10 @@ namespace BBWY.Client.Models BarCodeModel = new BarCodeModel(); IsSetBarCode = true; } + if (BarCodeModel.LabelModel== BarcodeLabelModel.无型号模板) + { + BarCodeModel.LabelModel = BarcodeLabelModel.精简模板; + } BarCodeModel.Brand = Brand; if (!string.IsNullOrEmpty(BrandName)) BarCodeModel.BrandName = BrandName; diff --git a/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs index ca445be9..b49ef77b 100644 --- a/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs @@ -872,7 +872,7 @@ namespace BBWY.Client.ViewModels.PackTask Brand = productApiResponse.Data.Items[0].BrandName; } - var productSku = packTaskService.GetProductSku(searchSkuId); + var productSku = packTaskService.SearchProduct(searchSkuId); if (productSku == null || !productSku.Success) { IsLoading = false; @@ -943,6 +943,10 @@ namespace BBWY.Client.ViewModels.PackTask BarCodeModel = new BarCodeModel(); IsSetBarCode = true; } + if (BarCodeModel.LabelModel == BarcodeLabelModel.无型号模板) + { + BarCodeModel.LabelModel = BarcodeLabelModel.精简模板; + } BarCodeModel.Brand = Brand; if (!string.IsNullOrEmpty(BrandName)) BarCodeModel.BrandName = BrandName; diff --git a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs index 30ff4435..9b83b04a 100644 --- a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs @@ -446,7 +446,7 @@ namespace BBWY.Client.ViewModels.PackTask Brand = productApiResponse.Data.Items[0].BrandName; } - var productSku = packTaskService.GetProductSku(skuid); + var productSku = packTaskService.SearchProduct(skuid); if (productSku == null || !productSku.Success || productSku.Data == null) return; if (TaskId <= 0) @@ -476,6 +476,9 @@ namespace BBWY.Client.ViewModels.PackTask { BarCodeModel = new BarCodeModel(); } + if (BarCodeModel.LabelModel == BarcodeLabelModel.无型号模板) + BarCodeModel.LabelModel = BarcodeLabelModel.精简模板; + BarCodeModel.Brand = Brand; if (!string.IsNullOrEmpty(BrandName)) BarCodeModel.BrandName = BrandName; @@ -487,9 +490,9 @@ namespace BBWY.Client.ViewModels.PackTask { IsNeedBarCode = Need.需要; IsSetBarCode = true; - + } - if (productSku.Data.PackConfig != null&&TaskId<=0) + if (productSku.Data.PackConfig != null && TaskId <= 0) { var config = productSku.Data.PackConfig; SkuTitle = config.SkuGoodsTitle; @@ -569,7 +572,7 @@ namespace BBWY.Client.ViewModels.PackTask } - + public Action ReflashWindow { get; set; } public void InitData(PackTaskModel model = null) { @@ -611,7 +614,7 @@ namespace BBWY.Client.ViewModels.PackTask return; } SaveTask = "保存"; - Logo = model.ItemList[0].Logo.Replace("80x80","200x200"); + Logo = model.ItemList[0].Logo.Replace("80x80", "200x200"); SearchSkuId = model.SkuId; SkuId = model.SkuId; SkuCount = model.SkuCount; @@ -726,7 +729,7 @@ namespace BBWY.Client.ViewModels.PackTask ShopId = globalContext.User.Shop.ShopId.ToString(), NeedBar = IsNeedBarCode == Need.需要, NeedCer = IsNeedCertificateModel == Need.需要 - + }; if (IsNeedBarCode == Need.需要) { @@ -741,7 +744,7 @@ namespace BBWY.Client.ViewModels.PackTask { if (CertificateModel == null || IsSetCertificate || CertificateModel.Count() <= 0) { - MessageBox.Show ("请设置合格证模板","提示"); + MessageBox.Show("请设置合格证模板", "提示"); return; } createTaskModel.CerId = string.Join(",", CertificateModel.Where(c => c.Id > 0).Select(c => c.Id));// @@ -757,11 +760,12 @@ namespace BBWY.Client.ViewModels.PackTask res = packTaskService.CreateTask(createTaskModel); } - if(res == null) { + if (res == null) + { MessageBox.Show("未知错误"); return; } - if (!res .Success) + if (!res.Success) { MessageBox.Show(res.Msg); return; diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs index f17c215c..7e14ae69 100644 --- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs @@ -522,7 +522,7 @@ namespace BBWY.Client.ViewModels.PackTask try { PackTaskList = new ObservableCollection();//初始化数据 - var datas = packTaskService.GetTaskList(SearchSkuId, SearchTaskId, this.TaskState, + var datas = packTaskService.SearchTaskList(SearchSkuId, SearchTaskId, this.TaskState, PageIndex, PageSize); if (datas != null && datas.Data != null && datas.Success) { @@ -581,6 +581,8 @@ namespace BBWY.Client.ViewModels.PackTask if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0) { data.BarCodeModel = item.BarCodeDTO; + if (data.BarCodeModel.LabelModel == BarcodeLabelModel.无型号模板) + data.BarCodeModel.LabelModel = BarcodeLabelModel.精简模板; } if (item.Cers != null) { diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs index fc6eafed..c2b2b747 100644 --- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs @@ -1343,7 +1343,7 @@ namespace BBWY.Client.ViewModels.PackTask PackTaskList = new ObservableCollection();//初始化数据 - var datas = packTaskService.GetWareHouseList(SearchWayBillNo, SearchExpressName, SearchDepartment, SearchSkuId, SearchTaskId, this.TaskState, SearchShopName, + var datas = packTaskService.SearchTaskList(SearchWayBillNo, SearchExpressName, SearchDepartment, SearchSkuId, SearchTaskId, this.TaskState, SearchShopName, PageIndex, PageSize); if (datas != null && datas.Data != null && datas.Success) { @@ -1408,8 +1408,10 @@ namespace BBWY.Client.ViewModels.PackTask if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0) { - + data.BarCodeModel = item.BarCodeDTO; + if (data.BarCodeModel.LabelModel == BarcodeLabelModel.无型号模板) + data.BarCodeModel.LabelModel = BarcodeLabelModel.精简模板; } if (item.Cers != null)