Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

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;
     }
 
+    /// <summary>
+    /// 用来重写 新增实体
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    /// <exception cref="UserFriendlyException"></exception>
+    [HttpPost("")]
+    [UnitOfWork]
+    public override async Task<ItemContainerDTO> 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)
     {

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,
 
+    /// <summary>
+    /// 注塑完工转储
+    /// </summary>
+    [Display(Name = "注塑完工转储")]
+    Transfer_Injection = 3106,
+    /// <summary>
+    /// 喷涂完工转储
+    /// </summary>
+    [Display(Name = "喷涂完工转储")]
+    Transfer_Coating = 3107,
+    /// <summary>
+    /// 装配完工转储
+    /// </summary>
+    [Display(Name = "装配完工转储")]
+    Transfer_Assemble = 3108,
+
     /// <summary>
     /// 客户库位调拨(客户储位调拨)
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferNotes/ITransferNoteAppService.cs

@@ -87,4 +87,7 @@ public interface ITransferNoteAppService :
     /// <param name="updateJobDetailInput"></param>
     /// <returns></returns>
     Task<TransferNoteDTO> SplitPacking_IssueAsync(TransferNoteEditInput transferNoteEditInput, SplitPacking_UpdateJobDetailInput updateJobDetailInput);
+    Task<PagedResultDto<TransferNoteDTO>> GetInjectionTransferListAsync(SfsStoreRequestInputBase sfsRequestDTO, bool includeDetails = false, CancellationToken cancellationToken = default);
+    Task<PagedResultDto<TransferNoteDTO>> GetCoatingTransferListAsync(SfsStoreRequestInputBase sfsRequestDTO, bool includeDetails = false, CancellationToken cancellationToken = default);
+    Task<PagedResultDto<TransferNoteDTO>> GetAssembleTransferListAsync(SfsStoreRequestInputBase sfsRequestDTO, bool includeDetails = false, CancellationToken cancellationToken = default);
 }

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<PagedResultDto<TransferNoteDTO>> 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<PagedResultDto<TransferNoteDTO>> 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<PagedResultDto<TransferNoteDTO>> GetAssembleTransferListAsync(
+    SfsStoreRequestInputBase sfsRequestDTO, bool includeDetails = false,
+    CancellationToken cancellationToken = default)
+    {
+        return await GetSubTypeListAsync(sfsRequestDTO, EnumTransSubType.Transfer_Assemble, includeDetails,
+            cancellationToken).ConfigureAwait(false);
+    }
     /// <summary>
     ///     按条件获取客户储位间调拨的分页列表
     ///     request sample

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);
     }