From 6226621ae47b6dd28e4517ca79bf66b6fa57d95e Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期五, 13 六月 2025 18:22:42 +0800
Subject: [PATCH] 111

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

diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs
index 237f2cb..ee8401a 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs
@@ -465,15 +465,14 @@
             try
             {
                 string endMachLoc = "";
-                string endLoc = "";
                 //1銆佸垽鏂笂鏂欏钩鍙版槸鍚︾┖闂诧紝鑻ョ┖闂叉洿鏀圭粓鐐瑰埌涓婃枡骞冲彴
-                var plc = Settings.GetPlcInfo().Where(a => a.deviceType == "18" && a.enable == 1).ToList();
+                var plc = Settings.GetPlcInfo().Where(a => a.deviceType == "51" && a.enable == 1).ToList();
                 if (plc.Count > 0)
                 {
                     #region 鍒ゆ柇杈撻�绾挎ā寮�鍙樻洿娉ㄩ噴
-                    bool action = true;
                     foreach(var a in plc)
                     {
+                        bool action = false;
                         var modeResult = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
                         {
                             dataNum = 1,
@@ -483,10 +482,9 @@
                         });
                         if (modeResult != null && modeResult.errCode == 0)
                         {
-                            CMMLog.Debug($"OutWareTask锛氳鍙栨粴绛掓満{a.ip}閫氶亾鍙蜂负锛歿a.readAddr}鐨勫�涓猴細{modeResult.result[0]}");
+                            CMMLog.Debug($"OutWareTask锛氳鍙栨粴绛掓満ip:{a.ip},绔彛锛歿a.port}閫氶亾鍙蜂负锛歿a.readAddr}鐨勫�涓猴細{modeResult.result[0]}");
                             if (modeResult.result[0] == 2)
                             {
-                                action = false;
                                 CMMLog.Debug($"OutWareTask:杈撻�绾夸负 鍏ュ簱妯″紡锛岃緭閫佺嚎鐐逛綅锛歿a.location}");
                                 break;
                             }
@@ -498,12 +496,11 @@
                                 {
                                     if (modelInfo.Mode == "鍏ュ簱妯″紡")
                                     {
-                                        action = false;
                                         CMMLog.Debug($"OutWareTask:涓棿琛�ModeList涓�鍏ュ簱妯″紡");
-
                                     }
                                     else
                                     {
+                                        action = true;
                                         int[] num = new int[1] { 1 };
                                         var writeRes = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
                                         {
@@ -516,16 +513,16 @@
                                 }
                                 else
                                 {
-                                    action = false;
                                     CMMLog.Debug("OutWareTask:涓棿琛�ModeList 涓虹┖");
                                 }
                             }
                         }
+                        if (!action)
+                        {
+                            return false;
+                        }
                     };
-                    if (!action)
-                    {
-                        return false;
-                    }
+                    
                     #endregion
 
                     CMMLog.Info($"OutWareTask 11111");

--
Gitblit v1.9.1