From 32e054f4769fbd20cd9608b4a1b397be1ec8bb33 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期日, 21 九月 2025 11:05:03 +0800
Subject: [PATCH] 开发PDA成品拣货功能

---
 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs |   33 +++++++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 139e9d3..6b66674 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -948,6 +948,7 @@
                     WaveNo = a.WaveNo,
                     IsDespatch = a.IsDespatch,
                     Demo = a.Demo,
+                    OrderCode = a.OrderCode,
 
                     CreateUserName = c.RealName,
                     UpdateUserName = c.RealName,
@@ -1067,10 +1068,10 @@
                         inspectStatus = "0,1";
                         break;
                     case "9"://鐢熶骇棰嗘枡鍑哄簱
-                        if (house != "W02")
-                        {
-                            throw new Exception("鐢熶骇棰嗘枡鍑哄簱鍙兘閫夋嫨鍘熸枡搴�");
-                        }
+                        //if (house != "W02")
+                        //{
+                        //    throw new Exception("鐢熶骇棰嗘枡鍑哄簱鍙兘閫夋嫨鍘熸枡搴�");
+                        //}
                         skuType = "(0,1,3)";
                         inspectStatus = "1";
                         break;
@@ -1187,10 +1188,10 @@
                 switch (model.WareHouseNo)
                 {
                     case "W01"://鎴愬搧搴�
-                        if (skuList.Any(m => m.Type != "2"))
-                        {
-                            throw new Exception("浠撳簱涓庡嚭搴撶墿鏂欎笉绗�");
-                        }
+                        //if (skuList.Any(m => m.Type != "2"))
+                        //{
+                        //    throw new Exception("浠撳簱涓庡嚭搴撶墿鏂欎笉绗�");
+                        //}
                         break;
                     case "W02"://鍘熸枡搴�
                         if (skuList.Any(m => m.Type == "2"))
@@ -3338,6 +3339,22 @@
                 throw new Exception(e.Message);
             }
         }
+        public string GetHouseByPalletNo(string palletNo)
+        {
+            try
+            {
+                var datail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
+                if (datail == null)
+                {
+                    throw new Exception("鏈煡璇㈠埌鎵樼洏淇℃伅");
+                }
+                return datail.WareHouseNo;
+            }
+            catch (Exception e)
+            {
+                throw new Exception(e.Message);
+            }
+        }
 
         public List<OutCommandDto> IssueOutHouseLk(string soNo, string outMode, int userId, string url, out string str)
         {

--
Gitblit v1.8.0