From 9335b068994ded46e7844d81967a12eb652f77ef Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 04 十一月 2025 08:05:56 +0800
Subject: [PATCH] 处理出库作业手动分配无法输入小数问题

---
 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 57dbec8..c0ec622 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("鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
@@ -1865,7 +1871,7 @@
                     throw new Exception("搴撳瓨鎵樼洏娌℃湁淇℃伅");
                 }
                 var locate = stockDetail.First().LocatNo;
-                var locatList = Db.Queryable<SysStorageLocat>().Where(m=>m.WareHouseNo == "W04" && (m.AreaNo == "B06" || m.AreaNo == "B07" || m.AreaNo == "B09") && m.IsDel == "0").ToList();
+                var locatList = Db.Queryable<SysStorageLocat>().Where(m=>m.WareHouseNo == "W04" && (m.AreaNo == "B06" || m.AreaNo == "B07" || m.AreaNo == "B09" || m.AreaNo == "B24") && m.IsDel == "0").ToList();
                 var locat = locatList.FirstOrDefault(m => m.LocatNo == locate);
                 //鍒ゆ柇鎵樼洏鍌ㄤ綅鏄惁鍦ㄨ溅闂�
                 if (locat == null)

--
Gitblit v1.8.0