From 0fc71730109bb5904ded8e1a14c945e45b289c50 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期四, 03 七月 2025 18:24:05 +0800
Subject: [PATCH] 111

---
 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs
index 55d7dca..de44725 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs
@@ -396,14 +396,15 @@
                         {
                             MongoDBSingleton.Instance.Update<ConnectingBits>(Query.EQ("Bit", mst.CN_S_START_BIT), Update.Set("trayCode", "").Set("state", "0"), UpdateFlags.None);
                         }
+                        if (mst.CN_S_BUSS_TYPE == "鐢甸挻缂撳瓨鏋跺叆绔嬪簱")
+                        {
+                            MongoDBSingleton.Instance.Update<DGConnectingBits>(Query.EQ("Bit", mst.CN_S_START_BIT), Update.Set("trayCode", "").Set("state", "0"), UpdateFlags.None);
+                            MongoDBSingleton.Instance.Remove<DGPackingLineFullModel>(Query.EQ("trayCode", mst.CN_S_BATCH_NO), RemoveFlags.None);
+                        }
                         //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妤兼墦鍖呬笅绾�)
                         {
                             //鎵撳寘涓嬬嚎鍙栬揣瀹屾垚锛屽皢鏁版嵁鍐欏叆涓棿琛�-                        }
-                        if (mst.CN_S_BUSS_TYPE == "鐢甸挻缂撳瓨鏋跺叆绔嬪簱")
-                        {
-                            MongoDBSingleton.Instance.Remove<DGPackingLineFullModel>(Query.EQ("trayCode", mst.CN_S_BATCH_NO),RemoveFlags.None);
                         }
                     }
                     if (action.CN_N_ACTION_CODE == 6)
@@ -447,6 +448,12 @@
                             MongoDBSingleton.Instance.Update<ConnectingBits>(Query.EQ("Bit", mst.CN_S_END_BIT), Update.Set("state", "1"), UpdateFlags.None);
 
                         }
+                        if (mst.CN_S_BUSS_TYPE == "鍖呰鏈烘弧鎵樹笅绾�)
+                        {
+                            MongoDBSingleton.Instance.Update<DGConnectingBits>(Query.EQ("Bit", mst.CN_S_END_BIT), Update.Set("state", "1"), UpdateFlags.None);
+
+                        }
+
                         if (mst.CN_S_BUSS_TYPE == "3妤兼垚鍝佸嚭搴�)
                         {
                             //3妤兼垚鍝佸嚭搴撴敹鍒�涔嬪悗锛岀粓鐐硅揣浣嶆暟閲忓噺1锛岋紙娉細6淇″彿浼氬彂澶氭锛�@@ -689,7 +696,7 @@
                     if (result != null && result.errCode == 0)
                     {
                         CMMLog.Info($"鐢靛姩闂ㄥ紑闂ㄦ祦绋嬶細璇诲彇鐢靛姩闂ㄩ�閬撳彿涓猴細{doorInfo.readAddr}閲岄潰鐨勫�涓簕result.result[0]},{doorInfo.readAddr + 1}閲岄潰鐨勫�涓簕result.result[1]},闂ㄥ彿锛歿action.Ext2}");
-                        if(action.Ext2 == "4")
+                        if(action.Ext2 == "4" || action.Ext2 == "5")
                         {
                             if (result.result[0] == 1)
                             {
@@ -857,10 +864,6 @@
             /// 璐т綅鐘舵� 0 鏃犺揣  1 鏈夎揣
             /// </summary>
             public string state { get; set; }
-            /// <summary>
-            /// 鏃堕棿鎴�-            /// </summary>
-            public string timeCuo { get; set; }
             /// <summary>
             /// 浜屾浠诲姟鐨勭粓鐐硅揣浣�             /// </summary>

--
Gitblit v1.9.1