注塑计划自动给PDA带出收容数

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/InjectionPlanRequestController.cs

@@ -17,14 +17,16 @@ namespace Win_in.Sfs.Wms.Pda.Controllers.Stores;
 public class InjectionPlanRequestController : AbpController
 {
     private readonly IInjectionPlanRequestAppService _injectionRequestAppService;
+    private readonly IItemContainerAppService _itemContainerAppService;
 
     /// <summary>
     ///
     /// </summary>
     /// <param name="InjectionPlanRequestAppService"></param>
-    public InjectionPlanRequestController(IInjectionPlanRequestAppService InjectionPlanRequestAppService)
+    public InjectionPlanRequestController(IInjectionPlanRequestAppService InjectionPlanRequestAppService, IItemContainerAppService itemContainerAppService)
     {
         _injectionRequestAppService = InjectionPlanRequestAppService;
+        _itemContainerAppService = itemContainerAppService;
     }
 
     /// <summary>
@@ -75,7 +77,24 @@ public class InjectionPlanRequestController : AbpController
     {
         var entities = await _injectionRequestAppService.GetItemCategoryListAsync().ConfigureAwait(false);
 
-        return entities.Where(p=>p.Category== categoryName).ToList();
+        var itemEntities = entities.Where(p => p.Category == categoryName).ToList();
+        foreach (var item in itemEntities)
+        {
+            var itemContainerDto = await _itemContainerAppService.GetByItemCodeAsync(item.Code).ConfigureAwait(false);
+
+            if(itemContainerDto != null)
+            {
+                item.StdPackQty = itemContainerDto.Qty;
+                item.BasicUom = itemContainerDto.BasicUom;
+            }
+            else
+            {
+                item.StdPackQty = 1;
+            }
+
+        }              
+
+        return itemEntities;
     }
 
 }

be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumIssueRequestType.cs

@@ -39,4 +39,10 @@ public enum EnumIssueRequestType
     /// </summary>
     [Display(Name = "EXCEL导入")]
     ExcelImport=5,
+
+    /// <summary>
+    /// 注塑计划
+    /// </summary>
+    [Display(Name = "EXCEL导入")]
+    InjectionPlan = 6,
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/InjectionPlanRequests/InjectionPlanRequestAppService.cs

@@ -99,20 +99,22 @@ public class InjectionPlanRequestAppService : SfsStoreRequestAppServiceBase<Inje
             detailInput.ItemDesc1 = itemBasicDto.Desc1;
             detailInput.ItemDesc2 = itemBasicDto.Desc2;
             detailInput.ItemName = itemBasicDto.Name;
+            detailInput.StdPackQty = itemBasicDto.StdPackQty;
 
-            var itemContainerDto = await _itemContainerAppService.GetByItemCodeAsync(detailInput.ItemCode).ConfigureAwait(false);
+            //var itemContainerDto = await _itemContainerAppService.GetByItemCodeAsync(detailInput.ItemCode).ConfigureAwait(false);
+
+            //if (itemContainerDto != null)
+            //{
+            //    detailInput.Uom = itemContainerDto.BasicUom;
+            //    detailInput.Qty = itemContainerDto.Qty;
+            //    detailInput.BoxQty = itemContainerDto.Qty;
+            //    detailInput.StdPackQty = itemBasicDto.StdPackQty;
+            //}
+            //else
+            //{
+            //    throw new UserFriendlyException($"ERP料号【{detailInput.ItemCode}】未配置收容数");
+            //}
 
-            if (itemContainerDto != null)
-            {
-                detailInput.Uom = itemContainerDto.BasicUom;
-                detailInput.Qty = itemContainerDto.Qty;
-                detailInput.BoxQty = itemContainerDto.Qty;
-                detailInput.StdPackQty = itemBasicDto.StdPackQty;
-            }
-            else
-            {
-                throw new UserFriendlyException($"ERP料号【{detailInput.ItemCode}】未配置收容数");
-            }
             detailInput.Status = EnumStatus.Open;            
             detailInput.IssuedQty = 0;
             detailInput.RecommendType = EnumRecommendType.None;