From ff4f21ab5c8b9d75d01d293e0d114d1f0b4664dd Mon Sep 17 00:00:00 2001 From: Administrator Date: Wed, 29 Jun 2022 16:54:19 +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/UnInvoiceSettledDetailDiffExportService.cs | 2 +- .../Services/Report/UnSettledSumService.cs | 6 +++--- .../Services/Report/UnsettledDetailReport.cs | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) 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 306f26e4..a6d6f80d 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs @@ -152,7 +152,7 @@ namespace SettleAccount.Job.Services } - var _checkList = _errorListRepository.ToList(); + var _checkList = _erpdapperRepository.GetErrorBillList(); var query = from itm in _ls join itm1 in _checkList on new { ChassisNumber = itm.ChassisNumber, MaterialCode = itm.MaterialCode, WmsBillNum = itm.WmsBillNum } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs index 97fb6576..ca735b56 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs @@ -135,14 +135,14 @@ namespace SettleAccount.Job.Services.Report var datetime = date.ToShortDateString() + " 23:59:59 "; var _list = _dapper.GetDiffReport(DateTime.Now.Year.ToString(), begin, datetime, "", version, materailCode, materialGroup, ""); - var _checkList = _errorListRepository.ToList(); - var query = from itm in _list + var _checkList =_erpDapper.GetErrorBillList(); + var q= from itm in _list join itm1 in _checkList on new { ChassisNumber = itm.ChassisNumber, MaterialCode = itm.MaterialCode, WmsBillNum = itm.WmsBillNum } equals new { ChassisNumber = itm1.BillNum, MaterialCode = itm1.MaterialCode, WmsBillNum = itm1.WmsBillNum } into temp1 from tm1 in temp1.DefaultIfEmpty() where tm1 == null select itm; - _list = query.ToList(); + _list = q.ToList(); var _ls = _list.Where(p => p.Flag != "L").Where(p => p.ParentSapMaterialCode != p.SapMaterialCode).GroupBy(p => new { p.KENNCode, p.ChassisNumber, p.ParentSapMaterialCode }).Select(p => p.FirstOrDefault()).ToList(); var _lst = _erpDapper.GetSapList(_ls, version, false); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnsettledDetailReport.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnsettledDetailReport.cs index 5f75fb18..50b22766 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnsettledDetailReport.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnsettledDetailReport.cs @@ -25,14 +25,14 @@ namespace SettleAccount.Job.Services.Report public UnsettledDetailReportService( UnSettledDetailDapperRepository dapper, OutputService outputService, - ErpPartDapperRepository erpDapper, - ISettleAccountBranchEfCoreRepository errorListRepository + ErpPartDapperRepository erpDapper + ) { _dapper = dapper; _outputService = outputService; _erpDapper = erpDapper; - _errorListRepository = errorListRepository; + } @@ -57,7 +57,7 @@ namespace SettleAccount.Job.Services.Report var _list = _dapper.GetDiffReport(DateTime.Now.Year.ToString(), begin, end, customerCode, version,materailCode,materialGroup,sapcode); - var _checkList = _errorListRepository.ToList(); + var _checkList = _erpDapper.GetErrorBillList(); var query = from itm in _list join itm1 in _checkList on new { ChassisNumber = itm.ChassisNumber, MaterialCode = itm.MaterialCode, WmsBillNum = itm.WmsBillNum }