From 2416f77980c0fd145a743a79b4fa0ca3ca0b3118 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期一, 08 十二月 2025 16:32:44 +0800
Subject: [PATCH] CloseExportNotice少拣货也可以正常关单

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

diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index b68c63c..e5a8e05 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -1914,7 +1914,9 @@
                 {
                     throw new Exception("鏈煡璇㈠埌鍑哄簱鍗曟嵁淇℃伅");
                 }
-                if (notice.Status != "4")
+                //2025骞�12鏈�08鏃ュ彲鎴疯姹傚皯鎷h揣涔熷彲浠ユ甯稿叧鍗�
+                List<string> statusList = new List<string>() { "3", "4" };
+                if (!statusList.Contains(notice.Status))
                 {
                     throw new Exception("鍙傛暟寮傚父,璇锋鏌ョ姸鎬佹槸鍚︿负鎵ц瀹屾垚鎴栬鍗曞叧闂�");
                 }
@@ -2880,7 +2882,9 @@
                                 CreateUser = userId,
                                 CreateTime = DateTime.Now
                             };
-                            if (s.WareHouseNo == "W04")
+                            //2025骞�12鏈�08鏃ヨ揣鏋跺簱鍜屽钩搴擄紝鐩存帴寰呮嫞璐�
+                            List<string> wareHouseList = new List<string>() { "W02", "W04" };
+                            if (wareHouseList.Contains(s.WareHouseNo))
                             {
                                 allot.Status = "2";//寰呮嫞璐�
                                 xQty += allot.Qty;
@@ -3336,7 +3340,9 @@
                             CreateUser = userId,
                             CreateTime = DateTime.Now
                         };
-                        if (stock.WareHouseNo == "W04")
+                        //2025骞�12鏈�08鏃ヨ揣鏋跺簱鍜屽钩搴擄紝鐩存帴寰呮嫞璐�
+                        List<string> wareHouseList = new List<string>() { "W02", "W04" };
+                        if (wareHouseList.Contains(stock.WareHouseNo))
                         {
                             allot.Status = "2";//寰呮嫞璐�
                             xQty += allot.Qty;

--
Gitblit v1.8.0