From 501d80ec4901e415674f722baed89e3bd45364bc Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Tue, 4 Jul 2023 22:20:51 +0800
Subject: [PATCH] 1
---
BBWY.Client/Helpers/MyPrintHelper.cs | 2 +-
.../Views/FallWare/SetCloudWareBoxWindow.xaml | 113 +++++++++---------
.../FallWare/SetCloudWareBoxWindow.xaml.cs | 5 -
.../Views/FallWare/SetJDWareBoxWindow.xaml | 6 +-
.../Views/FallWare/SetJDWareBoxWindow.xaml.cs | 2 +-
5 files changed, 62 insertions(+), 66 deletions(-)
diff --git a/BBWY.Client/Helpers/MyPrintHelper.cs b/BBWY.Client/Helpers/MyPrintHelper.cs
index bac14d65..59a6e039 100644
--- a/BBWY.Client/Helpers/MyPrintHelper.cs
+++ b/BBWY.Client/Helpers/MyPrintHelper.cs
@@ -61,7 +61,7 @@ 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(barCode.BrandName, font);
+ SizeF size = args.Graphics.MeasureString("品牌", font);
var sizeHeight = size.Height;//字体高度
topHeigth += 10;
diff --git a/BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml b/BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml
index f695c01b..7e472bd0 100644
--- a/BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml
+++ b/BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml
@@ -45,62 +45,63 @@
Background="{StaticResource Border.Background}">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml.cs b/BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml.cs
index a7488555..4db8ee84 100644
--- a/BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml.cs
+++ b/BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml.cs
@@ -76,12 +76,7 @@ namespace BBWY.Client.Views.FallWare
this.Width = pageWidth;
this.FontSize = 30;
this.jd_box.Arrange(new Rect(new Point(0, 0), new Size(pageWidth, pageHeight)));
- //794 429 Width="478" Height="440"
- //this.jd_box.Arrange(new Rect(new Point((pageWidth - jd_box.DesiredSize.Width) / 2, (pageHeight - jd_box.DesiredSize.Height) / 2), new Size(jd_box.DesiredSize.Width, jd_box.DesiredSize.Height)));
-
printDialog.PrintVisual(this.jd_box, "打印任务");
-
-
}
var applicationPath = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
string printNames = System.IO.Path.Combine(applicationPath, "printName.init");
diff --git a/BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml b/BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml
index acfb7497..c7edce85 100644
--- a/BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml
+++ b/BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml
@@ -38,15 +38,15 @@
-
+
-
-
+
+
diff --git a/BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml.cs b/BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml.cs
index 000f38a1..24e1c2b7 100644
--- a/BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml.cs
+++ b/BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml.cs
@@ -90,7 +90,7 @@ namespace BBWY.Client.Views.FallWare
this.Height = pageHeight + 39;
this.Width = pageWidth;
this.FontSize = 30;
- this.jd_box.Arrange(new Rect(new Point(0, 0), new Size(pageWidth, pageHeight)));
+ this.jd_box.Arrange(new Rect(new Point(0, 0), new Size(pageWidth-100, pageHeight-200)));
//794 429 Width="478" Height="440"
//this.jd_box.Arrange(new Rect(new Point((pageWidth - jd_box.DesiredSize.Width) / 2, (pageHeight - jd_box.DesiredSize.Height) / 2), new Size(jd_box.DesiredSize.Width, jd_box.DesiredSize.Height)));