From f978872b6de4e7e20d992a2ee7cda902c11347b9 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 30 六月 2025 15:31:56 +0800
Subject: [PATCH] 优化配置文件读取逻辑，将ERP反馈接口写入配置文件中配置
---
api/ApiHelper.cs | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 94913f5..a61f780 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -34,8 +34,6 @@
var startAreas = taskInfo.StartAreas;
var endAreas = taskInfo.EndAreas;
- var log = $"API锛歿taskName}锛�;
-
try {
if (model.Num <= 0) {
info = $"鐗╂枡鏁伴噺'{model.Num}'涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬0";
@@ -51,7 +49,12 @@
return NewSimpleResult(1, info);
}
- var startLoc = LocationHelper.GetLocQuery(db, 0, startAreas, model.StartLoc).First();
+ var startLoc = db.Queryable<TN_Location>()
+ .Where(l => l.S_CODE == model.StartLoc)
+ .Where(l => startAreas.Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.N_CURRENT_NUM == 0)
+ .First();
if (startLoc == null) {
info = $"锛氭病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛佽姹傦細鏈笂閿併�鏁伴噺=0銆佽揣鍖哄睘浜嶽{string.Join(", ", startAreas)}]";
@@ -67,7 +70,11 @@
S_CNTR_TYPE = "濂借繍绠�,
};
- var endLoc = LocationHelper.GetLocQuery(db, 0, endAreas).OrderBy(l => new { l.N_LAYER }).First();
+ var endLoc = db.Queryable<TN_Location>()
+ .Where(l => startAreas.Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.N_CURRENT_NUM == 0)
+ .OrderBy(l => new { l.N_LAYER }).First();
if (endLoc == null) {
info = $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紝闇�婊¤冻锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲�0";
@@ -729,11 +736,14 @@
TN_Location endLoc = null;
if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
endAreas = taskInfo.EndAreas_Pallet;
- endLoc = LocationHelper.GetLocQuery(db, 0, endAreas).First();
+ endLoc = db.Queryable<TN_Location>()
+ .Where(l => startAreas.Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.N_CURRENT_NUM == 0).First();
}
else if (locCntrRel.S_CNTR_TYPE == "濂借繍绠�) {
endAreas = taskInfo.EndAreas_Goodpack;
- endLoc = LocationHelper.GetLocQuery(db, 0, endAreas).First();
+ endLoc = db.Queryable<TN_Location>().Where(l => startAreas.Contains(l.S_AREA_CODE)).Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y").Where(l => l.N_CURRENT_NUM == 0).First();
}
else {
return NewSimpleResult(-1, $"鎵樼洏绫诲瀷{locCntrRel.S_CNTR_TYPE}涓嶅悎娉曪細鎵樼洏鍙穥locCntrRel.S_CNTR_CODE}");
--
Gitblit v1.9.1