From f6d9155a4a0cf27fd5732314b70109cbc090ccf8 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 04 十一月 2025 08:06:10 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

---
 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index b056793..c0ec622 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -1871,14 +1871,13 @@
                     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.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)
-                //{
-                //    throw new Exception("鍌ㄤ綅淇℃伅娌℃湁鍦ㄨ溅闂村伐浣嶄笂");
-                //}
+                if (locat == null)
+                {
+                    throw new Exception("鍌ㄤ綅淇℃伅娌℃湁鍦ㄨ溅闂村伐浣嶄笂");
+                }
                 locat.Status = "0";
                 Db.Updateable(locat).ExecuteCommand();
                 //鍒ゆ柇鎵樼洏淇℃伅

--
Gitblit v1.8.0