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/ProcessHelper.cs |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
index 7199b41..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];
                         }
@@ -353,7 +353,7 @@
             //if (plc != null || mst.CN_S_BUSS_TYPE == "3妤煎绉板叆缂撳瓨鏋�)
             CMMLog.Info($"{mst.CN_S_END_BIT}");
             CMMLog.Info($"{plc}");
-            if (plc != null || mst.CN_S_BUSS_TYPE == "3妤兼墦鍖呬笅绾�)
+            if (plc != null || mst.CN_S_BUSS_TYPE == "3妤兼墦鍖呬笅绾� || mst.CN_S_BUSS_TYPE == "PDA鎵撳寘涓嬬嚎")
             {
                 CMMLog.Info($"杩涘叆{mst.CN_S_BUSS_TYPE}娴佺▼{code}鐨勫鐞�);
                 if (code == 1013)
@@ -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("鎺ラ┏浣嶇偣浣嶆湭閰嶇疆");
@@ -945,14 +945,14 @@
                         new SqlHelper<object>().ExecuteSql($"update dbo.tn_am_task_mst set CN_S_END_BIT='{endMachLoc}',CN_S_END_AGVBIT = '{StockInstance.Instance.GetAGVCodeForBitCode(endMachLoc)}' where CN_S_TASK_NO = '{mst.CN_S_TASK_NO}'");
 
                         var plcTwo = Settings.GetPlcInfo().Where(a => a.location == endMachLoc && a.enable == 1).First();
-                        //int[] num = new int[1] { 1 };
-                        //var wirte = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
-                        //{
-                        //    addr = plcTwo.writeAddr + 1,
-                        //    host = plcTwo.ip,
-                        //    data = num,
-                        //    port = plcTwo.port
-                        //});
+                        int[] num = new int[1] { 1 };
+                        var wirte = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
+                        {
+                            addr = plcTwo.writeAddr + 1,
+                            host = plcTwo.ip,
+                            data = num,
+                            port = plcTwo.port
+                        });
 
                         result = true;
                     }

--
Gitblit v1.9.1