From f978872b6de4e7e20d992a2ee7cda902c11347b9 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 30 六月 2025 15:31:56 +0800
Subject: [PATCH] 优化配置文件读取逻辑，将ERP反馈接口写入配置文件中配置
---
wms/WCSHelper.cs | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/wms/WCSHelper.cs b/wms/WCSHelper.cs
index dddbe4a..5d2dde4 100644
--- a/wms/WCSHelper.cs
+++ b/wms/WCSHelper.cs
@@ -29,7 +29,7 @@
var db = new SqlHelper<TN_Task>().GetInstance();
task.S_B_STATE = TN_Task.GetStateStr(task.N_B_STATE);
task.T_MODIFY = DateTime.Now;
- db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_MODIFY }).ExecuteCommand();
+ res = db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_MODIFY }).ExecuteCommand() > 0;
return res;
}
internal static bool UpdateEQNo(TN_Task task) {
@@ -55,7 +55,7 @@
S_END_LOC = endLoc.S_CODE,
S_TYPE = type,
N_PRIORITY = 3, // 鍒濆浼樺厛绾ч粯璁や负锛�
- N_SCHEDULE_TYPE = 3, // 鍥借嚜
+ N_SCHEDULE_TYPE = 1, // NDC
N_B_STATE = 0,
S_CNTR_CODE = cntId,
};
@@ -63,20 +63,21 @@
return TN_Task;
}
- public static TN_Task BuildTask(TN_Loc_Container locCntrRel, TN_Location endLoc, string cntId, string type) {
- var fromLoc = LocationHelper.GetLocation(locCntrRel.S_LOC_CODE);
-
+ public static TN_Task BuildTask(TN_Location startLoc, TN_Location endLoc, string cntId, string type, string op_no, string erp_no = "") {
TN_Task TN_Task = new TN_Task() {
S_CODE = GenerateTaskNo(),
- S_START_AREA = fromLoc.S_AREA_CODE,
+ S_START_AREA = startLoc.S_AREA_CODE,
S_END_AREA = endLoc.S_AREA_CODE,
- S_START_LOC = fromLoc.S_CODE,
+ S_START_LOC = startLoc.S_CODE,
S_END_LOC = endLoc.S_CODE,
S_TYPE = type,
N_PRIORITY = 3, // 鍒濆浼樺厛绾ч粯璁や负锛�
- N_SCHEDULE_TYPE = 3, // 鍥借嚜
+ N_SCHEDULE_TYPE = 1, // NDC
N_B_STATE = 0,
S_CNTR_CODE = cntId,
+ S_OP_CODE = op_no,
+ S_BS_NO = erp_no,
+ S_BS_TYPE = erp_no == "" ? "" : "ERP",
};
return TN_Task;
@@ -85,7 +86,6 @@
/// <summary>
/// 鍒涘缓鎼�浠诲姟
/// </summary>
- /// <param name="no">缂栧彿</param>
/// <param name="from">璧风偣</param>
/// <param name="to">缁堢偣</param>
/// <param name="taskType">浠诲姟绫诲瀷</param>
@@ -167,14 +167,13 @@
internal static void Begin(TN_Task task, string forklift_no) {
var db = new SqlHelper<TN_Task>().GetInstance();
if (task != null) {
- if (task.N_B_STATE == 1) {
+ if (task.N_B_STATE == 1 || task.N_B_STATE == 0) { // 娣诲姞褰搕ask鐘舵�涓�鏃朵篃鍙互瑙﹀彂
task.N_B_STATE = 2;
task.S_B_STATE = TN_Task.GetStateStr(task.N_B_STATE);
task.T_START_TIME = System.DateTime.Now;
task.S_EQ_NO = forklift_no;
db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_START_TIME, it.S_EQ_NO }).ExecuteCommand();
}
-
}
}
internal static void End(TN_Task task) {
--
Gitblit v1.9.1