From 67e758f3477eb057e3458a0a3e8a2e8c6e94592e Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期一, 16 六月 2025 17:32:19 +0800
Subject: [PATCH] 111

---
 ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs |   43 ++++++++++++++++++++++++++++---------------
 1 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
index 5e0a7fb..e356c85 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
@@ -959,17 +959,18 @@
                 var writeRes1 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
                 {
                     host = plc.ip,
-                    addr = plc.writeAddr + 3,// + 4
+                    addr = plc.writeAddr,
+                    data = 0,
+                    port = plc.port
+                });
+
+                writeRes1 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
+                {
+                    host = plc.ip,
+                    addr = plc.writeAddr + 3,
                     data = 1,
                     port = plc.port
                 });
-                //var writeRes1 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
-                //{
-                //    host = plc.ip,
-                //    addr = plc.writeAddr + 3,
-                //    data = 1,
-                //    port = plc.port
-                //});
             }
         }
 
@@ -1469,8 +1470,10 @@
         /// </summary>
         /// <param name="ip"></param>
         /// <param name="taskNo"></param>
-        internal static void CacheStackingMouth6(Settings.PlcInfo plc)
+        internal static void CacheStackingMouth6(Settings.PlcInfo plc, string taskNo)
         {
+            var taskInfo = MongoDBSingleton.Instance.FindOne<TN_I_TASK_MST>(Query.EQ("CN_S_TASK_NO", taskNo), "TN_I_TASK_MST");
+            MongoDBSingleton.Instance.Remove<WMSInfo>(Query.EQ("trayCode", taskInfo.CN_S_BATCH_NO), RemoveFlags.Single);
             var wirte = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
             {
                 addr = plc.writeAddr + 1,
@@ -4044,7 +4047,7 @@
             {
                 if (action)
                 {
-                    int[] num = new int[3] {1,1,1};
+                    int[] num = new int[3] {1,0,1};
                     var writeRes = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
                     {
                         host = plc.ip,
@@ -4068,14 +4071,24 @@
                         {
                             //鎺ㄩ�灏忚溅杩涘叆
                             TSHelper.GoToAGV(taskNo, 10, 3);
-                            writeRes = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
+
+                            int[] num1 = new int[2] { 1, 2};
+                            writeRes = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
                             {
                                 host = plc.ip,
-                                addr = plc.writeAddr + 2,
-                                data = 2,
+                                addr = plc.writeAddr + 1,
+                                data = num1,
                                 port = plc.port
                             });
-                            CMMLog.Debug($"鍐欏叆璁惧{plc.location}閫氶亾{plc.writeAddr + 2}閲岄潰鏁版嵁涓�.");
+
+                            //writeRes = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
+                            //{
+                            //    host = plc.ip,
+                            //    addr = plc.writeAddr + 2,
+                            //    data = 2,
+                            //    port = plc.port
+                            //});
+                            CMMLog.Debug($"鍐欏叆璁惧{plc.location}閫氶亾{plc.writeAddr + 1}閲岄潰鏁版嵁涓簕JsonConvert.SerializeObject(num1)}.");
                         }
                     }
                 }
@@ -4134,7 +4147,7 @@
                         if (result.result[0] == 2 && result.result[1] == 2 && result.result[3] == 2)
                         {
                             //鎺ㄩ�灏忚溅杩涘叆
-                            TSHelper.GoToAGV(taskNo, 10, 3);
+                            TSHelper.GoToAGV(taskNo, 10, 1);
                             var writeRes = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
                             {
                                 host = plc.ip,

--
Gitblit v1.9.1