From 5ccc957c0e4768336e3272346942e1d5e2f14624 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期一, 23 六月 2025 17:31:02 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProtocolAnalysis.cs | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProtocolAnalysis.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProtocolAnalysis.cs
index e425a79..83c42dd 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProtocolAnalysis.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProtocolAnalysis.cs
@@ -121,6 +121,7 @@
}
}
}
+ mst = iCallTask.FindTask(action.CN_S_TASK_NO);
if (IsSendTask) ProcessHelper.SendTask(mst);
}
}
@@ -152,6 +153,10 @@
MongoDBSingleton.Instance.Remove<TimeCuoInfoCom>(Query.EQ("timeStamp", mst.CN_S_BATCH_NO), "TimeCuoInfoCom", RemoveFlags.None);
}
if (mst.CN_S_BUSS_TYPE == "3妤煎寘瑁呰ˉ绌�) PLCControl.PickUpBlankComplete(mst.CN_S_END_BIT);
+ if (mst.CN_S_BUSS_TYPE == "3妤肩紦瀛樻灦鍏ュ彔鎵�)
+ {
+ MongoDBSingleton.Instance.Remove<WMSInfo>(Query.EQ("trayCode", mst.CN_S_BUSS_TYPE),RemoveFlags.None);
+ }
}
}
@@ -222,7 +227,7 @@
{
// 鍥犺皟鐢ˋMSAPI鏃犳硶鍦ㄥ紑濮嬪彇璐ф椂鏇存柊杞﹀彿锛屽洜姝ゆ澶勭洿鎺ヨ繛鎺MS鏁版嵁搴撹繘琛屾洿鏂� MoboxHelper.UpdateEndBit(mst.CN_S_TASK_NO, action.CN_S_DEVICE_CODE);
- if (action.CN_N_ACTION_CODE != 1 && action.CN_N_ACTION_CODE != 2) MoboxHelper.UpdateTaskState(mst.CN_S_TASK_NO, action.CN_N_ACTION_CODE);
+ if (action.CN_N_ACTION_CODE != 1) MoboxHelper.UpdateTaskState(mst.CN_S_TASK_NO, action.CN_N_ACTION_CODE);
}
if (action.CN_N_ACTION_CODE == 1)
{
@@ -235,12 +240,23 @@
AMSHelper.SetStatus(action.CN_S_TASK_NO, 1, "4", action.CN_S_DEVICE_CODE, true);
if (mst.CN_S_BUSS_TYPE == "3妤煎寘瑁呰ˉ绌�) PLCControl.PickUpBlankComplete(mst.CN_S_END_BIT);
if (mst.CN_S_BUSS_TYPE.Contains("3妤煎寘瑁呭彇鏂�)) PLCControl.CheckUpReqUnload(mst.CN_S_END_BIT, mst.CN_S_TASK_NO);
- if (mst.CN_S_BUSS_TYPE == "3妤肩紦瀛樻灦鍏ュ彔鎵�) WMSHelper.ExecuteState(mst.CN_S_SOURCE_NO, action.CN_N_ACTION_CODE);
- if (mst.CN_S_BUSS_TYPE == "3妤肩紦瀛樻灦鍏ュ彔鎵�) PLCControl.writeStackingMouth6(mst.CN_S_END_BIT, mst.CN_S_TASK_NO);
+ if (mst.CN_S_BUSS_TYPE == "3妤肩紦瀛樻灦鍏ュ彔鎵�)
+ {
+ WMSHelper.ExecuteState(mst.CN_S_SOURCE_NO, action.CN_N_ACTION_CODE);
+ PLCControl.writeStackingMouth6(mst.CN_S_END_BIT, mst.CN_S_TASK_NO);
+ }
if (mst.CN_S_BUSS_TYPE == "鍖呰绾胯ˉ绌�) PLCControl.PickUpBlankCompleteTetracobalt(mst.CN_S_END_BIT, mst.CN_S_START_BIT);
+
+ //鍥涢挻杞﹂棿鏍规嵁璧风偣鏀瑰彉璐т綅鎵樼洏绫诲瀷缁戝畾鍏崇郴
+ var trayInfo = MongoDBSingleton.Instance.FindOne<trayTypeTable>(Query.EQ("locCode", mst.CN_S_START_BIT), "trayTypeTable");
+ if(trayInfo != null)
+ {
+ MongoDBSingleton.Instance.Update<trayTypeTable>(Query.EQ("locCode", mst.CN_S_START_BIT), Update.Set("locCode", mst.CN_S_END_BIT), UpdateFlags.None);
+ }
}
if (action.CN_N_ACTION_CODE == 6)
{
+ AMSHelper.SetStatus(action.CN_S_TASK_NO, 1, "6", action.CN_S_DEVICE_CODE, true);
if (mst.CN_S_BUSS_TYPE == "3妤煎寘瑁呰ˉ绌�)
{
//灏嗘暟鎹褰曞埌涓棿琛�@@ -268,6 +284,9 @@
{
MongoDBSingleton.Instance.Update<SLPTLoc>(Query.EQ("locCode", mst.CN_S_END_BIT), Update.Set("taskNum", slptInfo.taskNum - 1).Set("count", slptInfo.count + 1), UpdateFlags.None);
}
+
+ //鍥涢挻鎴愬搧鍑哄簱鍗歌揣瀹屾垚锛屽垹闄よ揣浣嶆墭鐩樼被鍨嬬粦瀹氳〃鏁版嵁
+ MongoDBSingleton.Instance.Remove<trayTypeTable>(Query.EQ("locCode", mst.CN_S_END_BIT), "trayTypeTable", RemoveFlags.None);
}
}
if (action.CN_N_ACTION_CODE == 2) {
@@ -300,10 +319,6 @@
iCallTask.DeleteTask(mst.CN_S_TASK_NO);
}
- //if (action.CN_N_ACTION_CODE == 5)
- //{
- // CMMLog.Info($"3妤肩紦瀛樻灦鍏ュ彔鎵�鏀跺埌淇″彿5锛屽紑濮嬪噯澶囧啓鍏ュ彔鐩樻満鏁版嵁銆�);
- //}
}
}
#endregion
--
Gitblit v1.9.1