From 83a7b2db0150d30576461055707367e8189ebc6e Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期三, 25 六月 2025 17:29:08 +0800
Subject: [PATCH] 交互修改

---
 dispatch/WcsTask.cs |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/dispatch/WcsTask.cs b/dispatch/WcsTask.cs
index 5973110..311a48f 100644
--- a/dispatch/WcsTask.cs
+++ b/dispatch/WcsTask.cs
@@ -62,6 +62,13 @@
                 if (workFlow.INOROUT.Contains("鍑哄簱"))
                 {
                     Type = "2";
+                    var count = TaskHelper.GetConnectionTask(mst.S_END_LOC);
+                    if (count>=2)
+                    {
+                        return false;
+                    }
+
+
                 }
             }
 
@@ -574,10 +581,13 @@
         }
 
 
-        ///// <summary>
-        /// Wcs浠诲姟鎵ц閫氱煡
-        /// </summary>
-        internal static WcsWarningReurn WcsOperateTask(WcsOperateTaskParme model) {
+       
+
+
+            ///// <summary>
+            /// Wcs浠诲姟鎵ц閫氱煡
+            /// </summary>
+            internal static WcsWarningReurn WcsOperateTask(WcsOperateTaskParme model) {
             var result = new WcsWarningReurn();
             var newDb = new SqlHelper<object>().GetInstance();
 
@@ -674,7 +684,7 @@
                                     //鏌ユ壘缁堢偣
                                     var endList = LocationHelper.GetAllLocList1(workFlow.ERRORAREA);
 
-                                    var end = LocationHelper.FindEndcolByLocList(endList, workFlow.ERRORAREA,workFlow.ROADWAY);
+                                    var end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ERRORAREA,workFlow.ROADWAY);
                                     LogHelper.Info($"RFID鏍¢獙澶辫触涓嬪彂寮傚父缁堢偣淇℃伅" + JsonConvert.SerializeObject(end), "Wcs浠诲姟鎵ц閫氱煡");
 
 
@@ -695,8 +705,6 @@
                                         throw new Exception("淇敼浠诲姟琛ㄥけ璐�);
                                     }
                                     newDb.CommitTran();
-                                    //鏀瑰弬鏁伴�鐭ュ皬杞�-
                                 }
                             }
 

--
Gitblit v1.9.1