From a39ad832f65f956230b208537b89443c188efad5 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Tue, 18 Jun 2024 16:43:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=A1=91=E8=AE=A1=E5=88=92=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=94=B3=E8=AF=B7=E5=88=B0=E5=96=B7=E6=B6=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Stores/InjectionPlanRequestController.cs | 2 +- .../InjectionRequestController.cs | 2 +- .../IInjectionPlanRequestAppService.cs | 1 + .../InjectionPlanRequestAppService.cs | 77 ++++++++++--------- .../InjectionPlanRequestAutoMapperProfile.cs | 6 ++ 5 files changed, 51 insertions(+), 37 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 19010f161..ea9d93094 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 @@ -35,7 +35,7 @@ public class InjectionPlanRequestController : AbpController [HttpPost("")] public virtual async Task> CreateAsync(InjectionPlanRequestEditInput input) { - var result = await _injectionRequestAppService.CreateAsync(input).ConfigureAwait(false); + var result = await _injectionRequestAppService.CreateAndHandleAsync(input).ConfigureAwait(false); return Ok(result); } diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/IssueRequest/InjectionRequestController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/IssueRequest/InjectionRequestController.cs index d04c8024e..ae2a27efc 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/IssueRequest/InjectionRequestController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/IssueRequest/InjectionRequestController.cs @@ -35,7 +35,7 @@ public class InjectionRequestController : AbpController } /// - /// Kitting叫料申请 + /// 注塑叫料申请 /// /// /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/InjectionPlanRequests/IInjectionPlanRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/InjectionPlanRequests/IInjectionPlanRequestAppService.cs index 601af38d5..dfb3a139d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/InjectionPlanRequests/IInjectionPlanRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/InjectionPlanRequests/IInjectionPlanRequestAppService.cs @@ -16,6 +16,7 @@ public interface IInjectionPlanRequestAppService /// Task> GetItemCategoryListAsync(); + Task CreateAndHandleAsync(InjectionPlanRequestEditInput input); Task> GetUnCompletedRequestAsync(List p_list); } 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 876d6017b..371b5240d 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 @@ -5,7 +5,10 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Volo.Abp; +using Volo.Abp.Domain.Repositories; +using Win_in.Sfs.Basedata.Application; using Win_in.Sfs.Basedata.Application.Contracts; +using Win_in.Sfs.Basedata.Domain; using Win_in.Sfs.Shared.Domain.Shared; using Win_in.Sfs.Shared.Domain.Shared.Enums.Store; using Win_in.Sfs.Wms.Store.Application.Contracts; @@ -30,7 +33,8 @@ public class InjectionPlanRequestAppService : SfsStoreRequestAppServiceBase CreateAsync(InjectionPlanRequestEditInput input) + [HttpPost("create-and-handle")] + public async Task CreateAndHandleAsync(InjectionPlanRequestEditInput input) { foreach (var item in input.Details) { @@ -67,53 +75,54 @@ public class InjectionPlanRequestAppService : SfsStoreRequestAppServiceBase p.PartCode == detailInput.ItemCode && p.LocationCode == detailInput.ToLocationCode).ConfigureAwait(false); + + detailInput.ProdLine = productionLineDto.Code; detailInput.ToLocationArea = toLocationDto.AreaCode; detailInput.ToLocationGroup = toLocationDto.LocationGroupCode; detailInput.ToWarehouseCode = toLocationDto.WarehouseCode; - detailInput.ProdLine = detailInput.ToLocationCode; - detailInput.ToLocationErpCode = toLocationDto.ErpLocationCode; + detailInput.ToLocationErpCode = toLocationDto.ErpLocationCode; detailInput.ItemDesc1 = itemBasicDto.Desc1; detailInput.ItemDesc2 = itemBasicDto.Desc2; detailInput.ItemName = itemBasicDto.Name; - var itemContainerDto = await _itemContainerAppService.GetListByItemCodeAsync(detailInput.ItemCode) - .ConfigureAwait(false); - if (itemContainerDto.Count > 0) + var itemContainerDto = await _itemContainerAppService.GetByItemCodeAsync(detailInput.ItemCode).ConfigureAwait(false); + + if (itemContainerDto != null) { - detailInput.Uom = itemContainerDto[0].BasicUom; - detailInput.Qty = itemContainerDto[0].Qty; + detailInput.Uom = itemContainerDto.BasicUom; + detailInput.Qty = itemContainerDto.Qty; + detailInput.BoxQty = itemContainerDto.Qty; detailInput.StdPackQty = itemBasicDto.StdPackQty; } else { - detailInput.Uom = itemBasicDto.BasicUom; - detailInput.StdPackQty = itemBasicDto.StdPackQty; - detailInput.Qty = itemBasicDto.StdPackQty; + throw new UserFriendlyException($"ERP料号【{detailInput.ItemCode}】未配置收容数"); } - - detailInput.Status = EnumStatus.Open; - - //因为是刚创建的 所以发料数一定是0 + detailInput.Status = EnumStatus.Open; detailInput.IssuedQty = 0; + detailInput.RecommendType = EnumRecommendType.None; } await SetRequestAutoPropertiesAsync(input).ConfigureAwait(false); - var entity = ObjectMapper.Map(input); - - var result = await _injectionRequestManager.CreateByNumberAsync(entity).ConfigureAwait(false); - - var dto = ObjectMapper.Map(result); + var entity = ObjectMapper.Map(input); + var coatingIssueRequestDto = await _coatingIssueRequestAppService.CreateAndHandleAsync(entity).ConfigureAwait(false); - return dto; + return coatingIssueRequestDto; } /// @@ -131,17 +140,7 @@ public class InjectionPlanRequestAppService : SfsStoreRequestAppServiceBase CreateAndHandleAsync(InjectionPlanRequestEditInput input) - { - var injectionRequestDto = await CreateAsync(input).ConfigureAwait(false); - - await HandleAsync(injectionRequestDto.Id).ConfigureAwait(false); - - return injectionRequestDto; - } + } /// /// 获取物品类别列表 @@ -210,5 +209,13 @@ public class InjectionPlanRequestAppService : SfsStoreRequestAppServiceBase() + ; + + CreateMap() + ; + CreateMap() .ReverseMap();