From 382c009ba2bb04374468e9584f262d6682841d9b Mon Sep 17 00:00:00 2001 From: pengmn <pmn@HanInfo> Date: 星期三, 28 五月 2025 18:09:41 +0800 Subject: [PATCH] 杭氧测试流程 --- HH.WCS.Mobox3.HangYang/wms/WCSHelper.cs | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/HH.WCS.Mobox3.HangYang/wms/WCSHelper.cs b/HH.WCS.Mobox3.HangYang/wms/WCSHelper.cs index c909a2e..4d2250f 100644 --- a/HH.WCS.Mobox3.HangYang/wms/WCSHelper.cs +++ b/HH.WCS.Mobox3.HangYang/wms/WCSHelper.cs @@ -16,7 +16,7 @@ var date = DateTime.Now.ToString("yyMMdd"); return $"TN{date}{id.ToString().PadLeft(4, '0')}"; } - + internal static bool UpdateStatus(WCSTask task, string status) { var res = false; @@ -24,7 +24,7 @@ var lcrList = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE.Trim() == task.S_CNTR_CODE).First(); task.S_B_STATE = status; task.S_NOTE = lcrList == null ? task.S_NOTE : lcrList.S_ACTION_SRC; - db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE,it.S_NOTE }).ExecuteCommand(); + db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE, it.S_NOTE }).ExecuteCommand(); return res; } internal static bool UpdateStatus(WCSTask task) @@ -61,7 +61,7 @@ return task; } - + internal static List<WCSTask> GetTaskBycntrcode(string no) { var db = new SqlHelper<WCSTask>().GetInstance(); @@ -93,6 +93,7 @@ } internal static bool CreateTask(string no, string from, string to, string taskType, int pri, string cntrInfo, int cntrCount = 1, int startLayer = 1, int endLayer = 1) { + var whCode = Settings.WHCode; var fromLoc = LocationHelper.GetLocation(from); var endLoc = LocationHelper.GetLocation(to); WCSTask TN_Task = new WCSTask() @@ -111,8 +112,9 @@ S_CNTR_CODE = cntrInfo, N_START_LAYER = startLayer, N_END_LAYER = endLayer, - N_CNTR_COUNT = cntrCount - + N_CNTR_COUNT = cntrCount, + S_START_WH = whCode, + S_END_WH = whCode }; return CreateTask(TN_Task); @@ -181,14 +183,10 @@ var db = new SqlHelper<WCSTask>().GetInstance(); if (task != null) { - if (task.N_B_STATE == 1) - { - task.N_B_STATE = 2; - task.S_B_STATE = WCSTask.GetStateStr(task.N_B_STATE); - task.T_START_TIME = DateTime.Now; - db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_START_TIME }).ExecuteCommand(); - } - + task.N_B_STATE = 2; + task.S_B_STATE = WCSTask.GetStateStr(task.N_B_STATE); + task.T_START_TIME = DateTime.Now; + db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_START_TIME }).ExecuteCommand(); } } internal static void End(WCSTask task) @@ -236,11 +234,11 @@ internal static List<WCSTask> GetTaskListByState(string status) { var db = new SqlHelper<object>().GetInstance(); - return db.Queryable<WCSTask>().Where(a => a.S_B_STATE.Trim() == status).OrderBy(s=>s.T_CREATE).ToList(); + return db.Queryable<WCSTask>().Where(a => a.S_B_STATE.Trim() == status).OrderBy(s => s.T_CREATE).ToList(); } - + internal static List<WCSTask> GetTaskListByState(int state) { @@ -253,6 +251,6 @@ return db.Queryable<WCSTask>().Where(a => a.N_B_STATE == 0).ToList(); } - + } } -- Gitblit v1.9.1