From 124c6bef95aa767f62ac245a883179ff5baca206 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期一, 28 七月 2025 17:45:03 +0800
Subject: [PATCH] 11
---
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs | 26 +++++++++++++++++++++-----
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs | 8 ++++----
2 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs
index e9f0197..d9b7a5e 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs
@@ -1440,13 +1440,24 @@
{
//鍙互鐢熸垚浠诲姟锛岃皟WMS鎺ュ彛鑾峰彇浠诲姟淇℃伅
bool req = WMSHelper.WMSOut(pmInfo.location, "", trayType);
- if (req) CMMLog.Debug($"璋冪敤WMS鑾峰彇纰熺洏鍑哄簱鐢熸垚浠诲姟鎴愬姛锛�);//鐜板湪浠诲姟鐢盬MS鑷繁涓嬪彂锛孉MS鍋氭嫤鎴鐞嗭紙鏌ヨext1閲岄潰瀵瑰簲鐨勪换鍔＄被鍨嬶紝骞舵洿鏀逛换鍔＄被鍨嬶級
- else CMMLog.Debug($"璋冪敤WMS鑾峰彇纰熺洏鍑哄簱鐢熸垚浠诲姟澶辫触锛�);
+ if (req)
+ {
+ CMMLog.Debug($"璋冪敤WMS鑾峰彇鍙犵洏鍑哄簱鐢熸垚浠诲姟鎴愬姛锛�);//鐜板湪浠诲姟鐢盬MS鑷繁涓嬪彂锛孉MS鍋氭嫤鎴鐞嗭紙鏌ヨext1閲岄潰瀵瑰簲鐨勪换鍔＄被鍨嬶紝骞舵洿鏀逛换鍔＄被鍨嬶級
+ ProcessHelper.deleteInfo(pmInfo.location + "-鍙犵洏涓婄嚎");
+ }
+ else CMMLog.Debug($"璋冪敤WMS鑾峰彇鍙犵洏鍑哄簱鐢熸垚浠诲姟澶辫触锛�);
}
- else CMMLog.Debug($"CacheStackingMouth: 鎵樼洏绫诲瀷涓嶆纭紝鎵樼洏绫诲瀷锛歿result.result[2]}");
-
+ else
+ {
+ CMMLog.Debug($"鍙犵洏鏈� 鎵樼洏绫诲瀷涓嶆纭紝鎵樼洏绫诲瀷锛歿result.result[2]}");
+ ProcessHelper.recordInfo(pmInfo.location + "-鍙犵洏涓婄嚎", $"鎵樼洏绫诲瀷涓嶆纭紝鎵樼洏绫诲瀷锛歿result.result[2]}");
+ }
}
- else CMMLog.Debug($"妫�煡褰撳墠鍙犳墭鐐规槸鍚︽湁浠诲姟鍗犵敤锛屾垨鑰匨ST涓昏〃涓湁缂撳瓨鏋跺叆鍙犵洏鏈虹殑浠诲姟锛�);
+ else
+ {
+ CMMLog.Debug($"妫�煡褰撳墠鍙犳墭鐐规槸鍚︽湁浠诲姟鍗犵敤锛屾垨鑰匨ST涓昏〃涓湁缂撳瓨鏋跺叆鍙犵洏鏈虹殑浠诲姟锛�);
+ ProcessHelper.recordInfo(pmInfo.location + "-鍙犵洏涓婄嚎", "鍙犵洏鏈哄綋鍓嶆湁浠诲姟");
+ }
}
}
else CMMLog.Debug($"缂撳瓨鍏ュ彔鐩樻満锛屽垱寤轰换鍔★紝result={result.errMsg}");
@@ -1649,8 +1660,13 @@
if (amsResult.success)
{
CMMLog.Info($"鍖呰绾胯ˉ绌轰换鍔＄敓鎴愭垚鍔�);
+ ProcessHelper.deleteInfo(pmInfo.location + "-鍖呰鏈虹┖鎵樹笂绾�);
break;
}
+ else
+ {
+ ProcessHelper.recordInfo(pmInfo.location + "-鍖呰鏈虹┖鎵樹笂绾�, $"{amsResult.errMsg}");
+ }
}
}
}
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
index 8f9ec54..55c5499 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
@@ -145,7 +145,7 @@
{
if(mst.CN_S_BUSS_TYPE == "杈呮潗鍑哄簱锛堜簩娈碉級")
{
- start.CN_N_AGV_LOCATION = Settings.GetConnectingbitsList().Where(a => a.locCode == mst.CN_S_START_BIT).First().agvSite[0];
+ start.CN_N_AGV_LOCATION = Settings.GetConnectingbitsList().Where(a => a.locCode == mst.CN_S_START_BIT).First().agvSite[2];
}
else
{
@@ -155,7 +155,7 @@
}
if (mst.CN_S_END_BIT == conn[0].locCode || mst.CN_S_END_BIT == conn[1].locCode)
{
- if(mst.CN_S_BUSS_TYPE == "杈呮潗鍑哄簱锛堜簩娈碉級")
+ if(mst.CN_S_BUSS_TYPE == "杈呮潗鍑哄簱")
{
end.CN_N_AGV_LOCATION = Settings.GetConnectingbitsList().Where(a => a.locCode == mst.CN_S_END_BIT).First().agvSite[1];
}
@@ -658,7 +658,7 @@
new SqlHelper<object>().ExecuteSql($"update dbo.tn_am_task_mst set CN_S_END_BIT='{a.locCode}',CN_S_END_AGVBIT = '{StockInstance.Instance.GetAGVCodeForBitCode(a.locCode)}' where CN_S_TASK_NO = '{mst.CN_S_TASK_NO}'");
- MongoDBSingleton.Instance.Update<ConnectingBits>(Query.EQ("Bit", a.locCode), Update.Set("trayCode", mst.CN_S_BATCH_NO).Set("END_LOC", a.locCode), UpdateFlags.None);
+ MongoDBSingleton.Instance.Update<ConnectingBits>(Query.EQ("Bit", a.locCode), Update.Set("trayCode", mst.CN_S_BATCH_NO).Set("END_LOC", mst.CN_S_END_BIT), UpdateFlags.None);
}
}
else
@@ -668,7 +668,7 @@
new SqlHelper<object>().ExecuteSql($"update dbo.tn_am_task_mst set CN_S_END_BIT='{a.locCode}',CN_S_END_AGVBIT = '{StockInstance.Instance.GetAGVCodeForBitCode(a.locCode)}' where CN_S_TASK_NO = '{mst.CN_S_TASK_NO}'");
- MongoDBSingleton.Instance.Insert<ConnectingBits>(new ConnectingBits { Bit = a.locCode, trayCode = mst.CN_S_BATCH_NO, state = "0", END_LOC = a.locCode });
+ MongoDBSingleton.Instance.Insert<ConnectingBits>(new ConnectingBits { Bit = a.locCode, trayCode = mst.CN_S_BATCH_NO, state = "0", END_LOC = mst.CN_S_END_BIT });
}
}
else CMMLog.Debug("鎺ラ┏浣嶇偣浣嶆湭閰嶇疆");
--
Gitblit v1.9.1