From 0438ec323074ca206c55a2c9ac1379152c7d4806 Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Wed, 19 Jun 2024 09:30:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=A1=91=E8=AE=A1=E5=88=92=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E7=BB=99PDA=E5=B8=A6=E5=87=BA=E6=94=B6=E5=AE=B9?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Stores/InjectionPlanRequestController.cs  | 25 +++++++++++++++--
 .../Enums/Store/EnumIssueRequestType.cs       |  6 ++++
 .../InjectionPlanRequestAppService.cs         | 28 ++++++++++---------
 3 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/InjectionPlanRequestController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/InjectionPlanRequestController.cs
index ea9d93094..f37f32737 100644
--- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/InjectionPlanRequestController.cs
+++ b/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>
@@ -73,9 +75,26 @@ public class InjectionPlanRequestController : AbpController
     [HttpGet("list/item-category")]
     public virtual async Task<List<ItemBasicDTO>> GetItemCategoryListAsync(string categoryName)
     {
-        var entities = await _injectionRequestAppService.GetItemCategoryListAsync().ConfigureAwait(false);        
+        var entities = await _injectionRequestAppService.GetItemCategoryListAsync().ConfigureAwait(false);
+
+        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 entities.Where(p=>p.Category== categoryName).ToList();
+        return itemEntities;
     }
 
 }
diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumIssueRequestType.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumIssueRequestType.cs
index d9b2baaee..6518de328 100644
--- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumIssueRequestType.cs
+++ b/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,
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/InjectionPlanRequests/InjectionPlanRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/InjectionPlanRequests/InjectionPlanRequestAppService.cs
index 371b5240d..46cdee401 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/InjectionPlanRequests/InjectionPlanRequestAppService.cs
+++ b/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);
+
+            //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}】未配置收容数");
+            //}
 
-            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}】未配置收容数");
-            }
             detailInput.Status = EnumStatus.Open;            
             detailInput.IssuedQty = 0;
             detailInput.RecommendType = EnumRecommendType.None;