From 815139c15ba938d79ad2ba14ddae6f635c37b085 Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期四, 12 六月 2025 17:33:10 +0800
Subject: [PATCH] 优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs
index bb8dea6..80989df 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs
@@ -105,8 +105,8 @@
var cntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == item.S_CODE).ToList();
if (cntr.Count > 0)
{
- var cntrcodes = cntr.Select(a => a.S_CNTR_CODE).ToArray();
- cntrcode = string.Join(",", cntrcodes);
+ cntrcode = cntr.OrderBy(a=>a.T_CREATE).First().S_CNTR_CODE;
+ // cntrcode = string.Join(",", cntrcodes);
}
//鍒涘缓杩囨湭瀹屾垚鐨勪换鍔′笉鍙戣捣璇锋眰
@@ -206,16 +206,30 @@
//}
//鍒涘缓杩囨湭瀹屾垚鐨勪换鍔′笉鍙戣捣璇锋眰
- var mst = WCSHelper.GetTaskByStartloc(device.TN_Location);
- if (mst == null)
+ //var mst = WCSHelper.GetTaskByStartloc(device.TN_Location);
+ //if (mst == null)
+ //{
+ // Traystacker(device.TN_Location, value, 2);
+ //}
+ //else
+ //{
+ // LogHelper.Info($"鏈夋墽琛屼腑鐨勫彔鐩樺洖搴撲换鍔mst.S_CODE}锛屼笉瑙﹀彂鍙犵洏浠诲姟");
+ //}
+ var loc = LocationHelper.GetLocByLoc(device.TN_Location);
+ if (loc != null)
{
- Traystacker(device.TN_Location, value, 2);
+ if (loc.N_LOCK_STATE == 0) {
+ Traystacker(device.TN_Location, value, 2);
+ }
+ else
+ {
+ LogHelper.Info($"璁惧璧风偣锛歿device.TN_Location}鏈夐攣锛屼笉鐢熸垚浠诲姟");
+ }
}
else
{
- LogHelper.Info($"鏈夋墽琛屼腑鐨勫彔鐩樺洖搴撲换鍔mst.S_CODE}锛屼笉瑙﹀彂鍙犵洏浠诲姟");
+ LogHelper.Info($"鏍规嵁璁惧锛歿device.deviceName}锛岃捣鐐癸細{device.TN_Location},鏈壘鍒拌揣浣�);
}
-
}
else
{
--
Gitblit v1.9.1