注塑发料功能更新

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

@@ -1,6 +1,8 @@
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc;
+using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
 namespace Win_in.Sfs.Wms.Pda.Controllers.Stores;
@@ -48,4 +50,17 @@ public class InjectionIssueRequestController : AbpController
         return Ok(result);
     }
 
+    /// <summary>
+    /// 获取物品类别列表
+    /// </summary>
+    /// <param name="type"></param>
+    /// <returns></returns>
+    [HttpGet("list/item-category")]
+    public virtual async Task<List<ItemBasicDTO>> GetItemCategoryListAsync()
+    {
+        var entities = await _injectionRequestAppService.GetItemCategoryListAsync().ConfigureAwait(false);
+
+        return entities;
+    }
+
 }

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/IItemBasicAppService.cs

@@ -17,6 +17,7 @@ public interface IItemBasicAppService
     void CheckItemIsAvailable(ItemBasicDTO itemBasicDTO);
 
     Task<List<ItemBasicDTO>> GetListByNameAsync(string name);
+    Task<List<ItemBasicDTO>> GetCategoryListAsync();
 
     Task<ItemBasicDTO> GetOrAddAsync(ItemBasicEditInput input);
 

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Items/ItemBasicAppService.cs

@@ -122,6 +122,14 @@ public class ItemBasicAppService
         return dtos;
     }
 
+    [HttpGet("list-item-category")]
+    public virtual async Task<List<ItemBasicDTO>> GetCategoryListAsync()
+    {
+        var entities = await _repository.GetListAsync(c => !string.IsNullOrEmpty(c.Category)).ConfigureAwait(false);
+        var dtos = ObjectMapper.Map<List<ItemBasic>, List<ItemBasicDTO>>(entities);
+        return dtos;
+    }
+
     [HttpGet("get-manage-type")]
     public virtual async Task<EnumItemManageType> GetManageTypeAsync(string itemCode)
     {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/IInjectionIssueRequestAppService.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
+using Win_in.Sfs.Basedata.Application.Contracts;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -16,4 +17,10 @@ public interface IInjectionIssueRequestAppService
     /// </summary>
     /// <returns></returns>
     Task<long> GetCountAsync();
+
+    /// <summary>
+    /// 获取物品类别列表
+    /// </summary>
+    /// <returns></returns>
+    Task<List<ItemBasicDTO>> GetItemCategoryListAsync();
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs

@@ -21,8 +21,11 @@ using Win_in.Sfs.Wms.Store.Notes;
 
 namespace Win_in.Sfs.Wms.Store.Application;
 
+/// <summary>
+/// 注塑发料任务
+/// </summary>
 [Authorize]
-[Route($"{StoreConsts.RootPath}injection-job")]
+[Route($"{StoreConsts.RootPath}injection-issue-job")]
 public class InjectionIssueJobAppService
     : SfsJobAppServiceBase<InjectionIssueJob, InjectionIssueJobDetail, InjectionIssueJobDTO, SfsJobRequestInputBase,
             InjectionIssueJobCheckInput, InjectionIssueJobEditInput>,

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteAppService.cs

@@ -17,8 +17,11 @@ using Win_in.Sfs.Wms.Store.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Application;
 
+/// <summary>
+/// 注塑发料记录
+/// </summary>
 [Authorize]
-[Route($"{StoreConsts.RootPath}injection-note")]
+[Route($"{StoreConsts.RootPath}injection-issue-note")]
 public class InjectionIssueNoteAppService :
     SfsStoreWithDetailsAppServiceBase<InjectionIssueNote, InjectionIssueNoteDTO, SfsStoreRequestInputBase, InjectionIssueNoteEditInput, InjectionIssueNoteDetail,
         InjectionIssueNoteDetailDTO, SfsStoreRequestInputBase, InjectionIssueNoteImportInput>,

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAppService.cs

@@ -28,10 +28,10 @@ using Win_in.Sfs.Wms.Store.Domain.Shared;
 namespace Win_in.Sfs.Wms.Store.Application;
 
 /// <summary>
-/// 注塑叫料
+/// 注塑发料申请
 /// </summary>
 [Authorize]
-[Route($"{StoreConsts.RootPath}injection-request")]
+[Route($"{StoreConsts.RootPath}injection-issue-request")]
 public class InjectionIssueRequestAppService : SfsStoreRequestAppServiceBase<InjectionIssueRequest, InjectionIssueRequestDTO,
         SfsStoreRequestInputBase, InjectionIssueRequestEditInput, InjectionIssueRequestDetail, InjectionIssueRequestDetailDTO,
         SfsStoreRequestInputBase, InjectionIssueRequestImportInput>,
@@ -150,6 +150,19 @@ public class InjectionIssueRequestAppService : SfsStoreRequestAppServiceBase<Inj
         return injectionRequestDto;
     }
 
+    /// <summary>
+    /// 获取物品类别列表
+    /// </summary>
+    /// <param name="type"></param>
+    /// <returns></returns>
+    [HttpGet("list/item-category")]
+    public virtual async Task<List<ItemBasicDTO>> GetItemCategoryListAsync()
+    {
+        var entities = await _itemBasicAppService.GetCategoryListAsync().ConfigureAwait(false);       
+
+        return entities;
+    }
+
     #endregion
 
     #region 导入

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

@@ -388,7 +388,7 @@ public class InjectionIssueRequestEventHandler
                     .RawLocationCodeListJson)
             };
             var usableList = await _balanceAppService.GetUsableListAsync(input).ConfigureAwait(false);
-            usableList = usableList.Where(p => !useBalanceList.Contains(p.PackingCode)).ToList();
+            usableList = usableList.Where(p => !useBalanceList.Contains(p.PackingCode) && p.Qty!=0).ToList();
             if (usableList.Any())
             {
                 for (var i = 0; i < sumBoxQty; i++)
@@ -462,6 +462,7 @@ public class InjectionIssueRequestEventHandler
         detail.ItemName=injectionRequestDetail.ItemName;
         detail.ItemDesc1=injectionRequestDetail.ItemDesc1;
         detail.ItemDesc2 = injectionRequestDetail.ItemDesc2;
+        detail.StdPackQty = injectionRequestDetail.StdPackQty;
 
         detail.Status = EnumInventoryStatus.OK;
         detail.Uom = balance.Uom;