From d23feff4aef10e539e9f5926dd0e496c0612b4e6 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期五, 23 五月 2025 17:26:45 +0800
Subject: [PATCH] 双钱-优化字段的类型，自动不合格出库复检测试
---
core/Monitor.cs | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index ed34896..b0de987 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -701,21 +701,24 @@
var db = new SqlHelper<object>().GetInstance();
try
{
- var endLoc = db.Queryable<TN_Location>().First(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.S_AREA_CODE == Settings.Areas[7]);
- if (endLoc == null)
- {
- LogHelper.Info($"鏈壘鍒板悎閫傜殑缁堢偣璐т綅锛岃姹俛.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == 鏃�&& a.S_AREA_CODE == Settings.Areas[7]");
- return;
- }
+
var startLoc = db.Queryable<TN_Location>().
LeftJoin<TN_Loc_Container>((o, i) => o.S_CODE == i.S_LOC_CODE).
LeftJoin<TN_CG_Detail>((o, i, s) => i.S_CNTR_CODE == s.S_CNTR_CODE).
Where((o, i, s) => o.N_CURRENT_NUM == 1 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃� && o.S_AREA_CODE == Settings.Areas[1]
&& s.N_ITEM_STATE == 2 && s.S_ITEM_STATE == "涓嶅悎鏍�).First();
-
- if (endLoc == null)
+
+ if (startLoc == null)
{
LogHelper.Info($"鏈壘鍒板悎閫傜殑璧风偣璐т綅锛岃姹俹.N_CURRENT_NUM == 1 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == 鏃�&& o.S_AREA_CODE == Settings.Areas[1] && s.N_ITEM_STATE ==2 && s.S_ITEM_STATE==涓嶅悎鏍�);
+ return;
+ }
+
+
+ var endLoc = db.Queryable<TN_Location>().First(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.S_AREA_CODE == Settings.Areas[7]);
+ if (endLoc == null)
+ {
+ LogHelper.Info($"鏈壘鍒板悎閫傜殑缁堢偣璐т綅锛岃姹俛.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == 鏃�&& a.S_AREA_CODE == Settings.Areas[7]");
return;
}
@@ -733,7 +736,7 @@
LocationHelper.LockLoc(startLoc.S_CODE, 2);//璧风偣鍑哄簱閿侊紝
LocationHelper.LockLoc(endLoc.S_CODE, 1);//缁堢偣鍏ュ簱閿�
- LogHelper.Info($"鐢熸垚婊℃墭鍑哄簱澶嶆浠诲姟鎴愬姛锛屽鍣細{cntId.S_CNTR_CODE}锛岃捣鐐癸細{startLoc.S_CODE}");
+ LogHelper.Info($"鐢熸垚婊℃墭鍑哄簱澶嶆浠诲姟鎴愬姛锛屽鍣細{cntId.S_CNTR_CODE}锛岃捣鐐癸細{startLoc.S_CODE}锛岀粓鐐癸細{endLoc.S_CODE}");
Task task27 = Task.Run(() =>
{
@@ -742,7 +745,7 @@
}
else
{
- LogHelper.Info($"鐢熸垚婊℃墭鍑哄簱澶嶆浠诲姟澶辫触锛屽鍣細{cntId.S_CNTR_CODE}锛岃捣鐐癸細{startLoc.S_CODE}");
+ LogHelper.Info($"鐢熸垚婊℃墭鍑哄簱澶嶆浠诲姟澶辫触锛屽鍣細{cntId.S_CNTR_CODE}锛岃捣鐐癸細{startLoc.S_CODE}锛岀粓鐐癸細{endLoc.S_CODE}");
}
--
Gitblit v1.9.1