From 28a1b9f6f37bfe40f173747056175bf1a5b596f1 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 18 Feb 2022 09:35:07 +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/WmsHQKBOutputAppService.cs | 4 ++-- .../SettleAccount.Application.xml | 9 ++++++++- .../src/SettleAccount.Domain/Entities/WMS/TaskList.cs | 8 ++++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs index 78d4c2dc..f550cf40 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs @@ -165,12 +165,12 @@ namespace Win.Sfs.SettleAccount.Entities.WMS itm.SapMaterialCode, itm.MaterialDesc, itm.Version, - string.Empty, + itm.IsBack, string.Empty, itm.Qty, tm1 == null ? 0 : tm1.Qty, itm.Qty, - string.Empty, + itm.Extend, itm.BillNum, itm.State, itm.RealityNumber, diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml index 292081e2..d2037f6f 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml @@ -2333,7 +2333,7 @@ - 导出 + 出库单导出 @@ -3376,6 +3376,13 @@ + + + 出库单导出 + + + + 准时化出库主表 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs index 13c7e2d6..b2c12cf3 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs @@ -547,8 +547,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [ImporterHeader(Name = "版本号")] [ExporterHeader(DisplayName = "版本号")] public string Version { set; get; } - [ImporterHeader(Name = "是否备件", IsIgnore = true)] - [ExporterHeader(DisplayName = "是否备件", IsIgnore = true)] + [ImporterHeader(Name = "是否备件")] + [ExporterHeader(DisplayName = "是否备件")] public string IsBack { set; get; } [ImporterHeader(Name = "结算数量")] [ExporterHeader(DisplayName = "结算数量")] @@ -564,8 +564,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [ImporterHeader(Name = "出库数量", IsIgnore = true)] [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)] public decimal OutputQty { set; get; } - [ImporterHeader(Name = "Extend", IsIgnore = true)] - [ExporterHeader(DisplayName = "Extend", IsIgnore = true)] + [ImporterHeader(Name = "客户")] + [ExporterHeader(DisplayName = "客户")] public string Extend { set; get; } [ImporterHeader(Name = "BillNum", IsIgnore = true)] [ExporterHeader(DisplayName = "BillNum", IsIgnore = true)]