From b506c4535c62c4c5fd7c5b5c0bd7bb8b03390dbd Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 05 三月 2024 10:10:34 +0800
Subject: [PATCH] Merge branch 'master' into wxw

---
 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 3624c4d..286a2f8 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -361,6 +361,9 @@
                     case "6"://浠e偍鍑哄簱
                         skuType = "(2)";
                         break;
+                    case "8"://瀵勫瓨鍑哄簱
+                        skuType = "(3)";
+                        break;
                     default: //鍏跺畠鍑哄簱
                         skuType = "(0,1,2,3,4)";
                         break;
@@ -2609,6 +2612,7 @@
                     LocatNo = a.LocatNo,
                     RoadwayNo = a.RoadwayNo,
                     PalletNo = a.PalletNo,
+                    Demo = a.Demo,
                 }).ToList();
 
                 return list;

--
Gitblit v1.8.0