diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 930f2138..965a1260 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 = "10145"; + ClientVersion = "10147"; } private User user; diff --git a/BBWY.Client/Helpers/MyPrintHelper.cs b/BBWY.Client/Helpers/MyPrintHelper.cs index 06117333..57442300 100644 --- a/BBWY.Client/Helpers/MyPrintHelper.cs +++ b/BBWY.Client/Helpers/MyPrintHelper.cs @@ -40,11 +40,11 @@ namespace BBWY.Client.Helpers //SetBarStander(barCode, ref args, font); break; case BarcodeLabelModel.精简模板: - font = new Font("宋体", 10, System.Drawing.FontStyle.Regular); - //SetBar(barCode, ref args, font, 15); + //font = new Font("宋体", 10, System.Drawing.FontStyle.Regular); + ////SetBar(barCode, ref args, font, 15); - SetBarSimplify(barCode, ref args, font); - break; + //SetBarSimplify(barCode, ref args, font); + //break; case BarcodeLabelModel.无型号模板: font = new Font("宋体", 10, System.Drawing.FontStyle.Regular); SetBar(barCode, ref args, font, 7); @@ -61,26 +61,26 @@ namespace BBWY.Client.Helpers string barcodeSku = $"POP{barCode.SkuId}"; Barcode barcode = new Barcode(); System.Drawing.Image img = barcode.Encode(TYPE.CODE128, barcodeSku, 500, 40); - SizeF size = args.Graphics.MeasureString("品牌", font); + SizeF size = args.Graphics.MeasureString("品名", font); var sizeHeight = size.Height;//字体高度 topHeigth += 10; - switch (barCode.LabelModel) - { - case BarcodeLabelModel.无型号模板: - case BarcodeLabelModel.标准模板: - args.Graphics.DrawString($"品牌: {barCode.Brand}", font, System.Drawing.Brushes.Black, new PointF(10, topHeigth)); - topHeigth += (heightSpace + sizeHeight); - break; - case BarcodeLabelModel.精简模板: - break; - } + //switch (barCode.LabelModel) + //{ + // case BarcodeLabelModel.无型号模板: + // case BarcodeLabelModel.标准模板: + // args.Graphics.DrawString($"品牌: {barCode.Brand}", font, System.Drawing.Brushes.Black, new PointF(10, topHeigth)); + // topHeigth += (heightSpace + sizeHeight); + // break; + // case BarcodeLabelModel.精简模板: + // break; + //} - //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) diff --git a/BBWY.Client/Views/PackTask/MinBarcodeControl.xaml b/BBWY.Client/Views/PackTask/MinBarcodeControl.xaml index 222338cb..63180189 100644 --- a/BBWY.Client/Views/PackTask/MinBarcodeControl.xaml +++ b/BBWY.Client/Views/PackTask/MinBarcodeControl.xaml @@ -9,19 +9,23 @@ - - - + + + + + + + - + - + - + - + - + @@ -29,8 +33,8 @@ - - + + @@ -54,8 +58,8 @@ - - + +