From bb09e7affb602791af4064cda8cddcfae8b3f3aa Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 22 五月 2025 13:17:46 +0800
Subject: [PATCH] 内部联调测试，修复产品入库货区判断逻辑等问题
---
core/Monitor.cs | 41 ++++++++++++++---------------------------
1 files changed, 14 insertions(+), 27 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 11ed38f..169c2db 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -27,7 +27,7 @@
.ToList();
if (orderList.Count == 0) {
- LogHelper.Info("杞--鍑哄簱--鏆傛棤寰呮墽琛岀殑Order");
+ LogHelper.Info($"杞--{taskName}--鏆傛棤寰呮墽琛岀殑{taskName}鍗�);
return;
}
@@ -45,34 +45,21 @@
continue;
}
- var lastDetail = db.Queryable<TN_Count_CG_Detail>()
- .Where(d => d.S_COUNT_NO == order.S_COUNT_NO && d.N_B_STATE == 2) // TODO 鎴栬�鏀规垚鏌ask
- .First();
- if (lastDetail != null) {
- LogHelper.Info($"杞--{taskName}--{taskName}鍗�{order.S_COUNT_NO}'涓婁竴涓换鍔′粛鍦ㄨ繘琛屼腑锛�
- + JsonConvert.SerializeObject(lastDetail));
- continue;
- }
-
- var outboundDetail = db.Queryable<TN_Count_CG_Detail>()
+ var countCgDetailList = db.Queryable<TN_Count_CG_Detail>()
.Where(a => a.S_COUNT_NO == order.S_COUNT_NO && a.N_B_STATE == 1) // 宸蹭笅鍙�- .First();
- if (outboundDetail != null) {
- LogHelper.Info($"杞--{taskName}--");
+ .ToList();
+
+ if (countCgDetailList.Count == 0) {
+ LogHelper.Info($"杞--{taskName}--{taskName}鍗曟槑缁嗙姸鎬佸紓甯�);
continue;
}
- detailList.Add(outboundDetail);
+ detailList.AddRange(countCgDetailList);
}
if (detailList.Count == 0) {
return;
}
-
- var startLocList = new List<TN_Location>();
- var endLocList = new List<TN_Location>();
-
- var taskList = new List<TN_Task>();
foreach (var detail in detailList) {
var startLoc = db.Queryable<TN_Location>()
@@ -81,17 +68,17 @@
.First();
if (startLoc == null) {
- LogHelper.Info($"杞--鍑哄簱锛氭病鏈夋壘鍒板悎閫傜殑璧风偣璐т綅锛�);
+ LogHelper.Info($"杞--{taskName}锛氭病鏈夋壘鍒板悎閫傜殑璧风偣璐т綅锛�);
continue;
}
var endLoc = db.Queryable<TN_Location>()
- .Where(a => a.S_AREA_CODE == "SFQ")
+ .Where(a => Settings.Areas[0].Contains(a.S_AREA_CODE))
.Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y")
.Where(a => a.N_CURRENT_NUM == 0).First();
if (endLoc == null) {
- LogHelper.Info($"杞--鍑哄簱锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛丼_NO涓�'{detail.S_COUNT_NO}'");
+ LogHelper.Info($"杞--{taskName}锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛佸崟鍙蜂负 '{detail.S_COUNT_NO}'");
continue;
}
@@ -106,7 +93,7 @@
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_Count_CG_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
tran.RollbackTran();
- LogHelper.Info($"杞--鍑哄簱--淇敼鏄庣粏琛ㄧ姸鎬佷负瀹屾垚澶辫触锛�);
+ LogHelper.Info($"杞--{taskName}--淇敼鏄庣粏琛ㄧ姸鎬佷负瀹屾垚澶辫触锛�);
}
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -116,7 +103,7 @@
it.T_MODIFY
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣浣峽endLoc.S_CODE}";
LogHelper.Info(info);
continue;
}
@@ -129,7 +116,7 @@
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
+ info = $"鐢熸垚'{taskName}'澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
LogHelper.Info(info);
continue;
}
@@ -144,7 +131,7 @@
tran.CommitTran();
info = $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
LogHelper.Info(info);
- continue;
+ //continue;
}
}
}
--
Gitblit v1.9.1