修改 kitting叫料

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/KittingIssueRequestEventHandler.cs

@@ -2,7 +2,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
-using AutoMapper.Internal;
 using Castle.Components.DictionaryAdapter;
 using Volo.Abp;
 using Volo.Abp.EventBus;
@@ -223,11 +222,11 @@ public class KittingIssueRequestEventHandler
         detail.PositionCode = kittingIssueRequestDetail.PositionCode;
         detail.RecommendType = kittingIssueRequestDetail.RecommendType;
         detail.Uom = balance.Uom;
-        detail.ItemCode= balance.ItemCode;
+        detail.ItemCode = balance.ItemCode;
-        detail.ItemDesc2= balance.ItemDesc2;
+        detail.ItemDesc2 = balance.ItemDesc2;
-        detail.ItemDesc1= balance.ItemDesc1;
+        detail.ItemDesc1 = balance.ItemDesc1;
-        detail.ItemName= balance.ItemName;
+        detail.ItemName = balance.ItemName;
-        detail.ProdLine= kittingIssueRequestDetail.ProdLine;
+        detail.ProdLine = kittingIssueRequestDetail.ProdLine;
         detail.RequestQty = balance.Qty;
         detail.StdPackQty = kittingIssueRequestDetail.StdPackQty;
         detail.Status = balance.Status;
@@ -247,8 +246,8 @@ public class KittingIssueRequestEventHandler
         detail.RecommendFromProduceDate = balance.ProduceDate;
         detail.RecommendFromArriveDate = balance.ArriveDate;
         detail.RecommendFromQty = balance.Qty;
-        detail.RecommendFromContainerCode= balance.ContainerCode;
+        detail.RecommendFromContainerCode = balance.ContainerCode;
-        detail.RecommendFromPackingCode= balance.PackingCode;
+        detail.RecommendFromPackingCode = balance.PackingCode;
 
         detail.RecommendToPackingCode = balance.PackingCode;
         detail.RecommendToContainerCode = balance.ContainerCode;
@@ -283,7 +282,7 @@ public class KittingIssueRequestEventHandler
         detail.TransferLibFromProduceDate = balance.ProduceDate;
         detail.TransferLibFromArriveDate = balance.ArriveDate;
         detail.TransferLibFromQty = balance.Qty;
-        detail.TransferLibFromContainerCode= balance.ContainerCode;
+        detail.TransferLibFromContainerCode = balance.ContainerCode;
         detail.TransferLibFromPackingCode = balance.PackingCode;
 
         detail.TransferLibToPackingCode = balance.PackingCode;
@@ -343,7 +342,7 @@ public class KittingIssueRequestEventHandler
             //当前零件的集合
             var inputDetails = kittingIssueRequestDetailList;
             //获取请求下 这个零件和这个库位一个需要多少箱
-            var sumBoxQty = inputDetails.Sum(p => p.BoxQty-p.IssuedQty);
+            var sumBoxQty = inputDetails.Sum(p => p.BoxQty - p.IssuedQty);
             //获取生产线
             var productionLineDto = await _productionLineAppService
                 .GetByLocationCodeAsync(inputDetails.First().ToLocationCode).ConfigureAwait(false);
@@ -521,11 +520,8 @@ public class KittingIssueRequestEventHandler
                 {
                     var usableLocationCode =
                         JsonSerializer.Deserialize<List<string>>(productionLineItemDto.RawLocationCodeListJson);
-                    if (!usableLocationCode.Any())
+                    if (usableLocationCode.Any())
                     {
-                        continue;
-                    }
-
                         //获取可用库存
                         var input = new RecommendBalanceRequestInput
                         {
@@ -546,21 +542,20 @@ public class KittingIssueRequestEventHandler
                             //因为是原料所以按箱叫料
                             kittingIssueJobEditInputs.AddRange(
                                 await CreateKittingIssueJobWithBoxQtyTypeAsync(kittingIssueRequest,
-                                new EditableList<KittingIssueRequestDetail> { kittingIssueRequestDetail }, usableList,
+                                    new EditableList<KittingIssueRequestDetail> { kittingIssueRequestDetail },
+                                    usableList,
                                     useBalanceList).ConfigureAwait(false));
                         }
                     }
+                }
 
                 //半成品
                 if (!string.IsNullOrEmpty(productionLineItemDto.ProductLocationCodeListJson)) //因为一个零件 要不是原料 要不是半成品
                 {
                     var usableLocationCode =
                         JsonSerializer.Deserialize<List<string>>(productionLineItemDto.ProductLocationCodeListJson);
-                    if (!usableLocationCode.Any())
+                    if (usableLocationCode.Any())
                     {
-                        continue;
-                    }
-
                         //获取可用库存
                         var input = new RecommendBalanceRequestInput
                         {
@@ -568,7 +563,8 @@ public class KittingIssueRequestEventHandler
                             Qty = kittingIssueRequestDetail.Qty,
                             Statuses = new EditableList<EnumInventoryStatus> { EnumInventoryStatus.OK },
                             Locations =
-                            JsonSerializer.Deserialize<List<string>>(productionLineItemDto.ProductLocationCodeListJson),
+                                JsonSerializer.Deserialize<List<string>>(productionLineItemDto
+                                    .ProductLocationCodeListJson),
                             IsPackingCode = false
                         };
                         var usableList = await _balanceAppService.GetUsableListAsync(input).ConfigureAwait(false);
@@ -599,13 +595,16 @@ public class KittingIssueRequestEventHandler
                     }
                 }
             }
+        }
 
-        if (kittingIssueJobEditInputs.Count > 0)//有库存 可以创建任务
+        if (kittingIssueJobEditInputs.Count > 0) //有库存 可以创建任务
         {
             //新增任务
-            var addKittingIssueJobDtos= await _kittingIssueJobAppService.CreateManyAsync(kittingIssueJobEditInputs).ConfigureAwait(false);
+            var addKittingIssueJobDtos = await _kittingIssueJobAppService.CreateManyAsync(kittingIssueJobEditInputs)
+                .ConfigureAwait(false);
 
-            await UpdateKittingIssueRequestDetailQtyAsync(kittingIssueRequest, addKittingIssueJobDtos).ConfigureAwait(false);
+            await UpdateKittingIssueRequestDetailQtyAsync(kittingIssueRequest, addKittingIssueJobDtos)
+                .ConfigureAwait(false);
 
             return addKittingIssueJobDtos;
         }
@@ -619,10 +618,12 @@ public class KittingIssueRequestEventHandler
     /// <param name="kittingIssueRequest"></param>
     /// <param name="addKittingIssueJobDtos"></param>
     /// <returns></returns>
-    private async Task UpdateKittingIssueRequestDetailQtyAsync(KittingIssueRequest kittingIssueRequest, List<KittingIssueJobDTO> addKittingIssueJobDtos)
+    private async Task UpdateKittingIssueRequestDetailQtyAsync(KittingIssueRequest kittingIssueRequest,
+        List<KittingIssueJobDTO> addKittingIssueJobDtos)
     {
         //原有任务
-        var existKittingIssueJobDtos = await _kittingIssueJobAppService.GetByRequestNumberAsync(kittingIssueRequest.Number)
+        var existKittingIssueJobDtos = await _kittingIssueJobAppService
+            .GetByRequestNumberAsync(kittingIssueRequest.Number)
             .ConfigureAwait(false);
 
         //新增的任务和已有的任务总和