From facfd6e182b0a14e553ebeb31aca27a68945307c Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期一, 23 六月 2025 13:03:43 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/core/Monitor.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index 45bc93f..d7fd2b9 100644
--- a/HH.WCS.QingXiNongfu/core/Monitor.cs
+++ b/HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -421,7 +421,7 @@
static void ROW_LOCK(Location startBit, Location EndBit, string msg, int sign, bool up = true, string WorkNo = "")
{
- LogHelper.Info("dooooooooooooooooooooooooooooooooooooooooooooo" + msg + "---" + sign);
+ LogHelper.Info("绉诲簱瑙ｉ攣 doo" + msg + "---" + sign + "--" + WorkNo);
LogHelper.Info(JsonConvert.SerializeObject(startBit));
LogHelper.Info(JsonConvert.SerializeObject(EndBit));
bool j瑙ｉ攣璧风偣搴撳尯鎺�= true;
@@ -430,9 +430,11 @@
//瑙ｉ攣鏃讹紝鏈夊伐鍗曞彿銆� 鏌ユ煡闄や簡杩欎釜宸ュ崟鍙蜂互澶栫殑鍏朵粬 鎸囧畾鍑哄簱鎺掓墽琛� var orders = WCSHelper.GetWorkOrder2();
var thisOrder = orders.Find(x => x.SQL_WorkNo == WorkNo);
+ LogHelper.Info("绉诲簱瑙ｉ攣 --褰撳墠宸ュ崟 sid:" + thisOrder?.S_ID);
if (thisOrder != null)
{
var other = orders.Find(x => x.SQL_WorkNo != WorkNo && x.start_area == thisOrder.start_area && x.start_row == thisOrder.start_row);
+ LogHelper.Info($"绉诲簱瑙ｉ攣 --鍏朵粬宸ュ崟 x.start_area == {thisOrder.start_area} start_row == {thisOrder.start_row} SID:" + other?.S_ID);
if (other != null)
j瑙ｉ攣璧风偣搴撳尯鎺�= false;
}
@@ -4029,7 +4031,7 @@
LogHelper.Info($"YWL_ZX_Turn from{od.S_START_AREA} mid:{od.S_ZZ_AREA} to{od.S_END_AREA} 寮� 銆嬨�銆�);
if (string.IsNullOrEmpty(od.S_ZZ_AREA) && string.IsNullOrEmpty(od.S_END_AREA))
{
- LogHelper.CError($"YWL_ZX_Turn from{od.S_START_AREA} mid:{od.S_ZZ_AREA} to{od.S_END_AREA} 鏁版嵁缂哄け銆傛棤娉曞畬鎴愮Щ搴撱�");
+ LogHelper.CError($"YWL_ZX_Turn from{od.S_START_AREA} to{od.S_END_AREA} 鏁版嵁缂哄け銆傛棤娉曞畬鎴愮Щ搴撱�");
continue;
}
var rows = locS.FindAll(x => x.N_ROW == od.N_START_ROW);
@@ -4046,12 +4048,12 @@
var lastful = rows.FindAll(x => x.N_CURRENT_NUM > 0).OrderBy(x => x.N_COL).LastOrDefault();
if (lastful != null)
{
- LogHelper.Info($"YWL_ZX_Turn from{od.S_START_AREA} mid:{od.S_ZZ_AREA} to{od.S_END_AREA} 鎵惧埌绉诲簱璧风偣銆媨lastful.S_LOC_CODE}銆�);
+ LogHelper.Info($"YWL_ZX_Turn from{od.S_START_AREA}to{od.S_END_AREA} 鎵惧埌绉诲簱璧风偣銆媨lastful.S_LOC_CODE}銆�);
var crs = LocationHelper.GetLocCntrRel(lastful.S_LOC_CODE);
var cntritems = ContainerHelper.GetCntrItemRel(crs.FirstOrDefault()?.S_CNTR_CODE);
if (!cntritems.Any())
continue;
- LogHelper.Info($"YWL_ZX_Turn from{od.S_START_AREA} mid:{od.S_ZZ_AREA} to{od.S_END_AREA} 鎵惧埌绉诲簱璧风偣銆媨lastful.S_LOC_CODE}銆傛帴椹虫槸鍚﹁閿侊紵锛歿InworkLock}");
+ LogHelper.Info($"YWL_ZX_Turn from{od.S_START_AREA}to{od.S_END_AREA} 鎵惧埌绉诲簱璧风偣銆媨lastful.S_LOC_CODE}銆傛帴椹虫槸鍚﹁閿侊紵锛歿InworkLock}");
var cir1 = cntritems.First();
if (!string.IsNullOrEmpty(od.S_ITEM_CODE))
@@ -4092,7 +4094,7 @@
Endbit = zzrloclist.Find(x => x.N_COL > (_cl2?.N_COL ?? 0));
if (Endbit != null)
{
- LogHelper.Info($"鍏ヤ腑杞尯{od.S_ZZ_AREA}浣跨敤{Endbit.S_LOC_CODE}");
+ LogHelper.Info($"鍏ヤ腑杞尯{nextarea}浣跨敤{Endbit.S_LOC_CODE}");
break;
}
}
--
Gitblit v1.9.1