From e9fa2cd033cc5399a4a23601f8155a8cd2079aab Mon Sep 17 00:00:00 2001
From: test <15284381150@163.com>
Date: 星期日, 21 九月 2025 11:06:29 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS
---
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 53d66e2..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"))
--
Gitblit v1.8.0