更新版本

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

@@ -232,7 +232,7 @@ namespace Win.Sfs.SettleAccount.Bases
             }
 
             var detailist = _detailRepository.Where(p => p_list.Contains(p.BillNum)).ToList();
-            var first1 = detailist.FirstOrDefault();
+            var first1 = detailist.Where(p=>p.BusinessType!=0).FirstOrDefault();
             List<CustomCondition> customConditionList = new List<CustomCondition>();
             customConditionList.Add(new CustomCondition() { Name = "BillNumList", Value = string.Join(",", p_list) });
             customConditionList.Add(new CustomCondition() { Name = "Type", Value = first1.BusinessType.ToString() });

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

@@ -391,7 +391,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                         site: itm.Site,
                         qty: itm.Qty,
                         price: itm.Price,
-                        category: itm.BusinessType,
+                        category: inv.BusinessType,
                         isReturn: itm.Qty > 0 ? false : true,
                         settleDate: itm.SettleDate,
                         groupNum: itm.GroupNum,
@@ -399,6 +399,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                         contactid: itm.Extend1,//生产号
                         invbillnum: string.Empty,
                         partcode: relist.FirstOrDefault(p => p.SettleMaterialCode == itm.LU).ErpMaterialCode
+                        
                        ));
                     }
                 }

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

@@ -377,7 +377,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                         site: itm.Site,
                         qty: itm.Qty,
                         price: itm.Price,
-                        businessType: itm.BusinessType,
+                        businessType: inv.BusinessType,
                         settleDate: itm.SettleDate,
                         groupNum: itm.GroupNum,
                         invGroupNum: inv.InvGroupNum,

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

@@ -222,6 +222,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                             ReMark = itm.Extend3
                         };
         var ls = query.ToList();
+
         foreach (var itm in ls)
         {
             itm.SetId(GuidGenerator.Create());

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs

@@ -272,6 +272,61 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
             var dto = ObjectMapper.Map<PriceList, PriceListDto>(entity);
             return dto;
         }
+        /// <summary>
+        /// 修改实体
+        /// 修改作废状态
+        /// </summary>
+        //[HttpPost]
+        //public async Task<PriceListDto> UpdateListAsync(List<Guid> p_list)
+        //{
+        //    foreach (var itm in p_list)
+        //    {
+        //        var entity = await _settleAccountDbContext.Set<PriceList>().FindAsync(itm).ConfigureAwait(false);
+        //        entity.IsCancel = input.IsCancel;
+        //        if (entity.IsCancel == false)
+        //        {
+        //            var existPriceList = _settleAccountDbContext.Set<PriceList>()
+        //                .Where(t => t.LU == entity.LU)
+        //                .Where(t => t.IsCancel == false)
+        //                .Where(t => t.Id != entity.Id)
+        //                .ToList();
+
+        //            var existPrice = existPriceList.Find(t => (entity.BeginTime >= t.BeginTime && entity.BeginTime < t.EndTime) || (t.BeginTime >= entity.BeginTime && t.BeginTime < entity.EndTime));
+        //            if (existPrice != null)
+        //            {
+        //                throw new UserFriendlyException($"无法启用！此记录启用时间区间与区间【{existPrice.BeginTime:yyyy-MM-dd}至{existPrice.EndTime:yyyy-MM-dd}】存在交集", "400");
+        //            }
+        //        }
+
+
+
+
+        //    }
+
+        //    var entity = await _settleAccountDbContext.Set<PriceList>().FindAsync(input.Id).ConfigureAwait(false);
+        //    entity.IsCancel = input.IsCancel;
+        //    if (entity.IsCancel == false)
+        //    {
+        //        var existPriceList = _settleAccountDbContext.Set<PriceList>()
+        //            .Where(t => t.LU == entity.LU)
+        //            .Where(t => t.IsCancel == false)
+        //            .Where(t => t.Id != entity.Id)
+        //            .ToList();
+
+        //        var existPrice = existPriceList.Find(t => (entity.BeginTime >= t.BeginTime && entity.BeginTime < t.EndTime) || (t.BeginTime >= entity.BeginTime && t.BeginTime < entity.EndTime));
+        //        if (existPrice != null)
+        //        {
+        //            throw new UserFriendlyException($"无法启用！此记录启用时间区间与区间【{existPrice.BeginTime:yyyy-MM-dd}至{existPrice.EndTime:yyyy-MM-dd}】存在交集", "400");
+        //        }
+        //    }
+        //    await _settleAccountDbContext.SaveChangesAsync().ConfigureAwait(false);
+        //    var dto = ObjectMapper.Map<PriceList, PriceListDto>(entity);
+        //    return dto;
+        //}
+
+
+
+
         #endregion
     }
 }