From 936300b38aba65f565d9febb7a1fdabd6bc90027 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Tue, 2 Apr 2024 10:28:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E8=B4=A7?= =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3=E5=85=B3=E9=97=AD=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89=E4=B8=8A=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Orders/PurchaseOrders/PurchaseOrderAppService.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs index 74e382612..a841c2f0f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs @@ -144,7 +144,7 @@ public class PurchaseOrderAppService : var closeItemCode= input.Details.Select(r=>r.ItemCode).ToList(); foreach (var detail in olditem.Details) { - if (closeItemCode.Contains(detail.ItemCode)) + if (closeItemCode.Contains(detail.ItemCode)&& detail.PutAwayQty==0) { detail.LineStatus = EnumOrderStatus.Close; } @@ -266,6 +266,7 @@ public class PurchaseOrderAppService : [HttpPost("{id}/detail/close/{detailId}")] public virtual async Task CloseDetailAsync(Guid id, Guid detailId) { + await _purchaseOrderManager.CloseDetailAsync(id, detailId).ConfigureAwait(false); } From fe954d1143e04ab7f8a6b6ebb3823aeac6b14436 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Tue, 2 Apr 2024 11:17:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=B6=E5=AE=B9=E5=99=A8=E6=A0=87?= =?UTF-8?q?=E5=8C=85=E9=87=8D=E5=86=99=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=9F=BA=E7=A1=80=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ItemContainers/ItemContainerAppService.cs | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs index 79ff81b08..a7210b64c 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs @@ -5,10 +5,14 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Volo.Abp; using Volo.Abp.Caching; +using Volo.Abp.Domain.Repositories; +using Volo.Abp.Uow; using Win_in.Sfs.Basedata.Application.Contracts; using Win_in.Sfs.Basedata.Domain; using Win_in.Sfs.Basedata.Domain.Shared; +using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Basedata.Application; @@ -35,6 +39,33 @@ public class ItemContainerAppService _manager = manager; } + /// + /// 用来重写 新增实体 + /// + /// + /// + /// + [HttpPost("")] + [UnitOfWork] + public override async Task CreateAsync(ItemContainerEditInput input) + { + var existEntity = await _repository.FirstOrDefaultAsync(p=>p.ContainerCode==input.ContainerCode).ConfigureAwait(false); + if (existEntity != null) + { + throw new UserFriendlyException($"{input.ContainerCode} 已存在"); + } + + var itemBasic = await ItemBasicAppService.GetByCodeAsync(input.ItemCode).ConfigureAwait(false); + Check.NotNull(itemBasic, "物品代码", $"物品 {input.ItemCode} 不存在"); + if(itemBasic != null) + { + input.BasicUom = itemBasic.BasicUom; + } + + + return await base.CreateAsync(input).ConfigureAwait(false); + } + [HttpPost("upsert")] public virtual async Task UpsertAsync(ItemContainerEditInput input) { From 225aafd95c771a446f4e7ccc5d0481536be327ac Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Tue, 2 Apr 2024 13:45:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=8C=E5=B7=A5?= =?UTF-8?q?=E8=BD=AC=E5=82=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Enums/Inventory/EnumTransSubType.cs | 16 ++++++++++++ .../TransferNotes/ITransferNoteAppService.cs | 3 +++ .../TransferNotes/TransferNoteAppService.cs | 25 ++++++++++++++++++- 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransSubType.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransSubType.cs index 57d1e43cd..172af90c4 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransSubType.cs +++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransSubType.cs @@ -67,6 +67,22 @@ public enum EnumTransSubType [Display(Name = "客户库位调拨(客户储位调拨)")] Transfer_Customer = 3105, + /// + /// 注塑完工转储 + /// + [Display(Name = "注塑完工转储")] + Transfer_Injection = 3106, + /// + /// 喷涂完工转储 + /// + [Display(Name = "喷涂完工转储")] + Transfer_Coating = 3107, + /// + /// 装配完工转储 + /// + [Display(Name = "装配完工转储")] + Transfer_Assemble = 3108, + /// /// 客户库位调拨(客户储位调拨) /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferNotes/ITransferNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferNotes/ITransferNoteAppService.cs index aceb3662a..515522c31 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferNotes/ITransferNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferNotes/ITransferNoteAppService.cs @@ -87,4 +87,7 @@ public interface ITransferNoteAppService : /// /// Task SplitPacking_IssueAsync(TransferNoteEditInput transferNoteEditInput, SplitPacking_UpdateJobDetailInput updateJobDetailInput); + Task> GetInjectionTransferListAsync(SfsStoreRequestInputBase sfsRequestDTO, bool includeDetails = false, CancellationToken cancellationToken = default); + Task> GetCoatingTransferListAsync(SfsStoreRequestInputBase sfsRequestDTO, bool includeDetails = false, CancellationToken cancellationToken = default); + Task> GetAssembleTransferListAsync(SfsStoreRequestInputBase sfsRequestDTO, bool includeDetails = false, CancellationToken cancellationToken = default); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs index 2848d8650..0e2505fc9 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs @@ -261,7 +261,30 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase return await GetSubTypeListAsync(sfsRequestDTO, EnumTransSubType.Transfer_Inside, includeDetails, cancellationToken).ConfigureAwait(false); } - + [HttpPost("get-Injection-list")] + public virtual async Task> GetInjectionTransferListAsync( + SfsStoreRequestInputBase sfsRequestDTO, bool includeDetails = false, + CancellationToken cancellationToken = default) + { + return await GetSubTypeListAsync(sfsRequestDTO, EnumTransSubType.Transfer_Injection, includeDetails, + cancellationToken).ConfigureAwait(false); + } + [HttpPost("get-coating-list")] + public virtual async Task> GetCoatingTransferListAsync( + SfsStoreRequestInputBase sfsRequestDTO, bool includeDetails = false, + CancellationToken cancellationToken = default) + { + return await GetSubTypeListAsync(sfsRequestDTO, EnumTransSubType.Transfer_Coating, includeDetails, + cancellationToken).ConfigureAwait(false); + } + [HttpPost("get-assemble-list")] + public virtual async Task> GetAssembleTransferListAsync( + SfsStoreRequestInputBase sfsRequestDTO, bool includeDetails = false, + CancellationToken cancellationToken = default) + { + return await GetSubTypeListAsync(sfsRequestDTO, EnumTransSubType.Transfer_Assemble, includeDetails, + cancellationToken).ConfigureAwait(false); + } /// /// 按条件获取客户储位间调拨的分页列表 /// request sample