From fc25dda9baf3b5f4df23d35914f3dd343cf492e3 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 28 七月 2025 17:30:21 +0800
Subject: [PATCH] 优化WCSHelper / 序列号生成逻辑 , 添加强制任务处理模块
---
api/DebugController.cs | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/api/DebugController.cs b/api/DebugController.cs
index ffe421b..b91bb2e 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -17,6 +17,7 @@
using static HH.WCS.Mobox3.DSZSH.api.ApiModel;
using static HH.WCS.Mobox3.DSZSH.api.OtherModel;
using static HH.WCS.Mobox3.DSZSH.core.Monitor;
+using static HH.WCS.Mobox3.DSZSH.util.Config;
namespace HH.WCS.Mobox3.DSZSH.api {
/// <summary>
@@ -112,7 +113,7 @@
try {
// 鏌ヨ璧风偣璐т綅:鏁伴噺=0
var startLoc = db.Queryable<TN_Location>().LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
- .Where((l,c) => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.S_CODE == model.StartLoc && l.N_CURRENT_NUM == 1 && c.S_CNTR_CODE == model.CntrCode).First();
+ .Where((l, c) => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.S_CODE == model.StartLoc && l.N_CURRENT_NUM == 1 && c.S_CNTR_CODE == model.CntrCode).First();
if (startLoc == null) {
return $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'!瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=1";
}
@@ -142,12 +143,11 @@
return "鏁版嵁搴撴搷浣滃け璐�";
}
- tran.CommitTran() ;
+ tran.CommitTran();
return "鏁版嵁搴撴搷浣滄垚鍔�;
}
}
catch (Exception ex) {
-
return ex.Message;
}
}
@@ -214,6 +214,22 @@
message = "success"
};
}
+
+ [HttpPost]
+ public string TestDb() {
+ var db = new SqlHelper<object>().GetInstance();
+ var startAreas = new List<string> { "HJQ", "CKQ" };
+ //var locationQuery = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && startAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 1).LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE).Where((l, c) => c.S_CNTR_CODE == "a" && c.S_CNTR_TYPE == "b");
+ //LogHelper.Info(locationQuery.ToSqlString());
+ ////var location = locationQuery.First();
+ //var newLocationQuery = DbQuery.StartLoc(db, "a", startAreas);
+ //LogHelper.Info(newLocationQuery.ToSqlString());
+ //locationQuery = db.Queryable<TN_Location>().LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE).Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && startAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 1).Where((l, c) => c.S_CNTR_CODE == "a" && c.S_CNTR_TYPE == "b");
+
+ var locationQuery = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: startAreas));
+ LogHelper.Info(locationQuery.ToSqlString());
+ return locationQuery.ToSqlString();
+ }
}
public class GoodpackToProdLineInfo {
--
Gitblit v1.9.1