From 67551130f817fcd60f95b444d88919c7dab8918f Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 1 Apr 2022 15:09:29 +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 --- .../Report/SettleKBWithCodeDapperReportRepository.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 2efb5e00..781bbd63 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 @@ -99,7 +99,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " WHERE\n" + " A.VERSION = '{0}' {1} \n" + " ) TEMP1\n" + - " LEFT JOIN set_backQty temp3 ON temp1.Kanban = temp3.Code\n" + + " LEFT JOIN set_backQty temp3 ON temp1.Kanban = temp3.Code and temp1.SapMaterialCode=temp3.MaterialCode \n" + " LEFT JOIN ( SELECT Price, --定价\n" + @@ -290,6 +290,15 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report foreach (var itm1 in _lst) { + var item = _ls1.FirstOrDefault(p => p.Kanban == itm1.Kanban && p.MaterialCode == itm1.MaterialCode); + if (item != null) + { + itm1.WMSDeliveryNote = item.WmsBillNum; + itm1.WMSActualGoodsDate = item.WmsDate; + } + + + var itm = _ls.FirstOrDefault(p => p.Kanban == itm1.Kanban && p.MaterialCode == itm1.MaterialCode); if (itm != null) {