From 1e29c520440adc28292d87a000c11e6898bda1ac Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 30 十月 2025 13:29:33 +0800
Subject: [PATCH] 物料标签增加补打标签和合并标签功能

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

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 4653959..b056793 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -1871,13 +1871,14 @@
                     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.IsDel == "0").ToList();
+                var locatList = Db.Queryable<SysStorageLocat>().Where(m => m.WareHouseNo == "W04" && 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