From 663ffc09a8fc33eb7d2346e6ed10c08679f0006c Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期一, 16 六月 2025 17:25:10 +0800
Subject: [PATCH] 新增任务推送限制

---
 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs
index fc40140..906b09a 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs
@@ -27,12 +27,11 @@
                 {
                     if (model.state <= 7)
                     {
-
                         //鏈変换鍔″彿璇锋眰
                         switch (model.state)
                         {
                             case 1:
-                                WCSHelper.Begin(TN_Task);
+                                WCSHelper.Begin(TN_Task, model.forklift_no);
                                 break;
                             #region MyRegion
                             case 3:
@@ -47,7 +46,11 @@
                                 break;
                             case 6:
                                 WCSHelper.UpdateStatus(TN_Task, "鍗歌揣瀹屾垚");
-                                if (TN_Task.S_NOTE != "鍏ュ簱")
+                                if (!string.IsNullOrEmpty(TN_Task.S_NOTE) && (TN_Task.S_NOTE.Trim() == "鍏ュ簱" || TN_Task.S_NOTE.Trim() == "绌烘墭鍥炲簱"))
+                                {
+                                    LocationHelper.UnlockLoc(TN_Task.S_END_LOC);
+                                }
+                                else
                                 {
                                     TaskProcess.OperateStatus(TN_Task, 6);
                                 }
@@ -159,6 +162,13 @@
                     }
                     else
                     {
+                        var db = new SqlHelper<TaskAction>().GetInstance();
+                        var taskAction = db.Queryable<TaskAction>().Where(a => a.S_TASK_CODE == model.task_no && a.N_ACTION_CODE == model.state).First();
+                        if (taskAction == null) 
+                        {
+                            WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);
+                        }
+
                         //瀹夊叏璇锋眰绛�                         string url = "";
                         if (TN_Task.Z_TYPE == 1)

--
Gitblit v1.9.1