From a93b0e99036c24b9bd58c79bf5e7364b1ba28bae Mon Sep 17 00:00:00 2001
From: 杨前锦 <1010338399@qq.com>
Date: 星期二, 01 七月 2025 16:02:33 +0800
Subject: [PATCH] 福建佳通-流程优化

---
 HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/wms/WCSHelper.cs |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/wms/WCSHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/wms/WCSHelper.cs
index b321ef3..66b1684 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/wms/WCSHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/wms/WCSHelper.cs
@@ -30,6 +30,15 @@
             db.Updateable(task).UpdateColumns(it => new {it.N_B_STATE, it.S_B_STATE,it.T_MODIFY ,it.S_EQ_NO }).ExecuteCommand();
             return res;
         }
+
+        public static bool updateTaskEnd(WCSTask task) 
+        {
+            var res = false;
+            var db = new SqlHelper<WCSTask>().GetInstance();
+            res = db.Updateable(task).UpdateColumns(it => new { it.S_END_LOC, it.S_END_AREA, it.T_MODIFY}).ExecuteCommand() > 0;
+            return res;
+        }
+
         internal static bool UpdateInfo(WCSTask task, string sourceNo, string endBit, string status) {
             var res = false;
             var db = new SqlHelper<WCSTask>().GetInstance();
@@ -54,6 +63,11 @@
             var db = new SqlHelper<WCSTask>().GetInstance();
             var task = db.Queryable<WCSTask>().Where(a => a.S_EQ_NO == eqNo).OrderByDescending(a => a.T_CREATE).First();
             return task;
+        }
+        internal static List<WCSTask> GetTaskListByEqNo(string eqNo)
+        {
+            var db = new SqlHelper<WCSTask>().GetInstance();
+            return db.Queryable<WCSTask>().Where(a => a.S_EQ_NO == eqNo).OrderByDescending(a => a.T_CREATE).ToList();
         }
 
         internal static List<WCSTask> GetTaskByStart(string bit) {
@@ -95,9 +109,6 @@
                 N_SCHEDULE_TYPE=1,
                 S_B_STATE = "绛夊緟",
                 S_CNTR_CODE = cntrInfo,
-                N_START_LAYER = startLayer,
-                N_END_LAYER = endLayer,
-                N_CNTR_COUNT = cntrCount
 
             };
 
@@ -169,12 +180,16 @@
             if (task != null)
             {
                 task.N_B_STATE = 4;
-                if (WCSHelper.CheckActionRecordExist(task.S_CODE, 4))
+                WCSHelper.UpdateStatus(task, "鍙栨秷");
+
+                var mst = WMSHelper.GetWmsTask(task.S_OP_CODE);
+                if (mst != null) 
                 {
-                    WCSHelper.UpdateStatus(task, "寮哄埗瀹屾垚");
-                }
-                else {
-                    WCSHelper.UpdateStatus(task, "鍙栨秷");
+                    LocationHelper.UnLockLoc(mst.S_END_LOC);
+
+                    mst.N_B_STATE = 3;
+                    mst.S_B_STATE = "鍙栨秷";
+                    WMSHelper.UpdateTaskState(mst);
                 }
             } 
         }

--
Gitblit v1.9.1