From 0f28e17542954766ca2b01c9bc3d79e785458795 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@SK-20210819HUAO>
Date: Mon, 17 Jan 2022 11:48:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/WMS/WMSHQFKanbanAppService.cs                  | 2 +-
 .../Entities/WMS/WMSHQHKanbanAppService.cs                  | 2 +-
 .../Entities/WMS/WMSKanbanAppService.cs                     | 6 +++---
 .../Entities/WMS/WmsHQMKanbanAppService.cs                  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs
index a55b12ef..89cfa36e 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs
@@ -429,7 +429,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             {
                 WmsHQFKanbanOutPutDetial _detail = new WmsHQFKanbanOutPutDetial(
                 GuidGenerator.Create(),
-                itm.WmsBillNum,
+                !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty,
                 itm.Kanban,
                 itm.MaterialCode,
                 itm.MaterialDesc,
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs
index 199efdf8..d5e6ed92 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs
@@ -430,7 +430,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             {
                 WmsHQHKanbanOutPutDetial _detail = new WmsHQHKanbanOutPutDetial(
                 GuidGenerator.Create(),
-                itm.WmsBillNum,
+                !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty,
                 itm.Kanban,
                 itm.MaterialCode,
                 itm.MaterialDesc,
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
index 9d4a5087..60c48474 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
@@ -55,7 +55,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
     /// 大众看板-出库
     /// </summary>
 
-    //[AllowAnonymous]
+
     [Route("api/settleaccount/wmskanbanoutput")]
     [Authorize(SettleAccountPermissions.WMSJIT.Default)]
     public class WMSKanbanAppService :
@@ -486,7 +486,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             {
                 WmsKanbanOutPutDetial _detail = new WmsKanbanOutPutDetial(
                 GuidGenerator.Create(),
-                itm.WmsBillNum,
+                !string.IsNullOrEmpty(itm.WmsBillNum)? itm.WmsBillNum:string.Empty,
                 itm.Kanban,
     
                 itm.MaterialCode,
@@ -498,7 +498,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty,
                !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
                 version,
-                itm.ParentMaterialCode,
+                itm.MaterialCode,
                 itm.BillNum,
                 GuidGenerator.Create()
                 , string.Empty
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs
index 57cfbc4d..29f23a59 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs
@@ -348,7 +348,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             {
                 WmsHQMKanbanOutPutDetial _detail = new WmsHQMKanbanOutPutDetial(
                 GuidGenerator.Create(),
-                itm.WmsBillNum,
+                !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty,
                 itm.Kanban,
                 itm.MaterialCode,
                 itm.MaterialDesc,
@@ -359,7 +359,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty,
                !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
                 version,
-                itm.ParentMaterialCode,
+                itm.MaterialCode,
                 itm.BillNum,
                 GuidGenerator.Create()
                 , string.Empty