From b079910e5de15863c26e479ffab15cc45d706f1a Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 19 五月 2025 16:25:22 +0800
Subject: [PATCH] 测试修复轮询出库、抽检流程的问题
---
ServiceCore/ShiftCore.cs | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/ServiceCore/ShiftCore.cs b/ServiceCore/ShiftCore.cs
index d74141e..c8d47ec 100644
--- a/ServiceCore/ShiftCore.cs
+++ b/ServiceCore/ShiftCore.cs
@@ -23,13 +23,13 @@
.OrderBy(c => c.T_CREATE, SqlSugar.OrderByType.Asc).First();
if (order == null) {
- LogHelper.Info("杞锛氭殏鏃犲緟鎵ц鐨勭Щ搴撳崟");
+ LogHelper.Info("杞--绉诲簱--鏆傛棤寰呮墽琛岀殑Order");
return;
}
if (db.Queryable<TN_Shift_Detail>()
.First(d => d.S_NO == order.S_NO && d.N_B_STATE == SpotStateCode.浠诲姟鎵ц涓� != null) {
- LogHelper.Debug("杞锛氫笂涓�釜绉诲簱浠诲姟浠嶅湪杩涜涓�);
+ LogHelper.Debug("杞--绉诲簱--涓婁竴涓换鍔′粛鍦ㄨ繘琛屼腑");
return;
}
@@ -40,7 +40,7 @@
if (detail == null) {
//order.N_B_STATE = SpotStateCode.浠诲姟鎵ц涓�
- LogHelper.Info("杞绉诲簱锛氭殏鏃犲緟鎵ц鐨勪换鍔�);
+ LogHelper.Info("杞--绉诲簱--鏆傛棤寰呮墽琛岀殑浠诲姟");
return;
}
@@ -49,7 +49,7 @@
.First();
if (startLocCntrRel == null) {
- LogHelper.Info("杞锛氱Щ搴擄細娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣�);
+ LogHelper.Info("杞--绉诲簱锛氭病鏈夋壘鍒板悎閫傜殑璧风偣璐т綅锛�);
return;
}
@@ -59,7 +59,7 @@
.Where(ExprHelper.LocIsEmpty).First();
if (endLoc == null) {
- LogHelper.Info("杞锛氬嚭搴擄細娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣�);
+ LogHelper.Info("杞--鍑哄簱锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛�);
return;
}
@@ -67,16 +67,15 @@
detail.N_B_STATE = SpotStateCode.浠诲姟鎵ц涓�
if (db.Updateable<TN_Shift_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
tran.RollbackTran();
- LogHelper.Info($"杞锛氬嚭搴擄細鏇存柊澶辫触锛氫慨鏀规槑缁嗚〃鐘舵�涓哄畬鎴�);
+ LogHelper.Info($"杞--鍑哄簱锛氫慨鏀规槑缁嗚〃鐘舵�涓哄畬鎴�-澶辫触锛�);
}
- if (TaskHelper.LogCreateTask(startLocCntrRel.S_LOC_CODE, startLocCntrRel.S_CNTR_CODE,
+ if (!TaskHelper.LogCreateTask(startLocCntrRel.S_LOC_CODE, startLocCntrRel.S_CNTR_CODE,
endLoc.S_CODE, TaskName.鎴愬搧鑳跺嚭搴�) {
- tran.CommitTran();
- }
- else {
tran.RollbackTran();
}
+
+ tran.CommitTran();
}
}
catch (Exception ex) {
@@ -85,28 +84,39 @@
}
public static void UpdateTaskState(int spotStateCode) {
+
var db = DbHelper.GetDbClient();
var detail = db.Queryable<TN_Shift_Detail>()
.First(d => d.N_B_STATE == SpotStateCode.浠诲姟鎵ц涓�;
if (detail == null) {
- LogHelper.Info("褰撳墠娌℃湁鎵ц涓殑绉诲簱鍗曟槑缁嗛」鐩�);
+ LogHelper.Info("绉诲簱--AGV浠诲姟瀹屾垚--鏌ヨDetail锛氬綋鍓嶆病鏈�鎵ц涓�鐨凞etail琛紒");
return;
}
using (var tran = db.Ado.UseTran()) {
detail.N_B_STATE = spotStateCode;
- db.Updateable<TN_Shift_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand();
+ if (db.Updateable<TN_Shift_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ LogHelper.Info("绉诲簱--AGV浠诲姟瀹屾垚锛氫慨鏀笵etail鐘舵� N_B_STATE 涓�3浠诲姟鎵ц瀹屾垚 澶辫触锛�);
+ return;
+ }
- if (db.Queryable<TN_Shift_Detail>().Count(d => d.S_NO == detail.S_NO && d.N_B_STATE == 2) ==
- db.Queryable<TN_Shift_Detail>().Count(d => d.S_NO == detail.S_NO)) {
+ var finishedCount = db.Queryable<TN_Shift_Detail>().Count(d => d.S_NO == detail.S_NO && d.N_B_STATE == 3);
+ var allCount = db.Queryable<TN_Shift_Detail>().Count(d => d.S_NO == detail.S_NO);
+
+ LogHelper.Info($"绉诲簱--AGV浠诲姟瀹屾垚锛氱粺璁′换鍔″凡瀹屾垚锛歿finishedCount} / {allCount}");
+
+ if (finishedCount == allCount) { // 褰撳墠order涓嬬殑detail锛屼换鍔￠兘宸茬粡瀹屾垚
if (db.Updateable<TN_Shift_Order>().SetColumns(it => it.N_B_STATE == SpotStateCode.浠诲姟鎵ц瀹屾垚)
.Where(it => it.S_NO == detail.S_NO)
.ExecuteCommand() <= 0) {
+
tran.RollbackTran();
- LogHelper.Info("淇敼Order鐘舵�閿欒");
+ LogHelper.Info("绉诲簱--AGV浠诲姟瀹屾垚--鎵�湁浠诲姟瀹屾垚鏃讹細淇敼Order鐘舵� N_B_STATE 涓�3浠诲姟鎵ц瀹屾垚 澶辫触锛�);
+ return;
}
}
--
Gitblit v1.9.1