From 7c645dbe59155b87d62be1a85b3eeeacd5252f1f Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Fri, 15 Jul 2022 13:55:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8F=E5=B7=AE=E4=BB=B7=E5=B7=AE=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=20ErrorBill=E5=8A=9F=E8=83=BD=20=E4=BF=9D=E6=8C=81?= =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E5=9C=A8=E4=B8=80=E4=B8=AA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UnInvoiceSettledDetailDiffExportService.cs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 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 a6d6f80d..2624afbd 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs @@ -54,7 +54,7 @@ namespace SettleAccount.Job.Services private readonly ErpPartDapperRepository _erpdapperRepository; private readonly IBlobContainer _fileContainer; - private readonly ISettleAccountBranchEfCoreRepository _errorListRepository; + //private readonly ISettleAccountBranchEfCoreRepository _errorListRepository; private readonly OutputService _outputService; private readonly InputService _inputService; @@ -65,9 +65,9 @@ namespace SettleAccount.Job.Services InvoiceSettledDetailDiffDapperRepository dapperRepository1, OutputService outputService, InputService inputService, - UnSettledDetailDapperRepository dapperRepository2, + UnSettledDetailDapperRepository dapperRepository2 - ISettleAccountBranchEfCoreRepository errorListRepository + //ISettleAccountBranchEfCoreRepository errorListRepository ) { _fileContainer = fileContainer; @@ -79,7 +79,7 @@ namespace SettleAccount.Job.Services _dapperRepository =dapperRepository; _dapperRepository1 = dapperRepository1; _dapperRepository2 = dapperRepository2; - _errorListRepository = errorListRepository; + // _errorListRepository = errorListRepository; } public string ExportFile(Guid id, List exportName, List p_list) @@ -347,7 +347,9 @@ equals new { ChassisNumber = itm1.BillNum, MaterialCode = itm1.MaterialCode, Wms } - var _checkList = _errorListRepository.ToList(); + //var _checkList = _errorListRepository.ToList(); + //应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629 + 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 } @@ -427,8 +429,10 @@ equals new { ChassisNumber = itm1.BillNum, MaterialCode = itm1.MaterialCode, Wms _list = _list.Where(p => _groupList.Contains(p.SapMaterialCode)).ToList(); } } - - var _checkList = _errorListRepository.ToList(); + + //var _checkList = _errorListRepository.ToList(); + //应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629 + var _checkList = _erpdapperRepository.GetErrorBillList(); var query = from itm in _list join itm1 in _checkList on new { ChassisNumber = itm.ChassisNumber, MaterialCode = itm.MaterialCode, WmsBillNum = itm.WmsBillNum }