From 5dbd4a0d968f08738275922ad22b822dc758a30e Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 14 Jan 2022 17:00:44 +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 | 4 ++-- .../Entities/WMS/WMSHQFSharePartAppService .cs | 4 ++-- .../Entities/WMS/WMSHQHKanbanAppService.cs | 4 ++-- .../Entities/WMS/WMSHQHSharePartAppService.cs | 4 ++-- .../Entities/WMS/WMSJitAppService.cs | 4 ++-- .../Entities/WMS/WMSKanbanAppService.cs | 4 ++-- .../Entities/WMS/WMSSharePartAppService.cs | 3 ++- .../Entities/WMS/WmsHQCarAppService.cs | 8 ++++---- .../Entities/WMS/WmsHQMKanbanAppService.cs | 4 ++-- .../Entities/WMS/WmsHQMSharePartAppService.cs | 4 ++-- 10 files changed, 22 insertions(+), 21 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 de2941ef..c2e83e6b 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs @@ -437,8 +437,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts string.Empty, string.Empty, 0, - string.Empty, - string.Empty, + !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty, + !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty, version, itm.ParentMaterialCode, itm.BillNum, diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs index fa4293a5..8f188784 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs @@ -448,8 +448,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts string.Empty, string.Empty, 0, - string.Empty, - string.Empty, + !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty, + !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty, version, itm.ParentMaterialCode, itm.BillNum, 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 22e4e356..08dd0bb4 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs @@ -438,8 +438,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts string.Empty, string.Empty, 0, - string.Empty, - string.Empty, + !string.IsNullOrEmpty(itm.Extend1)?itm.Extend1: string.Empty, + !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty, version, itm.ParentMaterialCode, itm.BillNum, diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs index a31c9cce..e9c6e9bc 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs @@ -474,8 +474,8 @@ into temp1 string.Empty, string.Empty, 0, - string.Empty, - string.Empty, + !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty, + !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty, version, itm.MaterialCode, itm.BillNum, diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs index bce3e6f8..6bcb60a4 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs @@ -120,8 +120,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts string.Empty, string.Empty, 0, - string.Empty, - string.Empty, + !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty, + !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty, version, itm.ParentMaterialCode, itm.BillNum, 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 7b589930..2f712743 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs @@ -495,8 +495,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts string.Empty, string.Empty, 0, - string.Empty, - string.Empty, + !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty, + !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty, version, itm.ParentMaterialCode, itm.BillNum, diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs index 4622b331..d1f31a4a 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs @@ -199,7 +199,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts string.Empty, string.Empty, 0, - string.Empty, + !string.IsNullOrEmpty(p.Extend1) ? p.Extend1 : string.Empty, + string.Empty, string.Empty, p.MaterialCode, diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs index ff6d8b69..55094c00 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs @@ -295,7 +295,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS var sql = "DECLARE @return_value int\n" + "EXEC @return_value = [dbo].[p_wms_output]\n" + " @billnum = N'{0}',\n" + - " @type = 9\n" + + " @type = 9,\n" + " @date = '{1}'\n" + "SELECT 'Return Value' = @return_value"; await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( @@ -358,7 +358,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + " @Guids ={0}, \n" + " @billnum = N'{1}',\n" + - " @type = 4,\n" + + " @type = 9,\n" + " @accountdate = N'{2}'\n" + "SELECT 'Return Value' = @return_value"; @@ -394,8 +394,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS string.Empty, string.Empty, 0, - string.Empty, - string.Empty, + !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty, + !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty, version, itm.ParentMaterialCode, itm.BillNum, 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 a8828a92..1ef6c60e 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs @@ -356,8 +356,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS string.Empty, string.Empty, 0, - string.Empty, - string.Empty, + !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty, + !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty, version, itm.ParentMaterialCode, itm.BillNum, diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs index 380740ed..dca3953e 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs @@ -451,8 +451,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS string.Empty, string.Empty, 0, - string.Empty, - string.Empty, + !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty, + !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty, version, itm.MaterialCode, itm.BillNum,