From 0b679c8b18e2b598ff27cff2fa9ade2c46bde3be Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 16 六月 2025 17:30:32 +0800
Subject: [PATCH] 优化AGV调试和出库逻辑，完成部分ERP反馈代码
---
api/ApiHelper.cs | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index fabea4d..0279650 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -218,6 +218,8 @@
S_CNTR_TYPE = cntrType, // 绌烘墭鍏ュ簱
};
+ startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�+
var endLoc = db.Queryable<TN_Location>()
.Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
@@ -275,7 +277,8 @@
it.N_LOCK_STATE,
it.S_LOCK_STATE,
it.S_LOCK_OP,
- it.T_MODIFY
+ it.T_MODIFY,
+ it.N_CURRENT_NUM
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
@@ -386,6 +389,8 @@
S_CNTR_TYPE = cntrType,
};
+ startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�+
var endLoc = db.Queryable<TN_Location>()
.Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
@@ -445,7 +450,8 @@
it.N_LOCK_STATE,
it.S_LOCK_STATE,
it.S_LOCK_OP,
- it.T_MODIFY
+ it.T_MODIFY,
+ it.N_CURRENT_NUM
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
@@ -1509,8 +1515,7 @@
S_ITEM_CODE = model.cpdm,
S_BATCH = model.ph,
N_END_NUM = (int)model.pzsl,
- //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
- S_END_AREA = model.ysfs == "姹借溅" ? "QCCKQ" : "HCCKQ", // 鏆傛椂鐢ㄨ繍杈撴柟寮忥紙鐏溅/姹借溅锛夋潵鍖哄垎缁堢偣璐у尯
+ S_END_AREA = "QCCKQ", // ERP涓嬪彂鍑哄簱浠诲姟涓烘苯杞﹀嚭搴撳尯
S_BS_NO = model.jhdh,
S_BS_TYPE = "ERP",
};
--
Gitblit v1.9.1