From b478031d19c13092dc5f86e6d4f7fc114ea9a85d Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 11 三月 2024 13:28:29 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 913650b..0229a82 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -372,7 +372,7 @@
break;
case "5"://涓棿鍝佸嚭搴�
skuType = "(4)";
- inspectStatus = "0";
+ inspectStatus = "0,1";
break;
case "6"://浠ｅ偍鍑哄簱
skuType = "(0,1,2,3)";
@@ -2584,7 +2584,11 @@
{
stockDetail = stockDetail.Where(m => m.InspectStatus == "1").ToList();
}
- else if (notice.Type == "3" || notice.Type == "5" || notice.Type == "6" || notice.Type == "7" || notice.Type == "8")//鍙栨牱鍑哄簱
+ else if (notice.Type == "3" )//鍙栨牱鍑哄簱
+ {
+ stockDetail = stockDetail.Where(m => m.InspectStatus == "0").ToList();
+ }
+ else if (notice.Type == "5" || notice.Type == "6" || notice.Type == "7" || notice.Type == "8")
{
stockDetail = stockDetail.Where(m => m.InspectStatus == "0" || m.InspectStatus == "1").ToList();
}
--
Gitblit v1.8.0