From 8741f7e84dc7c0a1150c92758ebb2cf4b7d18c73 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期五, 18 七月 2025 14:49:30 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/process/DeviceProcess.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/process/DeviceProcess.cs b/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
index f85d37e..67f3ffa 100644
--- a/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
+++ b/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
@@ -334,7 +334,7 @@
}
else
{
- if (DateTime.Now.Subtract(_clrel0.T_CREATE).TotalSeconds < 3 || !string.IsNullOrEmpty(_clrel0.S_TYPE))
+ if (!string.IsNullOrEmpty(_clrel0.S_TYPE))
goto ballll;
}
}
@@ -2312,7 +2312,7 @@
}
//鑾峰彇鎸囧畾搴撳尯 鎸囧畾鎺�婊＄殑璐т綅 鐒跺悗鎺掗櫎 姣旀渶澶у垪杩樺皬鐨勭┖璐т綅
- var Mhw = locationInLock.FindAll(e => e.N_CURRENT_NUM > 0).ToList();
+ var Mhw = locationInLock.FindAll(e => e.N_CURRENT_NUM > 0 && e.S_LOCK_STATE == "鏃�).ToList();
if (Mhw.Count() > 0)
{
var RowLis = Mhw.GroupBy(e => e.N_ROW).Select(f => f.First()).ToList();
@@ -4219,6 +4219,13 @@
}
if (hojs.N_CURRENT_NUM == 0)//涓婃墭鐩�鍚﹀垯涓嬫墭鐩� {
+ List<string> TaskState = new List<string>() { "瀹屾垚", "鍙栨秷" };
+ var TaskListNum = LocationHelper.GetList<WMSTask>(x => x.S_START_LOC == location && !TaskState.Contains(x.S_B_STATE));
+ if (TaskListNum.Count() > 0)
+ {
+ throw new Exception("鍙兘鐢熸垚涓�釜浠诲姟 杩涘嚭");
+ }
+
//涓婃墭鐩�婊℃墭
var jcjykk = bcpList.FindAll(e => e.S_CNTR_TYPE == "婊℃墭").OrderByDescending(g => g.N_PRI).ToList();
var AreaList = jcjykk.Select(e => e.S_AREA_CODE).Distinct().ToList();
@@ -4277,11 +4284,17 @@
{
var time = LocationHelper.GetT_FULL_TIME(location);
LogHelper.Info(location + "锛氭墭鐩樻斁缃椂闂�(" + time + ") 璐т綅鎵樼洏鏁伴噺(" + hojs.N_CURRENT_NUM + ")");
- if (DateTime.Now.Subtract(time ?? DateTime.Now).TotalMinutes < 1)
+ if (DateTime.Now.Subtract(time ?? DateTime.Now).TotalSeconds < 10)
{
PlcHelper.SendHex(plc.address, "3F00110D0A");
return false;
}
+ List<string> TaskState = new List<string>() { "瀹屾垚", "鍙栨秷", "鎺ㄩ�寮傚父" };
+ var TaskListNum = LocationHelper.GetList<WMSTask>(x => x.S_END_LOC == location && !TaskState.Contains(x.S_B_STATE));
+ if (TaskListNum.Count() > 0)
+ {
+ throw new Exception("鍙兘鐢熸垚涓�釜浠诲姟 杩涘嚭");
+ }
LocCntrRel _clrel = LocationHelper.GetLocCntrRel(hojs.S_LOC_CODE).FirstOrDefault();
//涓嬫墭鐩�绌烘
var jcjykk = bcpList.FindAll(e => e.S_CNTR_TYPE == "绌烘墭").OrderByDescending(g => g.N_PRI).ToList();
--
Gitblit v1.9.1