更新版本

code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs

@@ -552,7 +552,7 @@ namespace Win.Sfs.SettleAccount.Bases
         /// <param name="p_version">版本号</param>
         /// <param name="p_InvGroupNum">发票分组</param>
         /// <param name="p_parentInvBillNum">原发票号</param>
-        protected async Task<bool> ReissueSecInvoice<TDetail>(List<TDetail> p_list, List<PUB_ADJ_DETAIL> p_adjlist, List<TEMP_CAN_SA_DETAIL> p_tmplist, int p_version, string p_parentInvBillNum) where TDetail : SA_CAN_BASE
+        protected async Task<bool> ReissueSecInvoice<TDetail>(List<TDetail> p_list, List<PUB_ADJ_DETAIL> p_adjlist, List<TEMP_CAN_SA_DETAIL> p_tmplist, int p_version, string p_parentInvBillNum) where TDetail : SA_CAN_BASE, new()
         {
             var flag = await _invMng.ReissueSecInvoice(p_list, p_adjlist, p_tmplist, p_parentInvBillNum, p_version).ConfigureAwait(false);
             if (flag)

code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs

@@ -168,7 +168,7 @@ namespace Win.Sfs.SettleAccount.Bases
         /// <param name="p_version">版本号</param>
         /// <param name="p_InvGroupNum">发票分组</param>
         /// <param name="p_parentInvBillNum">原发票号</param>
-        protected async Task<bool> SecInvoice<TDetail>(List<TDetail> p_list, List<PUB_ADJ_DETAIL> p_adjlist, List<TEMP_CAN_SA_DETAIL> dtos, int p_version, string p_InvGroupNum, string p_parentInvBillNum, EnumBusinessType businessType, List<TEMP_NOT_SA_DETAIL> p_notlist = null) where TDetail : SA_CAN_BASE
+        protected async Task<bool> SecInvoice<TDetail>(List<TDetail> p_list, List<PUB_ADJ_DETAIL> p_adjlist, List<TEMP_CAN_SA_DETAIL> dtos, int p_version, string p_InvGroupNum, string p_parentInvBillNum, EnumBusinessType businessType, List<TEMP_NOT_SA_DETAIL> p_notlist = null) where TDetail : SA_CAN_BASE, new()
         {
 
             List<string> invlist = new List<string>();
@@ -176,10 +176,10 @@ namespace Win.Sfs.SettleAccount.Bases
             switch (businessType)
             {
                 case EnumBusinessType.MaiDanJianHBPO:
-                    invlist = await _invmng.MakeInvoice(p_list, p_adjlist, dtos, p_version, p_InvGroupNum, string.Empty, businessType, false).ConfigureAwait(false);
+                    invlist = await _invmng.SecInvoice(p_list, p_adjlist, dtos, p_version, p_InvGroupNum, string.Empty, businessType, p_notlist).ConfigureAwait(false);//重开可以变多张发票
                     break;
                 case EnumBusinessType.MaiDanJianBBAC:
-                    invlist = await _invmng.MakeInvoice(p_list, p_adjlist, dtos, p_version, p_InvGroupNum, string.Empty, businessType, false).ConfigureAwait(false);
+                    invlist = await _invmng.SecInvoice(p_list, p_adjlist, dtos, p_version, p_InvGroupNum, string.Empty, businessType, p_notlist).ConfigureAwait(false);//重开可以变多张发票
                     break;
                 case EnumBusinessType.ZhiGongJianBBAC:
                     invlist = await _invmng.SecInvoice(p_list, p_adjlist, dtos, p_version, p_InvGroupNum, string.Empty, businessType,p_notlist).ConfigureAwait(false);//重开可以变多张发票
@@ -197,7 +197,7 @@ namespace Win.Sfs.SettleAccount.Bases
                     invlist = await _invmng.SecInvoice(p_list, p_adjlist, dtos, p_version, p_InvGroupNum, string.Empty, businessType, p_notlist).ConfigureAwait(false);
                     break;
                 case EnumBusinessType.YinDuJian:
-                    invlist = await _invmng.JITInvoice(p_list, p_adjlist, dtos, new List<TEMP_NOT_SA_DETAIL>(), p_version, p_InvGroupNum, string.Empty, businessType, false).ConfigureAwait(false);//重开可以变多张发票
+                    invlist = await _invmng.SecInvoice(p_list, p_adjlist, dtos, p_version, p_InvGroupNum, string.Empty, businessType, p_notlist).ConfigureAwait(false);//重开可以变多张发票开可以变多张发票
                     break;
             }
             //var ls= await _invmng.SecInvoice(p_list,p_adjlist,p_tmplist,p_version, p_InvGroupNum, p_parentInvBillNum, businessType);

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PURCHASE_PRICE_SERVICE.cs

@@ -115,6 +115,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         [HttpPost]
         public async Task<PagedResultDto<PURCHASE_PRICE_DTO>> GetListAsync(RequestDto input)
         {
+            
             var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true).ConfigureAwait(false);
             var totalCount = await _repository.GetCountByFilterAsync(input.Filters).ConfigureAwait(false);
             var dtos = ObjectMapper.Map<List<PURCHASE_PRICE>, List<PURCHASE_PRICE_DTO>>(entities);

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/GenerateJisInvoiceService.cs

@@ -152,13 +152,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                             }).ToList();//不能结算
 
                             entitys = entitys.OrderBy(p => p.LU).ToList();
-
-
-
-
-
-
-
                             var invs = SecInvoice(entitys, new List<PUB_ADJ_DETAIL>(), dtos, notlist, main.Version, main.InvGroupNum, string.Empty, main.BusinessType);
                             // var invs = SecInvoice(entitys, new List<PUB_ADJ_DETAIL>(), dtos, main.Version, main.InvGroupNum, string.Empty, main.BusinessType, query.ToList());
                             if (invs.Count > 0)
@@ -581,10 +574,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                 //    }
                 //}
                 _invls = invlist.Select(p => p.InvbillNum).ToList();
-
-
-
-
             }
             return _invls;
         }
@@ -597,7 +586,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
         {
 
             List<string> _invls = new List<string>();
-
             var groupDtos = dtos.GroupBy(p => new { p.InvGroupNum, p.PartCode, p.Price, p.BeginDate, p.EndDate, p.ContractDocID, p.LU })//明细
                      .Select(itm => new GroupPartCode
                      {
@@ -633,10 +621,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
             var invlist = new List<INVOICE_GRP>();
             var salist = new List<TDetail>();
             var adjlist = new List<PUB_ADJ_DETAIL>();
-
-
-
-
             foreach (var big in biglist)//单条大于1000W的开票
             {
                 var list = p_list.Where(p => p.InvGroupNum == big.InvGroupNum && p.PartCode == big.PartCode && p.Price == big.Price && p.LU == big.LU);
@@ -692,9 +676,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                         {
                             groupList.AddRange(mapList);
                         }
-
-
-
                         #region 发票明细
                         List<INVOICE_WAIT_DETAIL> _entityDetailList = new List<INVOICE_WAIT_DETAIL>();
                         foreach (var detail in detailDtos)

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_GRP.cs

@@ -207,6 +207,74 @@ namespace SettleAccount.Domain.BQ
             this.invoices = invoices;
         }
     }
+
+    public class InvoiceByPUB<T> where T : SA_CAN_BASE, new()
+    {
+        public string InvBillNum { set; get; }
+        public InvoiceByPUB() { }
+        private List<T> parts = new List<T>();
+        public IReadOnlyList<T> Parts => parts.AsReadOnly();
+        public decimal TotalAmount => parts.Sum(p => p.Price);
+        public int PartCount => parts.GroupBy(p => new { p.LU, p.PartCode }).Count();
+        public bool CanAddPart(T part)
+        {
+            return TotalAmount + part.Price < 10000000 && PartCount<15 ;
+        }
+
+        public void AddPart(T part)
+        {
+            if (CanAddPart(part))
+            {
+                part.InvbillNum = InvBillNum;
+                parts.Add(part);
+
+            }
+
+        }
+    }
+
+    public class InvoiceGeneratorPUB<T> where T : SA_CAN_BASE, new()
+    {
+        private List<InvoiceByPUB<T>> invoices = new List<InvoiceByPUB<T>>();
+
+        public IReadOnlyList<InvoiceByPUB<T>> Invoices => invoices.AsReadOnly();
+
+        public void GenerateInvoices(List<T> parts)
+        {
+            InvoiceByPUB<T> currentInvoice = new InvoiceByPUB<T>();
+            invoices.Add(currentInvoice);
+            currentInvoice.InvBillNum = OrderNumberGenerator.GenerateOrderNumber("INV");
+            foreach (var part in parts)
+            {
+                if (!currentInvoice.CanAddPart(part))
+                {
+                    currentInvoice = new InvoiceByPUB<T>();
+                    currentInvoice.InvBillNum = OrderNumberGenerator.GenerateOrderNumber("INV");
+                    invoices.Add(currentInvoice);
+                }
+                currentInvoice.AddPart(part);
+            }
+        }
+        public InvoiceGeneratorPUB()
+        {
+
+        }
+        public InvoiceGeneratorPUB(List<InvoiceByPUB<T>> invoices)
+        {
+            this.invoices = invoices;
+        }
+    }
+
+
+
+
+
+
+
+
+
+
+
     public class GroupPartCode
     {
         public string PartCode { set; get; }