From 54d812d9a307f3db88a51a17573b80f54c85c6cd Mon Sep 17 00:00:00 2001 From: kazelee <1847801760@qq.com> Date: 星期五, 20 六月 2025 17:25:21 +0800 Subject: [PATCH] 针对NDCAGV的Request请求授权,添加报文检验功能备用 --- wms/WCSHelper.cs | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/wms/WCSHelper.cs b/wms/WCSHelper.cs index bef1956..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) { @@ -63,7 +63,7 @@ return TN_Task; } - public static TN_Task BuildErpTask(TN_Location startLoc, TN_Location endLoc, string cntId, string type, string erpNo) { + 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 = startLoc.S_AREA_CODE, @@ -75,8 +75,9 @@ N_SCHEDULE_TYPE = 1, // NDC N_B_STATE = 0, S_CNTR_CODE = cntId, - S_BS_NO = erpNo, - S_BS_TYPE = "ERP", + 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