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] =?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; }