From f80938e8a03d9343672b4fb3179836b019f6b9d8 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期六, 28 六月 2025 21:38:46 +0800
Subject: [PATCH] 0628

---
 wms/TaskHelper.cs |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/wms/TaskHelper.cs b/wms/TaskHelper.cs
index 05a3184..bf54db7 100644
--- a/wms/TaskHelper.cs
+++ b/wms/TaskHelper.cs
@@ -413,9 +413,9 @@
 
                 if (CreateTask(task1) && CreateTask(task2))
                 {
-                    LocationHelper.LockLoc(operation.S_START_LOC, "鍑哄簱閿�, 2);
-                    LocationHelper.LockLoc(operation.S_END_LOC, "鍏ュ簱閿�, 1);
-                    LocationHelper.LockLoc(operation.CONNECTION, "鍏朵粬閿�, 3);
+                    //LocationHelper.LockLoc(operation.S_START_LOC, "鍑哄簱閿�, 2);
+                    //LocationHelper.LockLoc(operation.S_END_LOC, "鍏ュ簱閿�, 1);
+                    //LocationHelper.LockLoc(operation.CONNECTION, "鍏朵粬閿�, 3);
                     LogHelper.Info($"浠诲姟{task1.S_CODE},{task2.S_CODE}鍒涘缓鎴愬姛", "浠诲姟");
                     var db = new SqlHelper<object>().GetInstance();
                     db.Updateable(operation).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE }).ExecuteCommand();
@@ -440,7 +440,7 @@
 
             var count = LocationHelper.GetConnectionTaskCount(operation.CONNECTION);
             LogHelper.Info($"CreateOneTask 浣滀笟:{operation.S_CODE},鎺ラ┏浣�{operation.CONNECTION}锛屼换鍔℃暟閲忥細{count}", "浠诲姟");
-            if (count<4)
+            if (count<=2)
             {
 
                 // 浠诲姟1
@@ -525,9 +525,9 @@
 
                     if (CreateTask(task1) && CreateTask(task2))
                     {
-                        LocationHelper.LockLoc(operation.S_START_LOC, "鍑哄簱閿�, 2);
-                        LocationHelper.LockLoc(operation.S_END_LOC, "鍏ュ簱閿�, 1);
-                        LocationHelper.LockLoc(operation.CONNECTION, "鍏ュ簱閿�, 1);
+                        //LocationHelper.LockLoc(operation.S_START_LOC, "鍑哄簱閿�, 2);
+                        //LocationHelper.LockLoc(operation.S_END_LOC, "鍏ュ簱閿�, 1);
+                        //LocationHelper.LockLoc(operation.CONNECTION, "鍏ュ簱閿�, 1);
                         LogHelper.Info($"浠诲姟{task1.S_CODE},{task2.S_CODE}鍒涘缓鎴愬姛", "浠诲姟");
                         var db = new SqlHelper<object>().GetInstance();
                         db.Updateable(operation).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE }).ExecuteCommand();
@@ -999,6 +999,19 @@
 
             return db.Queryable<InPri>().Where(a=>a.Enable=="Y") .ToList();
         }
+        /// <summary>
+        /// 鑾峰彇鍑哄簱鎻愰珮浼樺厛绾ц〃
+        /// </summary>
+        /// <returns></returns>
+        internal static OutMinutePriority GetOutMinutePriority()
+        {
+
+            var db = new SqlHelper<object>().GetInstance();
+
+            return db.Queryable<OutMinutePriority>().Where(a => a.Enable == "Y").First();
+        }
+
+        
 
 
         /// <summary>

--
Gitblit v1.9.1