更新版本

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

@@ -312,7 +312,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                                 select itm2;
                     foreach (var itm in query)
                     {
-
                         itm.InvbillNum = key;
                         salist.Add(itm);
                     }
@@ -355,7 +354,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                     {
                         detailList.AddRange(_entityDetailList);
                     }
-
                     List<tempAmt> amtList = new List<tempAmt>();
                     foreach (var itm in detailList)
                     {
@@ -365,7 +363,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                             TaxAmt=itm.Amt+ Math.Round(itm.Amt * 0.13m, 2)
                         });
                     }
-
                     decimal amt = amtList.Sum(k => k.Amt);//金额
                     decimal txtAmt = amtList.Sum(k => k.TaxAmt) ;//税后金额
                     decimal readAmt = amtList.Sum(k=>k.Tax);//税额
@@ -379,7 +376,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                     //var _groupList = dtos.GroupBy(p => new { p.GroupNum })
                     //    .Select(p => new { GroupNum = p.Key.GroupNum, Amt = p.Sum(itm => itm.Amt) }).Distinct();
                     List<INVOICE_MAP_GROUP> group1 = new List<INVOICE_MAP_GROUP>();
-
                     foreach (var en in _groupList)
                     {
                         group1.Add(
@@ -453,9 +449,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                 _invls = invlist.Select(p => p.InvbillNum).ToList();
             }
             return _invls;
-
         }
-    
         public List<string> FirstInvoice<TDetail>( List<TDetail> p_list, List<PUB_ADJ_DETAIL> p_adjlist, List<TEMP_CAN_SA_DETAIL> dtos, List<TEMP_NOT_SA_DETAIL> p_notlist, int p_version, string p_InvGroupNum, string p_parentInvBillNum, EnumBusinessType businessType)
            where TDetail : SA_CAN_BASE
         {

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

@@ -136,7 +136,7 @@ namespace SettleAccount.Domain.BQ
         }
         public void SetGroupNum(string bill)
         {
-            GroupNum= bill;
+            InvGroupNum= bill;
         }
 
         public BBAC_CAN_SA_DETAIL(Guid guid, string keyCode, int version, string billNum, string settleBillNum, string lU, string pN, string site, decimal qty, decimal price, EnumBusinessType category, bool isReturn,

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

@@ -144,7 +144,7 @@ namespace SettleAccount.Domain.BQ
         }
         public void SetGroupNum(string billNum)
         {
-            BillNum = billNum;
+            InvGroupNum= billNum;
         }
         public HBPO_CAN_SA_DETAIL()
         {

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

@@ -230,7 +230,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
         /// <returns></returns>
         public virtual async Task<List<BBAC_CAN_SA_DETAIL>> GetDetalListAsync(string billNum)
         {
-            return await _detailRepository.Where(p => p.InvGroupNum == billNum).ToListAsync().ConfigureAwait(false);
+            return await _detailRepository.Where(p => p.BillNum == billNum).ToListAsync().ConfigureAwait(false);
         }
         /// <summary>
         /// 获得主表信息
@@ -239,7 +239,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
         /// <returns></returns>
         public virtual async Task<BBAC_CAN_SA> GetMainAsync(string billNum)
         {
-            return await _repository.Where(p => p.InvGroupNum == billNum).FirstOrDefaultAsync().ConfigureAwait(false);
+            return await _repository.Where(p => p.BillNum == billNum).FirstOrDefaultAsync().ConfigureAwait(false);
         }
         /// <summary>
         /// 获取发票对应结算分组所有零件

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

@@ -153,7 +153,7 @@ namespace SettleAccount.Domain.BQ
             BillNum = billNum;
         }
         public void SetGroupNum(string billNum) {
-            BillNum = billNum;
+            InvGroupNum = billNum;
         }