更新版本

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs

@@ -113,6 +113,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         [Display(Name = "订单号")]
         public string Extend4 { get; set; }
 
+        [Display(Name = "行号")]
+        public int IndexNum { get; set; }
+
 
 
     }

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

@@ -199,6 +199,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             else if (invs.FirstOrDefault().BusinessType == EnumBusinessType.BeiJian)
             {
                 var B = await _wRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, input.SkipCount);
+
+                B.OrderBy(p => p.LineCode);
                 var BMap = ObjectMapper.Map<List<INVOICE_WAIT_DETAIL>, List<INVOICE_WAIT_DETAIL_BJ_DTO>>(B);
 
                 var wquery = from itm in BMap
@@ -224,7 +226,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                                BeginDate = itm.BeginDate,
                                EndDate = itm.EndDate,
                            };
-                entity.INVOICE_WAIT_DETAIL_BJ = wquery.OrderBy(p => p.LU).ToList();
+                entity.INVOICE_WAIT_DETAIL_BJ = wquery.ToList();
             }
             else
             {

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

@@ -106,6 +106,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 if (await _pubMng.SetForwardState(main, SettleBillState.已开票))
                 {
                     var groupNumList = entitys.Select(p => p.GroupNum).Distinct().ToList();
+                     entitys= entitys.OrderBy(p => p.IndexNum).ToList();
+
                     var dto1s = ObjectMapper.Map<List<PUB_CAN_SA_DETAIL>, List<PUB_CAN_SA_DETAIL_DTO>>(entitys);
                     var q = from d in dto1s
                             join p in priceList on d.LU equals p.LU
@@ -130,6 +132,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                                 BeginDate = p.BeginTime,
                                 EndDate = p.EndTime,
                                 PartCode = d.PartCode,//客户零件号
+                                LineCode=d.IndexNum
+
                             };
                     var dtos = q.ToList();
                     if (dtos != null && dtos.Count > 0)

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

@@ -2212,6 +2212,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                                     Qty = dto1.Qty,
                                     BeginDate = dto1.BeginDate,
                                     EndDate = dto1.EndDate,
+                                    LineCode=dto1.LineCode,
                                     DeliveryNumber = inv1.GetProperty("DeliveryNumber", ""),//交货号
                                     InvoiceNumber = inv1.GetProperty("InvoiceNumber", ""),//发票号
                                     VendorCode = inv1.GetProperty("VendorCode", ""),//供应商代码
@@ -2268,6 +2269,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                             beginDate: detail.BeginDate,
                             endDate: detail.EndDate,
                             partcode: detail.PartCode);
+                            entity.LineCode = detail.LineCode;
                             entity.SetProperty("DeliveryNumber", detail.DeliveryIndexNumber);//交货号
                             entity.SetProperty("VendorCode", detail.VendorCode);//供应商代码
                             entity.SetProperty("VendorName", detail.VendorName);//供应商名称
@@ -2275,37 +2277,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                             entity.SetProperty("DeliveryIndexNumber", "");//交付索引号
                             entity.SetProperty("PartName", "");//零件名称
 
-                            _entityDetailList.Add( entity
+                            _entityDetailList.Add(entity);
-                       
-                            );
                     }
                     if (_entityDetailList.Count > 0)
                     {
                         detailList.AddRange(_entityDetailList);
                     }
-                    //var innotls = new List<INVOICE_NOT_SETTLE>();
-                    //if (p_notlist != null && p_notlist.Count > 0)
-                    //{
-                    //    var notls = p_notlist.GroupBy(p => new { p.GroupNum, p.LU }).Select(p => new { GroupNum = p.Key.GroupNum, LU = p.Key.LU, Qty = p.Sum(itm => itm.Qty) });
-                    //    foreach (var nitm in notls)
-                    //    {
-                    //        innotls.Add(new INVOICE_NOT_SETTLE(
-                    //            guid: GuidGenerator.Create(),
-                    //            version: p_version,
-                    //            invGroupNum: p_InvGroupNum,
-                    //            settleGroupNum: nitm.GroupNum,
-                    //            lU: string.Empty,
-                    //            lU1: nitm.LU,
-                    //            extend1: string.Empty,
-                    //            extend2: string.Empty,
-                    //            qty: nitm.Qty
-                    //            ));
-                    //    }
-                    //    if (innotls.Count > 0)
-                    //    {
-                    //        notDetialList.AddRange(innotls);
-                    //    }
-                    //}
                     var invbill = new INVOICE_GRP
                       (guid: GuidGenerator.Create(),
                        realnvBillNum: string.Empty,

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

@@ -126,6 +126,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                        partcode: itm.PartCode,
                        pobillnum:string.Empty
                        );
+                    _detailEntity.IndexNum = itm.IndexNum;
                     _detailEntity.RealPartCode = itm.RealPartCode;
                     _entityList.Add(_detailEntity);
                 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Temp/TempClass.cs

@@ -138,6 +138,14 @@ public class TEMP_CAN_SA_DETAIL
 
 
 
+    /// <summary>
+    /// 行號
+    /// </summary>
+    public int LineCode { get; set; }
+
+
+
+
 
 }
 public class TEMP_NOT_SA_DETAIL : SA_NOT_BASE