From 5ea48455463691678b806badbee198699a878b5a Mon Sep 17 00:00:00 2001
From: HuBingJie <3146306518@qq.com>
Date: 星期四, 25 十二月 2025 18:38:58 +0800
Subject: [PATCH] 1

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

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
index cc5eca5..e01e57f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
@@ -137,7 +137,7 @@
                                 LocationType = LocationTypeEnum.Undefined.ObjToInt(),
                                 RoadwayNo = $"{initializationLocationDTO.Roadway.ToString()}",
                                 Row = i + 1,
-                                Depth = depth,
+                                Depth = 1,
                             };
                             locationInfo.LocationCode = $"{locationInfo.RoadwayNo}-{locationInfo.Row.ToString().PadLeft(3, '0')}-{locationInfo.Column.ToString().PadLeft(3, '0')}-{locationInfo.Layer.ToString().PadLeft(3, '0')}-{locationInfo.Depth.ToString().PadLeft(2, '0')}";
                             locationInfo.LocationName = $"{locationInfo.RoadwayNo}宸烽亾{locationInfo.Row.ToString().PadLeft(3, '0')}琛寋locationInfo.Column.ToString().PadLeft(3, '0')}鍒梴locationInfo.Layer.ToString().PadLeft(3, '0')}灞倇locationInfo.Depth.ToString().PadLeft(2, '0')}娣�";
@@ -453,6 +453,30 @@
             return groupLocations;
         }
 
+        public Dt_LocationInfo? GetLocationInfoSC(string v)
+        {
+            //Dt_LocationInfo dt_Location = BaseDal.QueryFirst(x => x.LocationStatus == (int)LocationStatusEnum.Free&& x.RoadwayNo == v &&x.EnableStatus == (int)EnableStatusEnum.Normal);
+            Dt_LocationInfo dt_LocationInfo = BaseDal.Db.Queryable<Dt_LocationInfo>()
+                .Where(x => x.LocationStatus == (int)LocationStatusEnum.Free
+                    && x.RoadwayNo == v
+                    && x.EnableStatus == (int)EnableStatusEnum.Normal)
+                .OrderBy("Layer DESC, CASE WHEN Row = 1 THEN 1 WHEN Row = 4 THEN 2 WHEN Row = 2 THEN 3 ELSE 4 END ASC")
+                .First();
+
+            return dt_LocationInfo;
+        }
+
+        public Dt_LocationInfo? GetLocationInfoSC2(string v)
+        {
+            Dt_LocationInfo dt_LocationInfo = Db.Queryable<Dt_LocationInfo>()
+                 .Where(x => x.LocationStatus == (int)LocationStatusEnum.Free
+                     && x.RoadwayNo == v
+                     && x.EnableStatus == (int)EnableStatusEnum.Normal)
+                 .OrderBy("Layer DESC")
+                 .First();// Layer浠庡ぇ鍒板皬鎺掑簭
+
+            return dt_LocationInfo;
+        }
 
         public class LocationCache
         {

--
Gitblit v1.9.3