From fee025c0d4fb4fd41d9dbf81b6435fd8e6229d5c Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期一, 16 六月 2025 17:33:05 +0800
Subject: [PATCH] 11111
---
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs | 91 +++++++++++++++++++++++----------------------
1 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
index 1e4237b..89db716 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
@@ -697,51 +697,52 @@
if (plc.Count > 0)
{
#region 鍒ゆ柇杈撻�绾挎ā寮�鍙樻洿娉ㄩ噴
- //bool action = true;
- //foreach(var a in plc)
- //{
- // var modeResult = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
- // {
- // dataNum = 1,
- // addr = a.readAddr + 3,
- // host = a.ip,
- // port = a.port
- // });
- // if (modeResult != null && modeResult.errCode == 0)
- // {
- // CMMLog.Debug($"OutWareTask锛氳鍙栨粴绛掓満{a.ip}閫氶亾鍙蜂负锛歿a.readAddr + 3}鐨勫�涓猴細{modeResult.result[0]}");
- // if (modeResult.result[0] == 2)
- // {
- // action = false;
- // CMMLog.Debug($"OutWareTask:杈撻�绾夸负 鍏ュ簱妯″紡锛岃緭閫佺嚎鐐逛綅锛歿a.location}");
- // break;
- // }
- // else
- // {
- // //璇诲彇涓棿琛ㄦā寮�- // var modelInfo = MongoDBSingleton.Instance.FindOne<ModeList>("ModeList");
- // if (modelInfo != null)
- // {
- // if (modelInfo.Mode == "鍏ュ簱妯″紡")
- // {
- // action = false;
- // CMMLog.Debug($"OutWareTask:涓棿琛�ModeList涓�鍏ュ簱妯″紡");
- // break;
- // }
- // }
- // else
- // {
- // action = false;
- // CMMLog.Debug("OutWareTask:涓棿琛�ModeList 涓虹┖");
- // break;
- // }
- // }
- // }
- //};
- //if (!action)
- //{
- // return false;
- //}
+
+ foreach(var a in plc)
+ {
+ bool action = false;
+ var modeResult = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
+ {
+ dataNum = 1,
+ addr = a.readAddr + 3,
+ host = a.ip,
+ port = a.port
+ });
+ if (modeResult != null && modeResult.errCode == 0)
+ {
+ CMMLog.Debug($"OutWareTask锛氳鍙栨粴绛掓満{a.ip}閫氶亾鍙蜂负锛歿a.readAddr + 3}鐨勫�涓猴細{modeResult.result[0]}");
+ if (modeResult.result[0] == 2)
+ {
+ CMMLog.Debug($"OutWareTask:杈撻�绾夸负 鍏ュ簱妯″紡锛岃緭閫佺嚎鐐逛綅锛歿a.location}");
+ break;
+ }
+ else
+ {
+ //璇诲彇涓棿琛ㄦā寮�+ var modelInfo = MongoDBSingleton.Instance.FindOne<ModeList>("ModeList");
+ if (modelInfo != null)
+ {
+ if (modelInfo.Mode == "鍏ュ簱妯″紡")
+ {
+ CMMLog.Debug($"OutWareTask:涓棿琛�ModeList涓�鍏ュ簱妯″紡");
+ }
+ else
+ {
+ action = true;
+ }
+ }
+ else
+ {
+ CMMLog.Debug("OutWareTask:涓棿琛�ModeList 涓虹┖");
+ }
+ }
+ }
+ if (!action)
+ {
+ return false;
+ }
+ };
+
#endregion
--
Gitblit v1.9.1