From 9fa293298c53429e8ac5148de8328933c0a80ff4 Mon Sep 17 00:00:00 2001 From: kazelee <1847801760@qq.com> Date: 星期三, 11 六月 2025 17:26:04 +0800 Subject: [PATCH] 更新容器必须检查前台是否维护的功能 --- wms/WCSHelper.cs | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/wms/WCSHelper.cs b/wms/WCSHelper.cs index dddbe4a..ee619d8 100644 --- a/wms/WCSHelper.cs +++ b/wms/WCSHelper.cs @@ -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; @@ -167,7 +168,7 @@ 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; -- Gitblit v1.9.1