HBPOJIS DN限制15个结算号开一张发票

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

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using EFCore.BulkExtensions;
 using Microsoft.EntityFrameworkCore;
 using SettleAccount.Domain.BQ;
 using Volo.Abp;
@@ -111,7 +112,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                         }
                         break;
                 }
-                await _repository.UpdateAsync(p_entiy).ConfigureAwait(false);
+                //await _repository.UpdateAsync(p_entiy).ConfigureAwait(false);
+
+                await _repository.DbContext.BulkUpdateAsync(new List<HBPO_CAN_SA> { p_entiy }).ConfigureAwait(false);
                 return true;
             }
             return false;

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

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using EFCore.BulkExtensions;
 using Microsoft.EntityFrameworkCore;
+using NPOI.SS.Formula.Functions;
 using SettleAccount.Bases;
 using SettleAccount.Domain.BQ;
 using Volo.Abp;
@@ -1192,8 +1193,14 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
             {
                 dic.Add(itm.GroupNum, itm.Amt);
                 copyDic.Add(itm.GroupNum, itm.Amt);
+
             }
+
+            
+
+
             Dictionary<string, List<string>> invoiceMap = new Dictionary<string, List<string>>();
+            var first=p_list.FirstOrDefault();
             foreach (var itm in dic)
             {
                 string invoiceBillNum = OrderNumberGenerator.GenerateOrderNumber("INV");
@@ -1202,6 +1209,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                 decimal sum = itm.Value;//初始分组合计金额
                                         // List<string> luList = dtos.Where(p => p.GroupNum == itm.Key).Select(p => p.LU).Distinct().ToList(); //初始LU种类
                 if (copyDic.ContainsKey(itm.Key) == true)//是否存在分组
+                {
+                    if (first.BusinessType == EnumBusinessType.JisBBAC || first.BusinessType == EnumBusinessType.ZhiGongJianHBPO)
                     {
                         foreach (var _itm1 in copyDic)
                         {
@@ -1230,6 +1239,44 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                             copyDic.Remove(rem);
                         }
                     }
+                    else
+                    {
+                        int count = 1;
+                        foreach (var _itm1 in copyDic)
+                        {
+                            if (itm.Key == _itm1.Key)//相同结算分组项不计算,已初始化
+                            {
+                                invoiceGroupNumList.Add(itm.Key);
+                                continue;
+                            }
+                          
+                            if (count > 14)
+                            {
+                                break;
+                            }
+                            //var grouplist = dtos.Where(p => p.GroupNum == _itm1.Key).Select(p => p.LU).Distinct().ToList();//每项LU种类
+                            //luList.AddRange(grouplist);
+                            //luList = luList.Distinct().ToList();
+                            //if (luList.Count > 20)//累加零件不超过20种
+                            //{
+                            //    continue;
+                            //}
+                            sum += _itm1.Value;
+                            if (sum > 10000000)
+                            {
+                                break;
+                            }
+                            invoiceGroupNumList.Add(_itm1.Key);//所有条件都满足添加发票和结算分组对应关系
+                            count++;
+
+                        }
+                        invoiceMap.Add(invoiceBillNum, invoiceGroupNumList);//记录发票对应关系
+                        foreach (var rem in invoiceGroupNumList)//移除
+                        {
+                            copyDic.Remove(rem);
+                        }
+                    }
+                }
             }
             if (invoiceMap.Keys.Count > 0)
             {
@@ -1452,8 +1499,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                 //}
                 _invls = invlist.Select(p => p.InvbillNum).ToList();
             }
-
-
             return _invls;
         }