解决冲突

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs

@@ -129,12 +129,12 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
                 var balanceLst = await _balanceAppService.GetRecommendBalancesByLocationsAsync(input).ConfigureAwait(false);
                 if (balanceLst.Count == 0)
                 {
-                    throw new UserFriendlyException($"GetRecommendBalancesByLocationsAsync返回0条记录");
+                    throw new UserFriendlyException($"无推荐库存！");
                 }
                 var sumQty = balanceLst.Sum(itm => itm.Qty);
                 if (detail.Qty > sumQty)
                 {
-                    throw new UserFriendlyException($"库存数量不足：GetRecommendBalancesByLocationsAsync");
+                    throw new UserFriendlyException($"库存数量不足！");
                 }
                 foreach (var balance in balanceLst)
                 {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/CountPlans/CountPlanManager.cs

@@ -284,8 +284,8 @@ public class CountPlanManager : SfsStoreRequestManagerBase<CountPlan, CountPlanD
         
         var entity = await Repository.GetAsync(id).ConfigureAwait(false);
         var jobs = await _jobRepository.GetListAsync(p=>p.JobStatus == EnumJobStatus.Doing && p.CountPlanNumber == entity.Number && p.InventoryStage == entity.InventoryStage, true).ConfigureAwait(false);
-        var josbdeatils = jobs.Where(r=>r.InventoryStage==entity.InventoryStage).SelectMany(r => r.DepDetails);
-        var groups = josbdeatils.GroupBy(r => r.PackingCode).Where(g => g.Count() > 1&&!string.IsNullOrEmpty(g.Key)).Select(g => g.Key);     
+        var josbdeatils = jobs.SelectMany(r => r.DepDetails);
+        var groups = josbdeatils.Where(r=>r.InventoryStage== entity.InventoryStage).GroupBy(r => r.PackingCode).Where(g => g.Count() > 1&&!string.IsNullOrEmpty(g.Key)).Select(g => g.Key);     
         if (groups.Any())
         {
           var mesagge=  groups.JoinAsString(",");