From cce7e880813a457cfcdca3f3fc8cad3c99ebfb69 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期三, 02 七月 2025 17:07:31 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/process/DeviceProcess.cs | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/process/DeviceProcess.cs b/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
index 27022f3..03b80d6 100644
--- a/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
+++ b/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
@@ -312,7 +312,7 @@
si = "0";
}
- else if (data.Contains("11"))// && (ods.Find(x => x.SQL_PLineNo.Contains("绾哥")) != null || plc.deviceName.Contains("T1"))
+ if (data.Contains("11"))// && (ods.Find(x => x.SQL_PLineNo.Contains("绾哥")) != null || plc.deviceName.Contains("T1"))
{
//if (!ods.Any())
// return;
@@ -320,13 +320,22 @@
if (_cl.N_CURRENT_NUM > 0 || _clrel.Any())
{
LogHelper.Info($" time锛歿_clrel0?.T_CREATE} = s_type锛歿_clrel0.S_TYPE}");
+ //if (DateTime.Now.Subtract(_clrel0.T_CREATE).TotalSeconds < 10 || !string.IsNullOrEmpty(_clrel0.S_TYPE))
+ // goto ballll;
+ //plg 2025骞�鏈�3鏃� 鍘婚櫎10绉掓椂闂撮檺鍒� if (_clrel.Any())
- //if (DateTime.Now.Subtract(_clrel0.T_CREATE).TotalSeconds < 10 || !string.IsNullOrEmpty(_clrel0.S_TYPE))
- // goto ballll;
- //plg 2025骞�鏈�3鏃� 鍘婚櫎10绉掓椂闂撮檺鍒�- if (DateTime.Now.Subtract(_clrel0.T_CREATE).TotalSeconds < 3 || !string.IsNullOrEmpty(_clrel0.S_TYPE))
- goto ballll;
-
+ {
+ if (od?.SQL_PLineNo == "T1鎻愬崌鏈�)
+ {
+ if (!string.IsNullOrEmpty(_clrel0.S_TYPE))
+ goto ballll;
+ }
+ else
+ {
+ if (DateTime.Now.Subtract(_clrel0.T_CREATE).TotalSeconds < 3 || !string.IsNullOrEmpty(_clrel0.S_TYPE))
+ goto ballll;
+ }
+ }
LocationHelper.DoAction(db =>
{
db.Deleteable(_clrel).ExecuteCommand();
@@ -2711,7 +2720,6 @@
//灏辨煡鐪嬫湁娌℃湁绌虹殑鎺掍簡銆�
//if (endBit != null) /// 瀵绘壘鏈弧鎺掞紝 鐩存帴杩斿洖缁撴灉銆�
return endBit;
- //LogHelper.Info(" _tempList over锛�);
//杩欓噷寮� 瀵绘壘绌烘帓
Empty:
@@ -3482,7 +3490,7 @@
}
if (endBit == null && _tempList.Any())
{
- LogHelper.Info(" ar_RplaceRow over锛�);
+ LogHelper.Info(" ar_RplaceRow over锛� + JsonConvert.SerializeObject(_tempList.Select(x => x.N_ROW).Distinct()));
var ar_RplaceRows = LocationHelper.GetLocList(x => x.S_AREA_CODE != area1 && x.S_AREA_CODE.Contains(are) && x.S_LOCK_STATE != "鎶ュ簾");//.Select(x => x.N_ROW).Distinct();
//var ar_RplaceRow1 = ar_RplaceRows.FindAll(x => x.S_LOCK_STATE != "鏃�).Select(x => x.N_ROW).Distinct();
IEnumerable<int> ar_RplaceRow1 = ar_RplaceRows.FindAll(x => "鍏ュ簱閿�鍑哄簱閿�.Contains(x.S_LOCK_STATE?.Trim())).Select(x => x.N_ROW).Distinct();
--
Gitblit v1.9.1