From 540255cbd1db7cf854a0422e60172d42a5297a46 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Wed, 29 Jun 2022 16:44:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E5=B1=8F=E8=94=BD=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=95=B0=E6=8D=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Report/HQHSettledDetailDiffExportService.cs | 2 +- .../HQHUnSettledDetailDiffExportService.cs | 2 +- .../Services/Report/KanBanUnSettledExport.cs | 8 ++++---- .../Report/SettleKBWithCodeExportService.cs | 6 +++--- .../Report/SettleSparePartExportService.cs | 2 +- .../Report/SettleUnSparePartExportService.cs | 2 +- .../Services/Report/SyncFisService.cs | 12 ++++++------ .../Services/Report/UnSettledSumService.cs | 16 ++++++++-------- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSettledDetailDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSettledDetailDiffExportService.cs index 274b952c..998cecb6 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSettledDetailDiffExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSettledDetailDiffExportService.cs @@ -141,7 +141,7 @@ namespace SettleAccount.Job.Services.Report } //应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629 - var _checkList = _errorListRepository.ToList(); + var _checkList = _erpdapperRepository.GetErrorBillList(); var query = from itm in _ls join itm1 in _checkList on new { ChassisNumber = itm.订货看板编号, MaterialCode = itm.订货零件号, WmsBillNum = itm.交货单号 } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHUnSettledDetailDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHUnSettledDetailDiffExportService.cs index 2fa3f4cc..27884e94 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHUnSettledDetailDiffExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHUnSettledDetailDiffExportService.cs @@ -84,7 +84,7 @@ namespace SettleAccount.Job.Services.Report } //应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629 - var _checkList = _errorListRepository.ToList(); + var _checkList = _erpdapperRepository.GetErrorBillList(); var query = from itm in _ls join itm1 in _checkList on new { ChassisNumber = itm.订货看板编号, MaterialCode = itm.客户物料号, WmsBillNum = itm.交货单号 } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/KanBanUnSettledExport.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/KanBanUnSettledExport.cs index 186720ae..83ca0512 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/KanBanUnSettledExport.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/KanBanUnSettledExport.cs @@ -22,10 +22,10 @@ namespace SettleAccount.Job.Services.Report private readonly OutputService _outputService; KanbanUnSettledDapperRepository _dapper; private readonly IBlobContainer _fileContainer; - private readonly ISettleAccountBranchEfCoreRepository _errorListRepository; + private readonly ErpPartDapperRepository _erpdapperRepository; public KanBanUnSettledExport(KanbanUnSettledDapperRepository dapper, - ISettleAccountBranchEfCoreRepository errorListRepository, + ErpPartDapperRepository erpdapperRepository, OutputService outputService, IBlobContainer fileContainer @@ -36,7 +36,7 @@ namespace SettleAccount.Job.Services.Report _outputService = outputService; _fileContainer = fileContainer; - _errorListRepository = errorListRepository; + _erpdapperRepository = erpdapperRepository; } public string ExportFile(Guid id, List exportName, List p_list) @@ -100,7 +100,7 @@ namespace SettleAccount.Job.Services.Report //应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629 - var _checkList = _errorListRepository.ToList(); + var _checkList = _erpdapperRepository.GetErrorBillList(); var query = from itm in _ls join itm1 in _checkList on new { ChassisNumber = itm.Kanban, MaterialCode = itm.CustomerPartCode, WmsBillNum = itm.WmsBillNum } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleKBWithCodeExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleKBWithCodeExportService.cs index b8a213b2..f79bef52 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleKBWithCodeExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleKBWithCodeExportService.cs @@ -20,7 +20,7 @@ namespace SettleAccount.Job.Services.Report private readonly SettleKBWithCodeDapperReportRepository _dapper; private readonly OutputService _outputService; private readonly ErpPartDapperRepository _erpdapperRepository; - private readonly ISettleAccountBranchEfCoreRepository _errorListRepository; + //private readonly ISettleAccountBranchEfCoreRepository _errorListRepository; public SettleKBWithCodeExportService(SettleKBWithCodeDapperReportRepository dapper, ISettleAccountBranchEfCoreRepository errorListRepository, @@ -30,7 +30,7 @@ namespace SettleAccount.Job.Services.Report _dapper = dapper; _outputService = outputService; _erpdapperRepository = erpdapperRepository; - _errorListRepository = errorListRepository; + //_errorListRepository = errorListRepository; } @@ -112,7 +112,7 @@ namespace SettleAccount.Job.Services.Report //应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629 - var _checkList = _errorListRepository.ToList(); + var _checkList = _erpdapperRepository.GetErrorBillList(); var query = from itm in _list join itm1 in _checkList on new { ChassisNumber = itm.Kanban, MaterialCode = itm.CustomerPartCode, WmsBillNum = itm.WMSDeliveryNote } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleSparePartExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleSparePartExportService.cs index 3baf8472..ab19ae5c 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleSparePartExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleSparePartExportService.cs @@ -143,7 +143,7 @@ namespace SettleAccount.Job.Services.Report // _outputService.Export(id, fileName, _ls); //应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629 - var _checkList = _errorListRepository.ToList(); + var _checkList = _erpdapperRepository.GetErrorBillList(); var query = from itm in _ls join itm1 in _checkList on new { ChassisNumber = itm.采购订单号, MaterialCode = itm.物料代码, WmsBillNum = itm.交货单号 } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleUnSparePartExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleUnSparePartExportService.cs index 7bb0e93d..f2ef5bb9 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleUnSparePartExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleUnSparePartExportService.cs @@ -130,7 +130,7 @@ namespace SettleAccount.Job.Services.Report } //应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629 - var _checkList = _errorListRepository.ToList(); + var _checkList = _erpdapperRepository.GetErrorBillList(); var query = from itm in _reversels_withcode join itm1 in _checkList on new { ChassisNumber = itm.采购订单号, MaterialCode = itm.物料代码, WmsBillNum = itm.交货单号 } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SyncFisService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SyncFisService.cs index 1e3f10b0..ac9c17d7 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SyncFisService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SyncFisService.cs @@ -30,7 +30,7 @@ namespace SettleAccount.Job.Services.Report private readonly ErpPartDapperRepository _erpDapper; private readonly SettleSparePartDapperReportRepository _sparepartdapper; private readonly IBlobContainer _fileContainer; - private readonly ISettleAccountBranchEfCoreRepository _errorListRepository; + private readonly ErpPartDapperRepository _erpdapperRepository; public SyncFisService( HQHSettledDetailDapperRepository hqkanbanDapper, KanbanUnSettledDapperRepository kanbanDapper, @@ -39,7 +39,7 @@ namespace SettleAccount.Job.Services.Report ErpPartDapperRepository erpDapper, WmsDapperRepository wmsDapper, SettleSparePartDapperReportRepository sparepartdapper, - ISettleAccountBranchEfCoreRepository errorListRepository, + ErpPartDapperRepository erpdapperRepository, IBlobContainer fileContainer ) { @@ -51,7 +51,7 @@ namespace SettleAccount.Job.Services.Report _erpDapper = erpDapper; _sparepartdapper = sparepartdapper; _fileContainer = fileContainer; - _errorListRepository = errorListRepository; + _erpdapperRepository = erpdapperRepository; } [UnitOfWork(false)] public string ExportFile(Guid id, List exportName, List p_list) @@ -243,7 +243,7 @@ namespace SettleAccount.Job.Services.Report } //应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629 - var _checkList = _errorListRepository.ToList(); + var _checkList = _erpdapperRepository.GetErrorBillList(); var query = from itm in _ls join itm1 in _checkList on new { ChassisNumber = itm.Kanban, MaterialCode = itm.CustomerPartCode, WmsBillNum = itm.WmsBillNum } @@ -312,7 +312,7 @@ namespace SettleAccount.Job.Services.Report } //应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629 - var _checkList = _errorListRepository.ToList(); + var _checkList = _erpdapperRepository.GetErrorBillList(); var query = from itm in _ls join itm1 in _checkList on new { ChassisNumber = itm.订货看板编号, MaterialCode = itm.客户物料号, WmsBillNum = itm.交货单号 } @@ -372,7 +372,7 @@ namespace SettleAccount.Job.Services.Report //应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629 - var _checkList = _errorListRepository.ToList(); + var _checkList = _erpdapperRepository.GetErrorBillList(); var query = from itm in _ls join itm1 in _checkList on new { ChassisNumber = itm.采购订单号, MaterialCode = itm.物料代码, WmsBillNum = itm.交货单号 } 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..a7622153 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs @@ -58,7 +58,7 @@ namespace SettleAccount.Job.Services.Report private readonly OutputService _outputService; private readonly ErpPartDapperRepository _erpDapper; private readonly SettleSparePartDapperReportRepository _sparepartdapper; - private readonly ISettleAccountBranchEfCoreRepository _errorListRepository; + private readonly ErpPartDapperRepository _erpdapperRepository; private readonly IBlobContainer _fileContainer; public UnSettledSumService( HQHSettledDetailDapperRepository hqkanbanDapper, @@ -69,7 +69,7 @@ namespace SettleAccount.Job.Services.Report WmsDapperRepository wmsDapper, SettleSparePartDapperReportRepository sparepartdapper, IBlobContainer fileContainer, - ISettleAccountBranchEfCoreRepository errorListRepository + ErpPartDapperRepository erpdapperRepository ) { _wmsDapper = wmsDapper; @@ -79,8 +79,8 @@ namespace SettleAccount.Job.Services.Report _outputService = outputService; _erpDapper = erpDapper; _sparepartdapper = sparepartdapper; - _fileContainer = fileContainer; - _errorListRepository = errorListRepository; + _fileContainer = fileContainer; + _erpdapperRepository = erpdapperRepository; } [UnitOfWork(false)] public string ExportFile(Guid id, List exportName, List p_list) @@ -135,7 +135,7 @@ 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 _checkList = _erpdapperRepository.GetErrorBillList(); var query = 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 @@ -287,7 +287,7 @@ equals new { ChassisNumber = itm1.BillNum, MaterialCode = itm1.MaterialCode, Wms } //应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629 - var _checkList = _errorListRepository.ToList(); + var _checkList = _erpdapperRepository.GetErrorBillList(); var query = from itm in _ls join itm1 in _checkList on new { ChassisNumber = itm.Kanban, MaterialCode = itm.CustomerPartCode, WmsBillNum = itm.WmsBillNum } @@ -356,7 +356,7 @@ equals new { ChassisNumber = itm1.BillNum, MaterialCode = itm1.MaterialCode, Wms } //应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629 - var _checkList = _errorListRepository.ToList(); + var _checkList = _erpdapperRepository.GetErrorBillList(); var query = from itm in _ls join itm1 in _checkList on new { ChassisNumber = itm.订货看板编号, MaterialCode = itm.客户物料号, WmsBillNum = itm.交货单号 } @@ -416,7 +416,7 @@ equals new { ChassisNumber = itm1.BillNum, MaterialCode = itm1.MaterialCode, Wms //应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629 - var _checkList = _errorListRepository.ToList(); + var _checkList = _erpdapperRepository.GetErrorBillList(); var query = from itm in _ls join itm1 in _checkList on new { ChassisNumber = itm.采购订单号, MaterialCode = itm.物料代码, WmsBillNum = itm.交货单号 }