From d298310413859029df41ef3e4c2644014c6d07c8 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 1 Apr 2022 10:33:36 +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/WMSKanbanExtendAppService.cs | 6 ++---- .../Report/KanbanUnSettledDapperRepository.cs | 2 +- .../Report/SettleKBWithCodeDapperReportRepository.cs | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) 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 4a6f23fa..d2bdc2b0 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs @@ -259,8 +259,6 @@ namespace Win.Sfs.SettleAccount.Entities.WMS return await ExportErrorReportAsync(checkList); } } - - var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss"); var _list = _dapper.GetNoKanbanSettleDetail(input.Version); var stockList = _wmsDapper.GetSalesStock(); @@ -276,9 +274,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS itm.Version, string.Empty, string.Empty, - itm.InvoiceQty-itm.ClaimQty, + itm.InvoiceQty+itm.ClaimQty+itm.CP7ScrapQty, tm1==null?0:tm1.Qty, - itm.InvoiceQty, + itm.InvoiceQty + itm.ClaimQty + itm.CP7ScrapQty, string.Empty, _billNum, 0, diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/KanbanUnSettledDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/KanbanUnSettledDapperRepository.cs index f99f67da..d222bf10 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/KanbanUnSettledDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/KanbanUnSettledDapperRepository.cs @@ -527,7 +527,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " temp2.Price AS SalePrice \n" + ", temp1.ClaimQty \n"+ - ",temp1.CP7ScrapQty \n"+ + ", temp1.CP7ScrapQty \n"+ " FROM\n" + " (\n" + diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs index 5d1e10a0..8dbacad3 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs @@ -213,7 +213,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report var sql2 = "SELECT A\n" + -" .WMSActualGoodsDate WmsBillNum,\n" + +" .WMSDeliveryNote WmsBillNum,\n" + " t1.MaterialCode MaterialCode,\n" + " A.Kanban,\n" + " A.WMSActualGoodsDate WmsDate \n" +