From a4c9640034563dc03ab422a6e7cea86efb761d40 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期日, 21 九月 2025 16:21:41 +0800
Subject: [PATCH] 修改入库单删除功能,SAP下发的单据也可删除

---
 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 5cdeeb8..c28c5bc 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,
@@ -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"))
@@ -1830,9 +1831,9 @@
                 {
                     throw new Exception("鏈煡璇㈠埌鍑哄簱鍗曟嵁淇℃伅");
                 }
-                if (notice.Origin != "WMS" || notice.Status != "0")
+                if (notice.Status != "0")//notice.Origin != "WMS" ||
                 {
-                    throw new Exception("鍙傛暟寮傚父,璇锋鏌ョ姸鎬佹槸鍚︽湭绛夊緟鎵ц鎴栨潵婧愭槸鍚︽槸WMS");
+                    throw new Exception("鍙傛暟寮傚父,璇锋鏌ョ姸鎬佹槸鍚︽湭绛夊緟鎵ц");
                 }
 
                 //鎬诲簱瀛樹俊鎭�

--
Gitblit v1.8.0