更新版本

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.交货单号 }

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.交货单号 }

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<MyFileContainer> _fileContainer;
-        private readonly ISettleAccountBranchEfCoreRepository<ErrorBill, Guid> _errorListRepository;
+        private readonly ErpPartDapperRepository _erpdapperRepository;
 
         public KanBanUnSettledExport(KanbanUnSettledDapperRepository dapper,
-              ISettleAccountBranchEfCoreRepository<ErrorBill, Guid> errorListRepository,
+             ErpPartDapperRepository erpdapperRepository,
             OutputService outputService,
 
             IBlobContainer<MyFileContainer> fileContainer
@@ -36,7 +36,7 @@ namespace SettleAccount.Job.Services.Report
             _outputService = outputService;
 
             _fileContainer = fileContainer;
-            _errorListRepository = errorListRepository;
+            _erpdapperRepository = erpdapperRepository;
         }
 
         public string ExportFile(Guid id, List<string> exportName, List<CustomCondition> 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 }

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<ErrorBill, Guid> _errorListRepository;
+        //private readonly ISettleAccountBranchEfCoreRepository<ErrorBill, Guid> _errorListRepository;
 
         public SettleKBWithCodeExportService(SettleKBWithCodeDapperReportRepository dapper,
              ISettleAccountBranchEfCoreRepository<ErrorBill, Guid> 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 }

src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleSparePartExportService.cs

@@ -143,7 +143,7 @@ namespace SettleAccount.Job.Services.Report
 
             // _outputService.Export<SettleSparePartExport>(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.交货单号 }

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.交货单号 }

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<MyFileContainer> _fileContainer;
-        private readonly ISettleAccountBranchEfCoreRepository<ErrorBill, Guid> _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<ErrorBill, Guid> errorListRepository,
+            ErpPartDapperRepository erpdapperRepository,
                IBlobContainer<MyFileContainer> 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<string> exportName, List<CustomCondition> 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.交货单号 }

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<ErrorBill, Guid> _errorListRepository;
+        private readonly ErpPartDapperRepository _erpdapperRepository;
         private readonly IBlobContainer<MyFileContainer> _fileContainer;
         public UnSettledSumService(
          HQHSettledDetailDapperRepository hqkanbanDapper,
@@ -69,7 +69,7 @@ namespace SettleAccount.Job.Services.Report
             WmsDapperRepository wmsDapper,
             SettleSparePartDapperReportRepository sparepartdapper,
                IBlobContainer<MyFileContainer> fileContainer,
-               ISettleAccountBranchEfCoreRepository<ErrorBill, Guid> errorListRepository
+                 ErpPartDapperRepository erpdapperRepository
             )
         {
             _wmsDapper = wmsDapper;
@@ -80,7 +80,7 @@ namespace SettleAccount.Job.Services.Report
             _erpDapper = erpDapper;
             _sparepartdapper = sparepartdapper;
             _fileContainer = fileContainer;
-            _errorListRepository = errorListRepository;
+            _erpdapperRepository = erpdapperRepository;
         }
         [UnitOfWork(false)]
         public string ExportFile(Guid id, List<string> exportName, List<CustomCondition> p_list)
@@ -135,8 +135,8 @@ 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 =_erpDapper.GetErrorBillList();
-            var q= from itm in _list
+            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
                         from tm1 in temp1.DefaultIfEmpty()
@@ -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.交货单号 }