From a1795465c5b51eb53d83d9a874c7923c9f5bfa85 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 10 三月 2026 16:05:06 +0800
Subject: [PATCH] 优化WMS任务下发接口

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs"
index 58bc5ae..62c53d9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs"
@@ -40,10 +40,19 @@
         /// </summary>
         /// <param name="AreaCode"></param>
         /// <returns></returns>
-        public Dt_RGVLocationInfo GetInFreeLocationInfo(string AreaCode)
+        public Dt_RGVLocationInfo? GetInFreeLocationInfo(string AreaCode)
         {
-            Dt_RGVLocationInfo? rGVLocationInfo = BaseDal.QueryFirst(x => x.WarehouseId.ToString() == AreaCode && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.LocationStatus == LocationStatusEnum.Free.ObjToInt(), _emptyAssignOrderBy);
+            Dt_RGVLocationInfo? rGVLocationInfo = null;
+            List<Dt_RGVLocationInfo> rGVLocationInfos = BaseDal.QueryData(x => x.WarehouseId.ToString() == AreaCode && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.LocationStatus == LocationStatusEnum.Free.ObjToInt(), _emptyAssignOrderBy);
+            if (rGVLocationInfos == null || rGVLocationInfos.Count < 1) return rGVLocationInfo;
             #region 鍒ゆ柇宸烽亾鏄惁鏈夎揣
+            List<string> LocationCodes = new List<string>();
+            foreach (var item in rGVLocationInfos)
+            {
+                Dt_RGVLocationInfo dt_RGVLocationInfo = BaseDal.QueryFirst(x => x.RoadwayNo == item.RoadwayNo && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.Depth < item.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt(), _emptyAssignOrderBy);
+                if (dt_RGVLocationInfo == null) return dt_RGVLocationInfo;
+                dt_RGVLocationInfo = BaseDal.QueryFirst(x => x.RoadwayNo == item.RoadwayNo && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.Depth > item.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt(), _DepthAscOrderBy);
+            }
             if (rGVLocationInfo != null)
             {
                 List<string> NoRoadwayNos = new List<string>();

--
Gitblit v1.9.3