From 89943f29476e3de04c638cc7aefbdf2dd24d00c7 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期四, 17 七月 2025 17:31:18 +0800
Subject: [PATCH] 出库、绑定修改

---
 wms/LocationHelper.cs |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index cd09b3f..ab8777d 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -115,7 +115,12 @@
             List<string> result = new List<string>();
             foreach (var item in ConnectionList)
             {
-                result.Add(item.S_CODE);
+                var ConnectionY = db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE && s.C_ENABLE == "Y" && s.CONNEC_ROADWAY== item.CONNEC_ROADWAY).First();
+                if (ConnectionY==null)
+                {
+                    result.Add(item.S_CODE);
+                }
+               
             }
             return result;
         }
@@ -148,6 +153,17 @@
                 result.Add(re);
             }
             return result.OrderBy(a => a.taskCount).ToList();
+        }
+
+        /// <summary>
+        /// 杩斿洖鍑哄簱agv浠诲姟
+        /// </summary>
+        internal static WMSTask GetConnectionTask(string jbLoc,string type)
+        {
+            var db = new SqlHelper<object>().GetInstance();
+            
+          return db.Queryable<WMSTask>().Where(a => ( a.S_START_LOC.Contains(jbLoc)&& a.S_SCHEDULE_TYPE.Contains(type)  && a.S_B_STATE != "瀹屾垚" && a.S_B_STATE != "鍙栨秷" && a.S_B_STATE != "澶辫触" && a.S_B_STATE != "宸插畬鎴� && a.S_B_STATE != "鏈墽琛�)).OrderBy(b=>b.T_CREATE).First();
+        
         }
 
         /// <summary>
@@ -1247,6 +1263,9 @@
 
                 var balanceConnectionList = LocationHelper.GetConnectionListByst(connectionList);
 
+
+                
+
                 
 
                 LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟鎺掗櫎涓嶅彲鐢ㄥ贩閬撳紑濮�, "Mes浠诲姟涓嬪彂");

--
Gitblit v1.9.1