diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/ERPShpping/ERPShppingDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/ERPShpping/ERPShppingDto.cs index 1c1b3a66..60d87115 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/ERPShpping/ERPShppingDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/ERPShpping/ERPShppingDto.cs @@ -70,12 +70,12 @@ namespace Win.Sfs.SettleAccount.Entities.ERPShpping public decimal Qty { set; get; } [ImporterHeader(Name = "调出仓库")] public string Output { set; get; } - [ImporterHeader(Name = "调出仓库代码")] + [ImporterHeader(Name = "调出仓库代码",IsIgnore =true)] public string OutputCode { set; get; } [ImporterHeader(Name = "调入仓库")] public string Input { set; get; } - [ImporterHeader(Name = "调入仓库代码")] + [ImporterHeader(Name = "调入仓库代码",IsIgnore =true)] public string InputCode { set; get; } [ImporterHeader(Name = "辅助出库关联数量")] public decimal OutputAssQty { set; get; } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs index d18b018b..7dc0d918 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs @@ -461,7 +461,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS 0, 0, itm.InvoicePrice, - itm.InvoiceAmt + Math.Round(((itm.InvoiceQty - itm.ClaimQty + itm.CP7ScrapQty) * itm.InvoicePrice), 2) ); diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs index 70b5628d..d8e8a89d 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs @@ -1866,24 +1866,6 @@ namespace Win.Sfs.SettleAccount } - - - - - - - - - - - - - - - - - - @@ -1972,6 +1954,12 @@ namespace Win.Sfs.SettleAccount + + + + + + #endregion