From b7cf29b366aa2afb5fada4b340bac268c1bb1534 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期四, 12 六月 2025 17:34:02 +0800
Subject: [PATCH] 123

---
 ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs
index 7222b46..237f2cb 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs
@@ -135,8 +135,8 @@
                 var trayInfo = MongoDBSingleton.Instance.FindOne<trayTypeTable>(Query.EQ("locCode", mst.CN_S_START_BIT), "trayTypeTable");
                 if (trayInfo != null && trayInfo.trayType == "2")
                 {
-                    start.CN_N_AGV_LOCATION = MongoDBSingleton.Instance.FindOne<STOCK_LOCATION_Two>(Query.EQ("CN_S_LOCATION_CODE", mst.CN_S_START_BIT), "STOCK_LOCATION_Two").CN_N_AGV_LOCATION;
-                    end.CN_N_AGV_LOCATION = MongoDBSingleton.Instance.FindOne<STOCK_LOCATION_Two>(Query.EQ("CN_S_LOCATION_CODE", mst.CN_S_END_BIT), "STOCK_LOCATION_Two").CN_N_AGV_LOCATION;
+                    start.CN_N_AGV_LOCATION = start.CN_N_AGV_LOCATION + 400;
+                    end.CN_N_AGV_LOCATION = end.CN_N_AGV_LOCATION + 400;
                     CMMLog.Info($"浠诲姟鎺ㄩ�锛氱敯瀛楁墭璧风偣缁堢偣 绔欑偣鏇存敼锛岃捣鐐癸細{start.CN_N_AGV_LOCATION}锛岀粓鐐癸細{end.CN_N_AGV_LOCATION}");
                 }
 
@@ -254,6 +254,7 @@
                     if (mst.CN_S_BUSS_TYPE == "鍖呰绾胯ˉ绌�) PLCControl.PackingLineComplete(plc.ip);
                     if (mst.CN_S_BUSS_TYPE == "鐢垫鍙栬揣") PLCControl.LiftAction(plc, mst.CN_S_TASK_NO,false);
                     if (mst.CN_S_BUSS_TYPE == "鍥涢挻鎴愬搧鍑哄簱" || mst.CN_S_BUSS_TYPE == "鍥涢挻杈呮潗鍑哄簱") PLCControl.productOutWare(mst.CN_S_END_BIT, mst.CN_S_TASK_NO, false);
+                    if (mst.CN_S_BUSS_TYPE == "3妤肩紦瀛樻灦鍏ュ彔鎵�) PLCControl.CacheStackingMouth6(plc);
                 }
             }
         }
@@ -471,7 +472,7 @@
                 {
                     #region 鍒ゆ柇杈撻�绾挎ā寮�鍙樻洿娉ㄩ噴
                     bool action = true;
-                    plc.ForEach(a =>
+                    foreach(var a in plc)
                     {
                         var modeResult = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
                         {
@@ -487,6 +488,7 @@
                             {
                                 action = false;
                                 CMMLog.Debug($"OutWareTask:杈撻�绾夸负 鍏ュ簱妯″紡锛岃緭閫佺嚎鐐逛綅锛歿a.location}");
+                                break;
                             }
                             else
                             {
@@ -498,6 +500,18 @@
                                     {
                                         action = false;
                                         CMMLog.Debug($"OutWareTask:涓棿琛�ModeList涓�鍏ュ簱妯″紡");
+
+                                    }
+                                    else
+                                    {
+                                        int[] num = new int[1] { 1 };
+                                        var writeRes = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
+                                        {
+                                            host = a.ip,
+                                            addr = a.writeAddr,
+                                            data = num,
+                                            port = a.port
+                                        });
                                     }
                                 }
                                 else
@@ -507,7 +521,7 @@
                                 }
                             }
                         }
-                    });
+                    };
                     if (!action)
                     {
                         return false;
@@ -631,6 +645,14 @@
                                 }
                                 else
                                 {
+                                    int[] num = new int[1] { 2 };
+                                    var writeRes = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
+                                    {
+                                        host = plc.ip,
+                                        addr = plc.writeAddr,
+                                        data = num,
+                                        port = plc.port
+                                    });
                                     return true;
                                 }
                             }

--
Gitblit v1.9.1