From f9e7cfbc3d3323158139a8f0b89286f90fd6326b Mon Sep 17 00:00:00 2001
From: quanzhou <quan.zhou@broconcentric.com>
Date: 星期三, 27 八月 2025 16:46:15 +0800
Subject: [PATCH] 合并
---
/dev/null | 5 -----
src/Bro.M141.Process/UI/UIPrinter.cs | 27 +++++++++++++++++++++------
src/Bro.M141.Process/Bro.M141.Process.csproj | 8 ++++++++
3 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/global.json b/global.json
deleted file mode 100644
index 5280724..0000000
--- a/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "sdk": {
- "version": "6.0.136"
- }
-}
\ No newline at end of file
diff --git a/src/Bro.M141.Process/Bro.M141.Process.csproj b/src/Bro.M141.Process/Bro.M141.Process.csproj
index 376bc90..9ad78e6 100644
--- a/src/Bro.M141.Process/Bro.M141.Process.csproj
+++ b/src/Bro.M141.Process/Bro.M141.Process.csproj
@@ -15,6 +15,14 @@
<Exec Command="Copy $(SolutionDir)libs\PFW $(OutDir)
Copy $(SolutionDir)libs\SafetyDog $(OutDir)
Copy $(SolutionDir)libs\Nuget $(OutDir)
Copy $(SolutionDir)libs\halcon12 $(OutDir)
Copy $(SolutionDir)libs\HikCamera $(OutDir)
Copy $(SolutionDir)libs\IKAPCamera $(OutDir)
Copy $(SolutionDir)libs\InsCamera $(OutDir)
Copy $(SolutionDir)libs\WebServiceDll $(OutDir)" />
</Target>
+ <ItemGroup>
+ <Compile Remove="UI\鏂板缓鏂囦欢澶筡**" />
+ <EmbeddedResource Remove="UI\鏂板缓鏂囦欢澶筡**" />
+ <None Remove="UI\鏂板缓鏂囦欢澶筡**" />
+ </ItemGroup>
+
+
+
<!--<ItemGroup>
<Compile Include="UI\FrmContinuousNGAlarm.cs" />
<Compile Include="UI\FrmContinuousNGAlarm.Designer.cs" />
diff --git a/src/Bro.M141.Process/UI/UIPrinter.cs b/src/Bro.M141.Process/UI/UIPrinter.cs
index d44f6f1..1e933c1 100644
--- a/src/Bro.M141.Process/UI/UIPrinter.cs
+++ b/src/Bro.M141.Process/UI/UIPrinter.cs
@@ -1,5 +1,4 @@
-锘�
-using Bro.Common.Helper;
+锘縰sing Bro.Common.Helper;
using Bro.Common.Interface;
using Bro.M135.Common;
using Bro.UI.Model.Winform;
@@ -17,8 +16,12 @@
using System.Windows.Forms;
using ZXing;
using ZXing.Common;
-using ZXing.QrCode;
+using static Bro.M141.Process.BasketCodeUI;
+using ZXing.QrCode.Internal;
using static System.Windows.Forms.AxHost;
+using ZXing.QrCode;
+
+
//using System.Printing;
@@ -44,7 +47,7 @@
printDocument1.PrintPage += new PrintPageEventHandler(printDocument_Print);
Process141.StartPrinter += StartPrint;
- textBox1.Text = "Broconcentric";
+ textBox1.Text = "C229M2508250500002";
}
@@ -85,8 +88,10 @@
//Config141
Process141.PlcwritePrinter(1520, 0);
Process141.PlcwritePrinter(1510, 1);
-
}
+
+
+ //C229M2508250500002
private void printDocument_Print(object sender, PrintPageEventArgs e)
{
Font fntTxt = new Font("榛戜綋", 15, System.Drawing.FontStyle.Bold);//姝ｆ枃鏂囧瓧
@@ -125,7 +130,7 @@
writer.Options = options;
Bitmap map = writer.Write(numvalue);
- e.Graphics.DrawImage(map, new System.Drawing.Point(90, 10));
+ e.Graphics.DrawImage(map, new System.Drawing.Point(90,10));
// 鍦ㄤ簩缁寸爜涓嬫柟鐢诲唴瀹规枃瀛�
@@ -146,6 +151,16 @@
//g.DrawString("鍘傚晢", font, brush, (startX + 20) * Scale, (startY + 5) * Scale);//
//g.DrawString("鍢夊桨绉戞妧", font2, brush, (startX + 140) * Scale, (startY + 4) * Scale);
+ BarcodeWriter writer = new BarcodeWriter();
+ writer.Format = BarcodeFormat.QR_CODE;
+ QrCodeEncodingOptions options = new QrCodeEncodingOptions()
+ {
+ DisableECI = true,//璁剧疆鍐呭缂栫爜
+ CharacterSet = "UTF-8", //璁剧疆浜岀淮鐮佺殑瀹藉害鍜岄珮搴�
+ Width = 123,
+ Height = 123,
+ Margin = 1//璁剧疆浜岀淮鐮佺殑杈硅窛,鍗曚綅涓嶆槸鍥哄畾鍍忕礌
+ };
////绗簩琛屾暟鎹�
//g.DrawRectangle(p, startX * Scale, (startY + 20) * Scale, 70 * Scale, 20 * Scale);
--
Gitblit v1.8.0