更新版本

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

@@ -101,8 +101,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                         entity.SettleBillNum = string.Empty;
                         entity.Site = "1040";
                         entity.BusinessType = EnumBusinessType.JisBBAC;
-                        billList.Add(entity);
-                     
+                        billList.Add(entity);                     
                         foreach (var itm in bbac_can_list)
                         {
                             var _detailEntity = new BBAC_CAN_SA_DETAIL(

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

@@ -6,6 +6,7 @@ using EFCore.BulkExtensions;
 using Microsoft.EntityFrameworkCore;
 using NPOI.SS.Formula.Functions;
 using SettleAccount.Domain.BQ;
+using Volo.Abp;
 using Volo.Abp.Domain.Services;
 using Win.Sfs.SettleAccount.Bases;
 using Win.Sfs.SettleAccount.Bases.DomainServices;
@@ -77,7 +78,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
 
         public virtual async Task<List<string>> GenerateSettlementOrder(List<BBAC_NOT_SA_DETAIL> p_list)
         {
-            
+            if (p_list.Count > 0)
+            {
+                throw new UserFriendlyException("查询无数据不能生成可结算单", "400");
+            }
             var first = p_list.FirstOrDefault();
             List<string> errors = new List<string>();
             //var priceErrors = await _service.CheckPriceList(p_list, first.Site).ConfigureAwait(false);

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

@@ -5,6 +5,7 @@ using System.Security.Policy;
 using System.Threading.Tasks;
 using EFCore.BulkExtensions;
 using SettleAccount.Domain.BQ;
+using Volo.Abp;
 using Volo.Abp.Domain.Services;
 using Win.Sfs.SettleAccount.Bases;
 using Win.Sfs.SettleAccount.Bases.DomainServices;
@@ -50,6 +51,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
         }
         public virtual async Task<List<string>> GenerateSettlementOrder(List<HBPO_NOT_SA_DETAIL> p_list)
         {
+            if (p_list.Count > 0)
+            {
+                throw new UserFriendlyException("查询无数据不能生成可结算单", "400");
+            }
             var first = p_list.FirstOrDefault();
             List<string> errors = new List<string>();
             var priceErrors = await _service.CheckPriceList(p_list, first.Site).ConfigureAwait(false);

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

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using EFCore.BulkExtensions;
 using Microsoft.EntityFrameworkCore;
 using SettleAccount.Domain.BQ;
+using Volo.Abp;
 using Volo.Abp.Data;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Services;
@@ -60,6 +61,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
         }
         public virtual async Task<List<string>> GenerateSettlementOrder(List<PUB_NOT_SA_DETAIL> p_list)
         {
+            if (p_list.Count > 0)
+            {
+                throw new UserFriendlyException("查询无数据不能生成可结算单","400");
+            }
             var first = p_list.FirstOrDefault();
             List<string> errors = new List<string>();
             var entityList = new List<PUB_CAN_SA_DETAIL>();
@@ -104,7 +109,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                 var notlist = _notRepository.Where(p => ls.Contains(p.GroupNum) && p.BusinessType==first.BusinessType).ToList();//JIT_ASN整发
                 if (first.BusinessType == EnumBusinessType.ZhiGongJianBBAC)
                 {
-
                     var subqueryA = (from a in notlist
                                      where a.BusinessType == first.BusinessType
                                      group a by new { a.GroupNum, a.SettleBillNum, a.Version, a.Site } into groupedData

code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBusinessType.cs

@@ -27,6 +27,9 @@ namespace Win.Sfs.SettleAccount
         /// </summary>
         [Display(Name = "直供件BBAC")]
         ZhiGongJianBBAC = 3,
+
+
+        
         /// <summary>
         /// 直供件HBPO
         /// </summary>