From 13b0b92e981330f3c0dfaf351c203045f90bdb93 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 08 十月 2025 08:16:14 +0800
Subject: [PATCH] 修改四向车库移库分配库位逻辑

---
 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 57dbec8..4653959 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -1148,9 +1148,15 @@
                     throw Oops.Bah("鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
                 }
                 //鐩爣鍌ㄤ綅淇℃伅
-                //var storageLocatEnd = new SysStorageLocat();
-
-                var storageLocatEnd = await Db.Queryable<SysStorageLocat>().FirstAsync(w => w.IsDel == "0" && w.LocatNo == EndLocat && w.Flag == "0" && w.WareHouseNo == "W04" && w.AreaNo == areaNo);
+                var storageLocatEnd = new SysStorageLocat();
+                if (!string.IsNullOrEmpty(areaNo))
+                {
+                    storageLocatEnd = await Db.Queryable<SysStorageLocat>().FirstAsync(w => w.IsDel == "0" && w.LocatNo == EndLocat && w.Flag == "0" && w.WareHouseNo == "W04" && w.AreaNo == areaNo);
+                }
+                else
+                {
+                    storageLocatEnd = await Db.Queryable<SysStorageLocat>().FirstAsync(w => w.IsDel == "0" && w.LocatNo == EndLocat && w.Flag == "0" && w.WareHouseNo == "W04");
+                }
                 if (storageLocatEnd == null)
                 {
                     throw Oops.Bah("鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");

--
Gitblit v1.8.0