From edc7293bf81729ebaa2d7cdd9a1f3aeaf567f538 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 31 十二月 2025 17:32:08 +0800
Subject: [PATCH] 更新

---
 项目代码/WMS/WMSServices/WIDESEA_BasicService/Service/LocationInfoService_Common.cs |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Service/LocationInfoService_Common.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Service/LocationInfoService_Common.cs"
index 408d4bf..54175ab 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Service/LocationInfoService_Common.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Service/LocationInfoService_Common.cs"
@@ -125,7 +125,7 @@
                         }
                         //鏌ヨ绌鸿揣浣嶄俊鎭苟鎺掗櫎5鍒嗛挓鍐呭垎閰嶇殑璐т綅,鏍规嵁灞傘�佸垪銆佹繁搴︺�佽鎺掑簭
                         List<Dt_LocationInfo> locationInfosMedium = BaseDal.QueryData(x => x.LocationType == LocationTypeEnum.MediumPallet.ObjToInt() && x.RoadwayNo == roadwayNo && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus != EnableStatusEnum.Disable.ObjToInt() && !lockLocations.Contains(x.LocationCode), orderBy);
-                        Dt_LocationInfo locationInfo = new Dt_LocationInfo();
+                        Dt_LocationInfo? locationInfo = null;
                         foreach (var item in locationInfosMedium)
                         {
                             if (LayerLimit && (item.Layer == 7 || item.Layer == 8))
@@ -133,6 +133,11 @@
                                 locationInfo = item;
                                 break;
                             }
+                            if (!LayerLimit && item.Columns<=6 && item.Layer != 7 && item.Layer != 8)
+                            {
+                                locationInfo = item;
+                                break;
+                            }
                             //鑾峰彇鏇存敼搴撲綅
                             Dt_LocationInfo? nearLocation1;
                             Dt_LocationInfo? nearLocation2;

--
Gitblit v1.9.3