From 201f679225383f21d6fcce0d60d17a1b9c4cd36f Mon Sep 17 00:00:00 2001
From: Admin <Admin@ADMIN>
Date: 星期六, 24 一月 2026 09:49:51 +0800
Subject: [PATCH] 优化巷道逻辑

---
 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
index 2398b4d..db6c92d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
@@ -163,7 +163,7 @@
         public string AccessingTunnel(int WarehouseId, int LocationType)
         {
             List<Dt_LocationInfo> locationData = BaseDal.QueryData(x => x.WarehouseId == WarehouseId);
-            var roadwayGroups = locationData.Where(x => x.LocationType == LocationType && x.EnableStatus== (int)EnableStatusEnum.Normal).GroupBy(x => x.RoadwayNo)
+            var roadwayGroups = locationData.Where(x => x.LocationType == LocationType && x.LocationStatus== (int)LocationStatusEnum.Free && x.EnableStatus== (int)EnableStatusEnum.Normal).GroupBy(x => x.RoadwayNo)
             .Select(g => new
             {
                 RoadwayNo = g.Key,
@@ -197,6 +197,11 @@
         public Dt_LocationInfo? ShallowGetLocation(string roadway, int Locationtype,int row ,int Layer, int Column)
         {
             return BaseDal.QueryData(x => x.RoadwayNo == roadway && x.LocationType == Locationtype && x.Row==row && x.Layer== Layer && x.Column== Column).FirstOrDefault();
+        }
+
+        public Dt_LocationInfo? FindStorageLocation(string LocationCode)
+        {
+            return BaseDal.QueryData(x => x.LocationCode == LocationCode).FirstOrDefault();
         }
 
 
@@ -267,7 +272,7 @@
             }
         }
 
-        private int judgmentRow(string RoadwayNo, int locrow)
+        public int judgmentRow(string RoadwayNo, int locrow)
         {
             if (RoadwayNo == "1" || RoadwayNo == "3")
             {

--
Gitblit v1.9.3