Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/BaseDomainServices/BaseDomainService.cs

@@ -1,3 +1,5 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
 using SettleAccount.Bases;
 using System;
 using System.Collections.Generic;
@@ -39,9 +41,9 @@ namespace Win.Sfs.SettleAccount.Bases.DomainServices
            INormalEfCoreRepository<Bom, Guid> bomshipRepository,
            INormalEfCoreRepository<PriceList, Guid> priceRepository,
            INormalEfCoreRepository<PriceListBJ, Guid> pricebjRepository
-        //IExcelImportAppService excelImportService,
+           //IExcelImportAppService excelImportService,
-        //ISnowflakeIdGenerator snowflakeIdGenerator,
+           //ISnowflakeIdGenerator snowflakeIdGenerator,
-        //ICommonManager commonManager
+           //ICommonManager commonManager
         )
         {
             _priceRepository = priceRepository;
@@ -52,6 +54,31 @@ namespace Win.Sfs.SettleAccount.Bases.DomainServices
         }
 
 
+        public static async Task DoWorkBulkWithTransaction(DbContext dbContext, Action p_dowork)
+        {
+            using (var transaction = await dbContext.Database.BeginTransactionAsync())
+            {
+                try
+                {
+                    // 执行批量数据操作
+                    p_dowork();
+                    // 提交事务
+                    await transaction.CommitAsync();
+                }
+                catch (Exception)
+                {
+                    // 回滚事务
+                    await transaction.RollbackAsync();
+            
+
+                    throw;
+                }
+            }
+        }
+
+
+
+
 
         public async Task<List<string>> CheckBase(List<string> p_list, BASE_CONF p_config)
         {
@@ -67,7 +94,6 @@ namespace Win.Sfs.SettleAccount.Bases.DomainServices
                             from tm in temp.DefaultIfEmpty()
                             where tm == null
                             select itm;
-
                 foreach (var itm1 in query.ToList())
                 {
                     errorList.Add(itm1);
@@ -75,7 +101,6 @@ namespace Win.Sfs.SettleAccount.Bases.DomainServices
             }
             if (p_config.IsMaterial == true)
             {
-
                 var materialList = await _materialRepository.ToListAsync();
                 var query = from itm in partList
                             join itm1 in materialList on itm equals itm1.MaterialCode

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/BBAC_NOT_SA_MNG.cs

@@ -33,7 +33,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
         public BBAC_NOT_SA_MNG
             (
             BaseDomainService service,
-        INormalEfCoreRepository<BBAC_CAN_SA, Guid> repository,
+            INormalEfCoreRepository<BBAC_CAN_SA, Guid> repository,
             INormalEfCoreRepository<BBAC_CAN_SA_DETAIL, Guid> detailRepository,
             INormalEfCoreRepository<BBAC_NOT_SA_DETAIL, Guid> notRepository
             )

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/HBPO_CAN_SA_MNG.cs

@@ -52,13 +52,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
             {
                 return true;
             }
-             return false;
+            return false;
-            
         }
-
-
-
-
         /// <summary>
         ///正向流程
         /// </summary>
@@ -68,7 +63,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
         /// <exception cref="BusinessException"></exception>
         public virtual async Task<bool> SetForwardState(string p_billNum, SettleBillState state)
         {
-
             var ls = _repository.Where(p => p.InvGroupNum == p_billNum).ToList();
             if (ls == null && ls.Count ==0)
             {

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs

@@ -5,6 +5,7 @@ using Microsoft.AspNetCore.SignalR;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.EntityFrameworkCore;
 using NPOI.SS.Formula.Functions;
+using NPOI.Util;
 using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
 using SettleAccount.Bases;
 using SettleAccount.Domain.BQ;
@@ -1509,10 +1510,20 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                 _invls = invlist.Select(p => p.InvbillNum).ToList();
             }
 
+          
+
+
+
+
+
             return _invls;
         }
 
 
+      
+
+
+
 
         /// <summary>
         /// hbpojis

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs

@@ -66,7 +66,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
 
             var first= p_list.FirstOrDefault();
             if (first.BusinessType == EnumBusinessType.ZhiGongJianBBAC || first.BusinessType == EnumBusinessType.ZhiGongJianHBPO
-                || first.BusinessType == EnumBusinessType.BeiJian
+                || first.BusinessType == EnumBusinessType.BeiJian || first.BusinessType == EnumBusinessType.YinDuJian
                 )
             {
                 var ls = p_list.Select(p => p.GroupNum).Distinct().ToList();