From bfdb25c51958e6458fdbe5b3b2c0040a803ce4ef Mon Sep 17 00:00:00 2001
From: quanzhou <quan.zhou@broconcentric.com>
Date: 星期五, 09 一月 2026 17:17:43 +0800
Subject: [PATCH] 修改mes篮具扫码确认收到单号才修改产品单号，以及S9打印条码与plc的交互完成信号
---
src/Bro.M141.Process/UI/DataPrinter.cs | 2 +-
src/Bro.M141_AOI1.Process/AOI1Process.cs | 42 +++++++++++++++++++++---------------------
src/Bro.M141.Process/M141Process.cs | 6 +++---
src/Bro.M141.Process/M141Process_ImageCheck.cs | 3 ++-
4 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/src/Bro.M141.Process/M141Process.cs b/src/Bro.M141.Process/M141Process.cs
index 8e5de8c..f5dc4c0 100644
--- a/src/Bro.M141.Process/M141Process.cs
+++ b/src/Bro.M141.Process/M141Process.cs
@@ -1896,16 +1896,16 @@
int ttheigh = 80;
Printmessage = str;
- this.printDocument1.DefaultPageSettings.PrinterSettings.PrinterName = "Honeywell PX240S (300 dpi)";
+ this.printDocument1.DefaultPageSettings.PrinterSettings.PrinterName = PrinterName;
this.printDocument1.DefaultPageSettings.PaperSize = new PaperSize("Custum", ttwith, ttheigh);
this.printDocument1.PrintController = new System.Drawing.Printing.StandardPrintController();
this.printDocument1.Print();
}
- catch
+ catch(Exception ex)
{
-
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"鎵撳嵃鏈烘墦鍗板嚭閿�:{ex.ToString()}");
}
}
diff --git a/src/Bro.M141.Process/M141Process_ImageCheck.cs b/src/Bro.M141.Process/M141Process_ImageCheck.cs
index 4d1f940..42082c3 100644
--- a/src/Bro.M141.Process/M141Process_ImageCheck.cs
+++ b/src/Bro.M141.Process/M141Process_ImageCheck.cs
@@ -1063,8 +1063,9 @@
if (M141Config.MES_codes.Count >= 1)
{
string message = M141Config.MES_codes[0].Printers_code;
- StartPrint(message, "Honeywell PX240S(300 dpi)1");
+ StartPrint(message, "Honeywell PX240S (300 dpi)1");
M141Config.MES_codes.RemoveAt(0);
+ PlcwritePrinter(1510,1);
}
return msg;
}
diff --git a/src/Bro.M141.Process/UI/DataPrinter.cs b/src/Bro.M141.Process/UI/DataPrinter.cs
index 31ab720..915180d 100644
--- a/src/Bro.M141.Process/UI/DataPrinter.cs
+++ b/src/Bro.M141.Process/UI/DataPrinter.cs
@@ -151,7 +151,7 @@
if (Config141.Isprint && !string.IsNullOrEmpty(obj.tary_label))
{
- Process141.StartPrint(obj.tary_label, "Honeywell PX240S(300 dpi)");
+ Process141.StartPrint(obj.tary_label, "Honeywell PX240S (300 dpi)");
}
}
else
diff --git a/src/Bro.M141_AOI1.Process/AOI1Process.cs b/src/Bro.M141_AOI1.Process/AOI1Process.cs
index 1a4afef..ddd2e49 100644
--- a/src/Bro.M141_AOI1.Process/AOI1Process.cs
+++ b/src/Bro.M141_AOI1.Process/AOI1Process.cs
@@ -329,10 +329,10 @@
{
try
{
- var obj = JsonConvert.DeserializeObject<AutoLineMacQueueBak>(zwordstr);
- ConfigAOI1.zwoid = obj.zwoid;
+ var obj = JsonConvert.DeserializeObject<AutoLineMacQueueBak>(zwordstr);
if (!string.IsNullOrEmpty(obj.zwoid) && obj.zstatus == "200")
{
+ ConfigAOI1.zwoid = obj.zwoid;
Plc1.WriteSingleAddress(1524, 1, out _);
Plc1.WriteSingleAddress(1514, 1, out _);
LogAsync(DateTime.Now, EnumHelper.LogLevel.Information, $"RabbitMQ zwoid鑾峰彇鎴愬姛 {obj.zstatus} {obj.zwoid} ");
@@ -896,11 +896,11 @@
string saveTary_ID=string.Empty;
- if (!Issuccess && !Issuccess1)
- {
- Plc3.WriteSingleAddress(2120, 2, out _);
- return msg;
- }
+ //if (!Issuccess && !Issuccess1)
+ //{
+ // Plc3.WriteSingleAddress(2120, 2, out _);
+ // return msg;
+ //}
LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"浜у搧淇℃伅涓婁紶MES瑙﹀彂锛屼骇鍝佷俊鎭暟閲忎负锛歿M141Config.Productioncode.Count}");
@@ -926,7 +926,7 @@
if (M141Config.Isprint && !string.IsNullOrEmpty(tary_ID))
{
saveTary_ID = tary_ID;
- StartPrint(tary_ID, "Honeywell PX240S(300 dpi)");
+ StartPrint(tary_ID, "Honeywell PX240S (300 dpi)");
M141Config.MES_codes.Add(new MES_code
{
Printers_code = tary_ID
@@ -961,7 +961,7 @@
if (M141Config.Isprint && !string.IsNullOrEmpty(tary_ID))
{
saveTary_ID = tary_ID;
- StartPrint(tary_ID, "Honeywell PX240S(300 dpi)");
+ StartPrint(tary_ID, "Honeywell PX240S (300 dpi)");
M141Config.MES_codes.Add(new MES_code
{
Printers_code = tary_ID
@@ -1004,7 +1004,7 @@
if (M141Config.Isprint && !string.IsNullOrEmpty(tary_ID))
{
saveTary_ID = tary_ID;
- StartPrint(tary_ID, "Honeywell PX240S(300 dpi)");
+ StartPrint(tary_ID, "Honeywell PX240S (300 dpi)");
M141Config.MES_codes.Add(new MES_code
{
Printers_code = tary_ID
@@ -1019,19 +1019,19 @@
{
if (M141Config.Isprint && !string.IsNullOrEmpty(saveTary_ID))
{
- StartPrint(saveTary_ID, "Honeywell PX240S(300 dpi)");
+ StartPrint(saveTary_ID, "Honeywell PX240S (300 dpi)");
}
}
- if (Issuccess && Issuccess1)
- {
- Plc3.WriteSingleAddress(2120, 1, out _);
- return msg;
- }
- else
- {
- Plc3.WriteSingleAddress(2120, 2, out _);
- return msg;
- }
+ //if (Issuccess && Issuccess1)
+ //{
+ Plc3.WriteSingleAddress(2120, 1, out _);
+ return msg;
+ //}
+ //else
+ //{
+ // Plc3.WriteSingleAddress(2120, 2, out _);
+ // return msg;
+ //}
}
--
Gitblit v1.8.0