From bdbc8b1459c415f24c3a5da0d27a05e034f7ba08 Mon Sep 17 00:00:00 2001
From: kingno <30263@KINGNO>
Date: 星期六, 19 七月 2025 17:02:46 +0800
Subject: [PATCH] mes优化
---
src/Bro.M141.Process/M141Process.cs | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 152 insertions(+), 14 deletions(-)
diff --git a/src/Bro.M141.Process/M141Process.cs b/src/Bro.M141.Process/M141Process.cs
index 21f4dc8..8a3bd16 100644
--- a/src/Bro.M141.Process/M141Process.cs
+++ b/src/Bro.M141.Process/M141Process.cs
@@ -98,9 +98,6 @@
-
-
-
public override void Open()
{
base.Open();
@@ -1064,10 +1061,12 @@
if (M141Config.Isreadbasketcode)
{
p.BasketCode = M141Config.basketcode;
+ p.Zword = M141Config.zwoid;
}
else
{
- p.BasketCode = mysqlhelper.Getbasketcode(p.SEQUENCE, out string sntem);
+ p.BasketCode = mysqlhelper.Getbasketcode(p.SEQUENCE, out string sntem, out string zword);
+ p.Zword = zword;
p.SN = sntem;
p.PID = $"{sntem}_{i}";
if ("NoRead".Equals(p.BasketCode))
@@ -1231,17 +1230,7 @@
}
}
});
- //ReplyPlcData(positionSet, plcresult);
- if (positionSet.IsLastPosition)
- {
- if (_ct != null)
- {
- UpdateCT(null, (float)((DateTime.Now - _ct.Value).TotalSeconds));
- }
- _ct = DateTime.Now;
- }
- //ReplyPlcData(positionName, config.TriggerValue);
cameraIds.ForEach(c =>
{
@@ -1252,6 +1241,154 @@
LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"鐩告満{camera.Name}娓呯悊缂撳瓨");
}
});
+
+ //ReplyPlcData(positionSet, plcresult);
+ if (positionSet.IsLastPosition)
+ {
+ if (_ct != null)
+ {
+ UpdateCT(null, (float)((DateTime.Now - _ct.Value).TotalSeconds));
+ }
+ _ct = DateTime.Now;
+
+ if (M141Config.ISupMES && (M141Config.MESchannel == -1 || M141Config.MESchannel == 1))
+ {
+ if (M141Config.numpro >= 50)
+ {
+ M141Config.numpro = 0;
+ }
+
+ if (pList[0].Result == "OK")
+ {
+ M141Config.numpro++;
+ }
+
+ //mqtt.demes(productList[0], M141Config.zwoid);
+ string Msgreceice = Task.Run(() => mqtt.MESForProduceAsync(pList[0], M141Config.numpro)).Result;
+ if (Msgreceice == null)
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"浜у搧{pList[0].PID}鏁版嵁涓婁紶MES寮傚父 杩斿洖鏁版嵁涓簄ull");
+ }
+ else
+ {
+ try
+ {
+ var obj = JsonConvert.DeserializeObject<AutoLineMacBarcodeQueueBak>(Msgreceice);
+
+ if (obj.zstatus == "200")
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"浜у搧{pList[0].PID}鏁版嵁涓婁紶MES鎴愬姛 {Msgreceice}");
+ }
+ else
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"浜у搧{pList[0].PID}鏁版嵁涓婁紶MES澶辫触 {Msgreceice}");
+ }
+ }
+ catch
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"浜у搧{pList[0].PID}鏁版嵁涓婁紶MES寮傚父 {Msgreceice}");
+ }
+ }
+
+
+
+ int numplca = Convert.ToInt32(pList[0].SEQUENCE.Split('_')[0]);
+
+
+ lock (plcnumlock)
+ {
+ if (PlcNumForAll == -1)
+ {
+ PlcNumForAll = numplca;
+ }
+ int differ = numplca - PlcNumForAll;
+ if (differ > 1)
+ {
+ for (int i = PlcNumForAll + 1; i < numplca; i++)
+ {
+ try
+ {
+ var plist = mysqlhelper.GetProductList(i + "_1");
+ ProductModel newp = new ProductModel();
+ newp.SEQUENCE = plist[0].SEQUENCE;
+ newp.PID = plist[0].PID;
+ newp.BasketCode = plist[0].BasketCode;
+ newp.Zword = plist[0].Zword;
+ newp.Result = "NG";
+ newp.SN = plist[0].SN;
+ var tems = Task.Run(() => mqtt.MESForProduceAsync(newp, M141Config.numpro)).Result;
+
+ }
+ catch
+ {
+
+ }
+ }
+ }
+ else if (differ == -29998 && differ == 1 && differ == 0)
+ {
+
+
+ }
+ else
+ {
+ for (int i = PlcNumForAll + 1; i <= 29999; i++)
+ {
+ try
+ {
+ var plist = mysqlhelper.GetProductList(i + "_1");
+ ProductModel newp = new ProductModel();
+ newp.SEQUENCE = plist[0].SEQUENCE;
+ newp.PID = plist[0].PID;
+ newp.Zword = plist[0].Zword;
+ newp.BasketCode = plist[0].BasketCode;
+ newp.Result = "NG";
+ newp.SN = plist[0].SN;
+ var tems = Task.Run(() => mqtt.MESForProduceAsync(newp, M141Config.numpro)).Result;
+
+ }
+ catch
+ {
+
+ }
+ }
+
+
+
+ for (int i = 1; i < numplca; i++)
+ {
+ try
+ {
+ var plist = mysqlhelper.GetProductList(i + "_1");
+ ProductModel newp = new ProductModel();
+ newp.SEQUENCE = plist[0].SEQUENCE;
+ newp.PID = plist[0].PID;
+ newp.BasketCode = plist[0].BasketCode;
+ newp.Zword = plist[0].Zword;
+ newp.Result = "NG";
+ newp.SN = plist[0].SN;
+ var tems = Task.Run(() => mqtt.MESForProduceAsync(newp, M141Config.numpro)).Result;
+
+ }
+ catch
+ {
+
+ }
+ }
+ }
+
+
+
+ PlcNumForAll = numplca;
+ }
+
+ }
+
+ }
+
+ //ReplyPlcData(positionName, config.TriggerValue);
+
+
return pList;
@@ -1287,6 +1424,7 @@
newp.SEQUENCE = p.SEQUENCE;
newp.PID = p.PID;
newp.BasketCode = p.BasketCode;
+ newp.Zword = p.Zword;
newp.Result = p.Result;
newp.SN = p.SN;
--
Gitblit v1.8.0