From e0471620ed16295a330ce18bcfe1654c91138996 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期五, 18 七月 2025 17:24:42 +0800
Subject: [PATCH] 111

---
 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/EnentListen.cs |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/EnentListen.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/EnentListen.cs
index 98481ec..81e6d42 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/EnentListen.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/EnentListen.cs
@@ -272,7 +272,8 @@
             #region   2000-鍏呯數浠诲姟--鏃犻渶鏀瑰姩
             if (currActionModel.CN_N_ACTION_CODE == 2000)
             {
-                ProcessHelper.AGVBatteryTime();
+                //ProcessHelper.AGVBatteryTime();
+                ProcessHelper.AGVBatteryTimeTwo();
                 //Thread.Sleep(500);
             }
             #endregion
@@ -369,7 +370,14 @@
             }
             #endregion
 
-            #region 鍥涢挻
+            #region 10021-erp绠�崟鐢熶骇鍏ュ簱琛ㄥ弽棣堝け璐ワ紝閲嶆柊鍙嶉
+            if (currActionModel.CN_N_ACTION_CODE == 10021)
+            {
+                ERPService.SendERPTaskCompleteFuncThree();
+            }
+            #endregion
+
+            #region 鐢甸挻
 
             #region 10017-A鍙�             if (currActionModel.CN_N_ACTION_CODE == 10017)
@@ -414,8 +422,8 @@
             }
             #endregion
 
-            #region 10019-鐢甸挻鎺ラ┏浣嶅叆绔嬪簱
-            if (currActionModel.CN_N_ACTION_CODE == 10019)
+            #region 10020-鐢甸挻鎺ラ┏浣嶅叆绔嬪簱
+            if (currActionModel.CN_N_ACTION_CODE == 10020)
             {
                 var conInfo = Settings.GetDGConnectingbitsList().Where(a => a.enable == 1).ToList();
                 if (conInfo != null)
@@ -429,6 +437,16 @@
             }
             #endregion
 
+            #region 10022-鍙嶉erp 鎻掑叆绠�崟鐢熶骇鍏ュ簱琛�+            if (currActionModel.CN_N_ACTION_CODE == 10022)
+            {
+                ERPService.SendERPTaskCompleteFuncDG();
+            }
+            #endregion
+
+            #region 鐢熶骇閫�簱
+            #endregion
+
             #endregion
             return bResult;
         }

--
Gitblit v1.9.1