量差价差加上 ErrorBill功能 保持事务在一个数据上下文

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<MyFileContainer> _fileContainer;
-        private readonly ISettleAccountBranchEfCoreRepository<ErrorBill, Guid> _errorListRepository;
+        //private readonly ISettleAccountBranchEfCoreRepository<ErrorBill, Guid> _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<ErrorBill, Guid> errorListRepository
+             //ISettleAccountBranchEfCoreRepository<ErrorBill, Guid> 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<string> exportName, List<CustomCondition> 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 }
@@ -428,7 +430,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 _list
                         join itm1 in _checkList on new { ChassisNumber = itm.ChassisNumber, MaterialCode = itm.MaterialCode, WmsBillNum = itm.WmsBillNum }