器具记录更新

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ContainerNotes/DTOs/ContainerNoteDTO.cs

@@ -14,6 +14,12 @@ public class ContainerNoteDTO : SfsStoreDTOBase<ContainerNoteDetailDTO>, IHasJob
     [Display(Name = "任务ID")]
     public string JobNumber { get; set; }
 
+    /// <summary>
+    /// 器具申请号码
+    /// </summary>
+    [Display(Name = "器具申请号码")]   
+    public string ContainerRequestNumber { get; set; }
+
     /// <summary>
     /// 呼叫库位代码
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ContainerNotes/Inputs/ContainerNoteEditInput.cs

@@ -21,9 +21,15 @@ public class ContainerNoteEditInput : SfsStoreCreateOrUpdateInputBase
     /// 任务ID
     /// </summary>
     [Display(Name = "任务ID")]   
-    [Required(ErrorMessage = "{0}是必填项")]
     public string JobNumber { get; set; }
 
+    /// <summary>
+    /// 器具申请号码
+    /// </summary>
+    [Display(Name = "器具申请号码")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    public string ContainerRequestNumber { get; set; }
+
     /// <summary>
     /// 呼叫库位代码
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ContainerNotes/Inputs/ContainerNoteImportInput.cs

@@ -12,6 +12,13 @@ public class ContainerNoteImportInput : SfsStoreImportInputBase, IHasJobNumber
     [Display(Name = "任务ID")]
     public string JobNumber { get; set; }
 
+    /// <summary>
+    /// 器具申请号码
+    /// </summary>
+    [Display(Name = "器具申请号码")]
+    [Required(ErrorMessage = "{0}是必填项")]
+    public string ContainerRequestNumber { get; set; }
+
     /// <summary>
     /// 呼叫库位代码
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ContainerNotes/ContainerNote.cs

@@ -19,6 +19,12 @@ public class ContainerNote : SfsStoreAggregateRootBase<ContainerNoteDetail>, IHa
     [IgnoreUpdate]
     public string JobNumber { get; set; }
 
+    /// <summary>
+    /// 器具申请号码
+    /// </summary>
+    [Display(Name = "器具申请号码")]   
+    public string ContainerRequestNumber { get; set; }
+
     /// <summary>
     /// 呼叫库位代码
     /// </summary>

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

@@ -35,5 +35,35 @@ public partial class StoreEventAutoMapperProfile : Profile
             .Ignore(x => x.Details)
             ;
 
+        CreateMap<ContainerRequest, ContainerNoteEditInput>()
+           .ForMember(x => x.ContainerRequestNumber, y => y.MapFrom(d => d.Number))
+           .Ignore(x => x.JobNumber)
+           .Ignore(x => x.Confirmed)
+           .Ignore(x => x.Details);
+
+        CreateMap<BalanceDTO, ContainerNoteDetailInput>()
+            .ForMember(x => x.FromContainerCode, y => y.MapFrom(d => d.ContainerCode))
+            .ForMember(x => x.FromLocationCode, y => y.MapFrom(d => d.LocationCode))
+            .ForMember(x => x.FromLocationErpCode, y => y.MapFrom(d => d.LocationErpCode))
+            .ForMember(x => x.FromWarehouseCode, y => y.MapFrom(d => d.WarehouseCode))
+            .ForMember(x => x.FromLocationArea, y => y.MapFrom(d => d.LocationArea))
+            .ForMember(x => x.FromLocationGroup, y => y.MapFrom(d => d.LocationGroup))
+            .ForMember(x => x.FromLot, y => y.MapFrom(d => d.Lot))
+            .ForMember(x => x.FromPackingCode, y => y.MapFrom(d => d.PackingCode))
+            .ForMember(x => x.FromStatus, y => y.MapFrom(d => d.Status))
+            .ForMember(x => x.FromWarehouseCode, y => y.MapFrom(d => d.WarehouseCode))
+            .ForMember(x => x.ToContainerCode, y => y.MapFrom(d => d.ContainerCode))
+            .ForMember(x => x.ToLocationCode, y => y.MapFrom(d => d.LocationCode))
+            .ForMember(x => x.ToLocationErpCode, y => y.MapFrom(d => d.LocationErpCode))
+            .ForMember(x => x.ToWarehouseCode, y => y.MapFrom(d => d.WarehouseCode))
+            .ForMember(x => x.ToLocationArea, y => y.MapFrom(d => d.LocationArea))
+            .ForMember(x => x.ToLocationGroup, y => y.MapFrom(d => d.LocationGroup))
+            .ForMember(x => x.ToLot, y => y.MapFrom(d => d.Lot))
+            .ForMember(x => x.ToPackingCode, y => y.MapFrom(d => d.PackingCode))
+            .ForMember(x => x.ToStatus, y => y.MapFrom(d => d.Status))
+            .ForMember(x => x.ToWarehouseCode, y => y.MapFrom(d => d.WarehouseCode))
+            .Ignore(t => t.StdPackQty)           
+            .IgnoreIHasRecommendAndHandledFrom();
+
     }
 }

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

@@ -25,17 +25,22 @@ public class ContainerRequestEventHandler
         , ILocalEventHandler<SfsCreatedEntityEventData<List<ContainerRequest>>>
 
 {
-    
+    private readonly IContainerNoteAppService _containerNoteApp;
     private readonly IContainerJobAppService _containerJobApp;
+    private readonly IEquipmentLocAppService _equipmentLocApp;
+    
 
     private readonly IContainerRequestManager _containerRequestManager;
 
     public ContainerRequestEventHandler(
-        IContainerJobAppService containerJobApp       
+        IContainerNoteAppService containerNoteApp,
-       , IContainerRequestManager containerRequestManager)
+        IContainerJobAppService containerJobApp,
+        IEquipmentLocAppService equipmentLocApp,
+        IContainerRequestManager containerRequestManager)
     {
-
+        _containerNoteApp = containerNoteApp;
         _containerJobApp = containerJobApp;
+        _equipmentLocApp= equipmentLocApp;
         _containerRequestManager = containerRequestManager;
     }
 
@@ -102,7 +107,8 @@ public class ContainerRequestEventHandler
         //东阳特殊逻辑
         if (entity.DirectCreateNote)
         {
-            
+            var noteCreateInput = await BuildContainerNoteAsync(entity).ConfigureAwait(false);
+            await _containerNoteApp.CreateAsync(noteCreateInput).ConfigureAwait(false);
         }
         else
         {
@@ -115,6 +121,31 @@ public class ContainerRequestEventHandler
     #region 私有
 
 
+    private async Task<ContainerNoteEditInput> BuildContainerNoteAsync(ContainerRequest request)
+    {      
+
+        var createInput = ObjectMapper.Map<ContainerRequest, ContainerNoteEditInput>(request);               
+
+        createInput.Details = new List<ContainerNoteDetailInput>();
+
+        foreach (var detail in request.Details)
+        {
+            detail.ToLocationCode = request.RequestLocationCode;
+
+            var container = await _equipmentLocApp.GetByCodeAsync(detail.ToLocationCode).ConfigureAwait(false);
+
+            if(container != null)
+            {
+                detail.ItemCode = container.Code;
+            }
+                        
+        }
+
+        return createInput;
+    }
+
+
+
     private async Task<ContainerJobEditInput> BuildContainerJobsAsync(ContainerRequest request)
     {