From 5bc66f8ca55054e6ae3a5d0309a43918a8530e6b Mon Sep 17 00:00:00 2001 From: Administrator Date: Sat, 22 Jan 2022 14:37:58 +0800 Subject: [PATCH 1/2] =?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/UnInvoiceSettledDetailDiffDapperRepository.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnInvoiceSettledDetailDiffDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnInvoiceSettledDetailDiffDapperRepository.cs index 973cd208..5583ae47 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnInvoiceSettledDetailDiffDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnInvoiceSettledDetailDiffDapperRepository.cs @@ -96,7 +96,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " LEFT JOIN Set_fis b ON a.ChassisNumber = b.ChassisNumber2 \n" + " AND a.KENNCode = b.KENNCode \n" + " AND a.MaterialCode = b.ItemCode\n" + -" LEFT JOIN ( SELECT SUM( amt )/ SUM( Qty ) InvoicePrice, MaterialCode FROM set_invoice WHERE version = '202110' GROUP BY materialcode ) c ON a.MaterialCode = c.MaterialCode\n" + +" LEFT JOIN ( SELECT SUM( amt )/ SUM( Qty ) InvoicePrice, MaterialCode FROM set_invoice WHERE version = '{0}' GROUP BY materialcode ) c ON a.MaterialCode = c.MaterialCode\n" + " LEFT JOIN set_material d ON a.MaterialCode = d.CustomerPartCode \n" + " WHERE\n" + " b.Qty IS NULL \n" + From 2c1392a9a2c7da797bb215c5e172c7d39026b43b Mon Sep 17 00:00:00 2001 From: Administrator Date: Sat, 22 Jan 2022 15:08:11 +0800 Subject: [PATCH 2/2] =?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 --- .../Services/Report/UnInvoiceSettledDetailDiffExportService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs index cc473ae9..7e5172ca 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs @@ -91,6 +91,7 @@ namespace SettleAccount.Job.Services { itm.InvocieAmt =Math.Round( itm.InvoiceQty * itm.InvoicePrice,2); itm.DiffPrice = itm.Price - itm.InvoicePrice; + itm.DiffSettleFisQty = itm.SettledQty; } _ls=_ls.OrderBy(p => p.ChassisNumber).ThenBy(p=>p.KENNCode).ThenBy(p=>p.SapMaterialCode).ToList();