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;
///
///
///
///
- public InjectionPlanRequestController(IInjectionPlanRequestAppService InjectionPlanRequestAppService)
+ public InjectionPlanRequestController(IInjectionPlanRequestAppService InjectionPlanRequestAppService, IItemContainerAppService itemContainerAppService)
{
_injectionRequestAppService = InjectionPlanRequestAppService;
+ _itemContainerAppService = itemContainerAppService;
}
///
@@ -73,9 +75,26 @@ public class InjectionPlanRequestController : AbpController
[HttpGet("list/item-category")]
public virtual async Task> 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
///
[Display(Name = "EXCEL导入")]
ExcelImport=5,
+
+ ///
+ /// 注塑计划
+ ///
+ [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