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

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/ThirdLocationJobController.cs

@@ -51,10 +51,11 @@ public class ThirdLocationJobController : AbpController
     ///     执行任务明细
     /// </summary>
     /// <returns></returns>
-    [HttpPost("ExecuteDetail/{masterId}")]
-    public async Task ExecuteDetailAsync(Guid masterId, List<ThirdLocationJobDetailDTO> detailDtoList)
+    [HttpPost("ExecuteDetail")]
+    public virtual async Task<ThirdLocationJobDTO> ExecuteDetailAsync(List<ThirdLocationJobDetailDTO> detailDtoList)
     {
-        await _thirdLocationJobAppService.ExecuteDetailAsync(masterId,detailDtoList).ConfigureAwait(false);
+        return await _thirdLocationJobAppService.ExecuteDetailAsync(detailDtoList).ConfigureAwait(false);
+        //return await _thirdLocationJobAppService.ExecuteDetail2Async(detailDtoList).ConfigureAwait(false);
     }
 
     /// <summary>

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs

@@ -110,30 +110,7 @@ public class KittingAppService : SfsBaseDataWithCodeAppServiceBase<Kitting, Kitt
     [Route("{id}")]
     public override async Task<KittingDTO> UpdateAsync(Guid id, KittingEditInput input)
     {
-        var detailquery = await _repository.WithDetailsAsync().ConfigureAwait(false);
-        var first = detailquery.FirstOrDefault(p => p.Code == input.Code);
-        if (first != null)
-        {
-            throw new UserFriendlyException($"已存在编码:{input.Code}的Kitting箱");
-        }
-        else
-        {
-            return await base.UpdateAsync(id, input).ConfigureAwait(false);
-        }
-        //var detailquery = _repository.WithDetails();
-        //var first = detailquery.FirstOrDefault(p => p.Id == id);
-        //var ids=input.Details.Select(p => p.Id);
-        //first.Details.Where(p =>ids.Contains(p.Id));
-       
-
-        //var entity = ObjectMapper.Map<KittingEditInput, Kitting>(input);
-        ////entity.SetId(id);
-        ////entity.Code = first.Code;
-        //await _repository.UpsertAsync(entity).ConfigureAwait(false);
-        //var firstEntity = detailquery.FirstOrDefault(p => p.Id == id);
-        //return ObjectMapper.Map<Kitting, KittingDTO>(first);
-
-
+        return await base.UpdateAsync(id, input).ConfigureAwait(false);
     }
 
     [HttpPost("update")]

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/ThirdLocationJobs/IThirdLocationJobAppService.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -9,11 +9,6 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 public interface IThirdLocationJobAppService
     : ISfsJobAppServiceBase<ThirdLocationJobDTO, SfsJobRequestInputBase, ThirdLocationJobCheckInput, ThirdLocationJobEditInput>
 {
-    /// <summary>
-    ///     执行任务明细
-    /// </summary>
-    /// <returns></returns>
-    Task ExecuteDetailAsync(Guid masterId,List<ThirdLocationJobDetailDTO> detailDto);
 
     Task<List<ThirdLocationJobDTO>> GetByRequestNumberAsync(string requestNumber);
 
@@ -23,4 +18,11 @@ public interface IThirdLocationJobAppService
     /// <param name="id"></param>
     /// <returns></returns>
     Task CompleteAsync(Guid id);
+
+    /// <summary>
+    ///     执行任务明细
+    /// </summary>
+    /// <returns></returns>
+    Task<ThirdLocationJobDTO> ExecuteDetailAsync(List<ThirdLocationJobDetailDTO> detailDtoList);
+    
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/ThirdLocationJobs/ThirdLocationJobAppService.cs

@@ -84,10 +84,10 @@ public class ThirdLocationJobAppService
     ///     执行任务明细
     /// </summary>
     /// <returns></returns>
-    [HttpPost("ExecuteDetail/{masterId}")]
-    public async Task ExecuteDetailAsync(Guid masterId,List<ThirdLocationJobDetailDTO> detailDtoList)
+    [HttpPost("execute-detail")]
+    public virtual async Task<ThirdLocationJobDTO> ExecuteDetailAsync(List<ThirdLocationJobDetailDTO> detailDtoList)
     {
-        var thirdLocationJob=await _repository.GetAsync(masterId).ConfigureAwait(false);
+        var thirdLocationJob=await _repository.GetAsync(detailDtoList.First().MasterID).ConfigureAwait(false);
         thirdLocationJob.JobStatus = EnumJobStatus.Partial;
 
         var tempDetailDto= new List<ThirdLocationJobDetailDTO>();
@@ -105,7 +105,7 @@ public class ThirdLocationJobAppService
         var transferLogs = await BuildTransferLogsByFromTransportAsync(thirdLocationJob, tempDetailDto).ConfigureAwait(false);
         await _transferLogAppService.AddManyAsync(transferLogs).ConfigureAwait(false);
 
-        var jobDto=await GetAsync(masterId).ConfigureAwait(false);
+        var jobDto=await GetAsync(detailDtoList.First().MasterID).ConfigureAwait(false);
         var tempDetailDtos = new List<ThirdLocationJobDetailDTO>();
         foreach (var detailDto in detailDtoList)
         {
@@ -122,7 +122,9 @@ public class ThirdLocationJobAppService
 
         await UpdateJobStatusAsync(thirdLocationJob).ConfigureAwait(false);
 
-        await _repository.UpdateAsync(thirdLocationJob).ConfigureAwait(false);
+        var result=await _repository.UpdateAsync(thirdLocationJob).ConfigureAwait(false);
+
+        return ObjectMapper.Map<ThirdLocationJob, ThirdLocationJobDTO>(result);
     }
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ThirdLocationRequests/ThirdLocationRequestAppService.cs

@@ -64,7 +64,7 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase<Thir
         {
             var transportLocationDto = await _locationAppService.GetFirstByTypeAsync(EnumLocationType.TRANSPORT).ConfigureAwait(false);
             var fromLocationDto=await _locationAppService.GetByCodeAsync(detailInput.FromLocationCode).ConfigureAwait(false);
-            var toLocationDto = await _locationAppService.GetByCodeAsync(detailInput.FromLocationCode).ConfigureAwait(false);
+            var toLocationDto = await _locationAppService.GetByCodeAsync(detailInput.ToLocationCode).ConfigureAwait(false);
             var itemBasicDto= await _itemBasicAppService.GetByCodeAsync(detailInput.ItemCode).ConfigureAwait(false);
 
             detailInput.OnTheWayLocationCode = transportLocationDto.Code;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ExchangeData/ExchangeDataDbContextModelCreatingExtensions.cs

@@ -30,7 +30,7 @@ public static class ExchangeDataDbContextModelCreatingExtensions
             b.Property(p => p.ReadTime);
             b.Property(p => p.ErrorCode).IsRequired().HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
             b.Property(p => p.ErrorMessage).HasMaxLength(SfsPropertyConst.RemarkLength);
-            b.Property(p => p.TyrpNumber).IsRequired(); //.HasDefaultValueSql()
+            b.Property(p => p.TyrpNumber).IsRequired().HasDefaultValueSql();
             //Relations
 
             //Indexes

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Notes/CoatingIssueNoteAutoMapperProfile.cs

@@ -1,6 +1,8 @@
 using AutoMapper;
+using Microsoft.OpenApi.Extensions;
 using Volo.Abp.AutoMapper;
 using Win_in.Sfs.Wms.Inventory.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 
 namespace Win_in.Sfs.Wms.Store.Event;
@@ -47,5 +49,58 @@ public partial class StoreEventAutoMapperProfile : Profile
             .ForMember(x => x.ToWarehouseCode, y => y.MapFrom(t => t.HandledToWarehouseCode))
 
             ;
+
+        CreateMap<CoatingIssueNote, IssueNoteDTO>()
+       .ForMember(x => x.RequestType, y => y.MapFrom(t => t.IssueRequestType.GetDisplayName()))
+       .Ignore(x => x.Workshop)
+
+       ;
+        CreateMap<CoatingIssueNoteDetail, IssueNoteDetailDTO>()
+          .ForMember(x => x.IssueTime, y => y.MapFrom(t => t.CreationTime))
+          .ForMember(x => x.WorkStation, y => y.MapFrom(t => t.ProdLine))
+          .ForMember(x => x.RecommendQty, y => y.MapFrom(t => t.RecommendFromQty))
+          .ForMember(x => x.RecommendContainerCode, y => y.MapFrom(t => t.RecommendFromContainerCode))
+          .ForMember(x => x.RecommendPackingCode, y => y.MapFrom(t => t.RecommendFromPackingCode))
+          .ForMember(x => x.RecommendSupplierBatch, y => y.MapFrom(t => t.RecommendFromSupplierBatch))
+          .ForMember(x => x.RecommendArriveDate, y => y.MapFrom(t => t.RecommendFromArriveDate))
+          .ForMember(x => x.RecommendProduceDate, y => y.MapFrom(t => t.RecommendFromProduceDate))
+          .ForMember(x => x.RecommendExpireDate, y => y.MapFrom(t => t.RecommendFromExpireDate))
+          .ForMember(x => x.RecommendLot, y => y.MapFrom(t => t.RecommendFromLot))
+          .ForMember(x => x.HandledContainerCode, y => y.MapFrom(t => t.HandledToContainerCode))
+          .ForMember(x => x.HandledPackingCode, y => y.MapFrom(t => t.HandledToPackingCode))
+          .ForMember(x => x.HandledSupplierBatch, y => y.MapFrom(t => t.HandledToSupplierBatch))
+          .ForMember(x => x.HandledArriveDate, y => y.MapFrom(t => t.HandledToArriveDate))
+          .ForMember(x => x.HandledProduceDate, y => y.MapFrom(t => t.HandledToProduceDate))
+          .ForMember(x => x.HandledExpireDate, y => y.MapFrom(t => t.HandledToExpireDate))
+          .ForMember(x => x.HandledLot, y => y.MapFrom(t => t.HandledToLot))
+          .ForMember(x => x.HandledQty, y => y.MapFrom(t => t.HandledToQty))
+          .ForMember(x => x.FromPackingCode, y => y.MapFrom(t => t.HandledFromPackingCode))
+          .ForMember(x => x.ToPackingCode, y => y.MapFrom(t => t.HandledToPackingCode))
+          .ForMember(x => x.FromContainerCode, y => y.MapFrom(t => t.HandledFromContainerCode))
+          .ForMember(x => x.ToContainerCode, y => y.MapFrom(t => t.HandledToContainerCode))
+          .ForMember(x => x.FromLot, y => y.MapFrom(t => t.HandledFromLot))
+          .ForMember(x => x.ToLot, y => y.MapFrom(t => t.HandledToLot))
+          .ForMember(x => x.SupplierBatch, y => y.MapFrom(t => t.HandledToSupplierBatch))
+          .ForMember(x => x.ArriveDate, y => y.MapFrom(t => t.HandledToArriveDate))
+          .ForMember(x => x.ProduceDate, y => y.MapFrom(t => t.HandledToProduceDate))
+          .ForMember(x => x.ExpireDate, y => y.MapFrom(t => t.HandledToExpireDate))
+          .ForMember(x => x.FromLocationCode, y => y.MapFrom(t => t.HandledFromLocationCode))
+          .ForMember(x => x.FromLocationArea, y => y.MapFrom(t => t.HandledFromLocationArea))
+          .ForMember(x => x.FromLocationGroup, y => y.MapFrom(t => t.HandledFromLocationGroup))
+          .ForMember(x => x.FromLocationErpCode, y => y.MapFrom(t => t.HandledFromLocationErpCode))
+          .ForMember(x => x.FromWarehouseCode, y => y.MapFrom(t => t.HandledFromWarehouseCode))
+          .ForMember(x => x.ToLocationCode, y => y.MapFrom(t => t.HandledToLocationCode))
+          .ForMember(x => x.ToLocationArea, y => y.MapFrom(t => t.HandledToLocationArea))
+          .ForMember(x => x.ToLocationGroup, y => y.MapFrom(t => t.HandledToLocationGroup))
+          .ForMember(x => x.ToLocationErpCode, y => y.MapFrom(t => t.HandledToLocationErpCode))
+          .ForMember(x => x.ToWarehouseCode, y => y.MapFrom(t => t.HandledToWarehouseCode))
+          .ForMember(x => x.FromStatus, y => y.MapFrom(t => t.Status))
+          .ForMember(x => x.ToStatus, y => y.MapFrom(t => t.Status))
+          .ForMember(x => x.Qty, y => y.MapFrom(t => t.HandledToQty))
+          .ForMember(x => x.ItemCode, y => y.MapFrom(t => t.ItemCode))
+          .Ignore(x => x.ExpiredTime)
+
+         ;
+
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Notes/InjectionIssueNoteAutoMapperProfile.cs

@@ -0,0 +1,105 @@
+using AutoMapper;
+using Microsoft.OpenApi.Extensions;
+using Volo.Abp.AutoMapper;
+using Win_in.Sfs.Wms.Inventory.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Event;
+
+public partial class StoreEventAutoMapperProfile : Profile
+{
+    private void InjectionIssueNoteAutoMapperProfile()
+    {
+        CreateMap<InjectionIssueNoteDetail, TransferLogEditInput>()
+            .Ignore(x => x.DocNumber)
+            .Ignore(x => x.JobNumber)
+            .Ignore(x => x.Worker)
+            .Ignore(x => x.TransType)
+            .Ignore(x => x.ExtraProperties)
+            .Ignore(x => x.TransSubType)
+
+            .ForMember(x => x.Qty, y => y.MapFrom(t => t.HandledToQty))
+            .ForMember(x => x.SupplierBatch, y => y.MapFrom(t => t.HandledFromSupplierBatch))
+            .ForMember(x => x.ArriveDate, y => y.MapFrom(t => t.HandledFromArriveDate))
+            .ForMember(x => x.ProduceDate, y => y.MapFrom(t => t.HandledFromProduceDate))
+            .ForMember(x => x.ExpireDate, y => y.MapFrom(t => t.HandledFromExpireDate))
+
+            .ForMember(x => x.FromPackingCode, y => y.MapFrom(t => t.HandledFromPackingCode))
+            .ForMember(x => x.FromContainerCode, y => y.MapFrom(t => t.HandledFromContainerCode))
+
+            .ForMember(x => x.FromLot, y => y.MapFrom(t => t.HandledFromLot))
+            .ForMember(x => x.FromStatus, y => y.MapFrom(t => t.Status))
+
+            .ForMember(x => x.FromLocationCode, y => y.MapFrom(t => t.HandledFromLocationCode))
+            .ForMember(x => x.FromLocationGroup, y => y.MapFrom(t => t.HandledFromLocationGroup))
+            .ForMember(x => x.FromLocationArea, y => y.MapFrom(t => t.HandledFromLocationArea))
+            .ForMember(x => x.FromLocationErpCode, y => y.MapFrom(t => t.HandledFromLocationErpCode))
+            .ForMember(x => x.FromWarehouseCode, y => y.MapFrom(t => t.HandledFromWarehouseCode))
+
+            .ForMember(x => x.ToLot, y => y.MapFrom(t => t.HandledToLot))
+            .ForMember(x => x.ToStatus, y => y.MapFrom(t => t.Status))
+            .ForMember(x => x.ToPackingCode, y => y.MapFrom(t => t.HandledToPackingCode))
+            .ForMember(x => x.ToContainerCode, y => y.MapFrom(t => t.HandledToContainerCode))
+
+            .ForMember(x => x.ToLocationCode, y => y.MapFrom(t => t.HandledToLocationCode))
+            .ForMember(x => x.ToLocationGroup, y => y.MapFrom(t => t.HandledToLocationGroup))
+            .ForMember(x => x.ToLocationArea, y => y.MapFrom(t => t.HandledToLocationArea))
+            .ForMember(x => x.ToLocationErpCode, y => y.MapFrom(t => t.HandledToLocationErpCode))
+            .ForMember(x => x.ToWarehouseCode, y => y.MapFrom(t => t.HandledToWarehouseCode))
+
+            ;
+
+        CreateMap<InjectionIssueNote, IssueNoteDTO>()
+       .ForMember(x => x.RequestType, y => y.MapFrom(t => t.IssueRequestType.GetDisplayName()))
+       .Ignore(x => x.Workshop)
+
+       ;
+        CreateMap<InjectionIssueNoteDetail, IssueNoteDetailDTO>()
+          .ForMember(x => x.IssueTime, y => y.MapFrom(t => t.CreationTime))
+          .ForMember(x => x.WorkStation, y => y.MapFrom(t => t.ProdLine))
+          .ForMember(x => x.RecommendQty, y => y.MapFrom(t => t.RecommendFromQty))
+          .ForMember(x => x.RecommendContainerCode, y => y.MapFrom(t => t.RecommendFromContainerCode))
+          .ForMember(x => x.RecommendPackingCode, y => y.MapFrom(t => t.RecommendFromPackingCode))
+          .ForMember(x => x.RecommendSupplierBatch, y => y.MapFrom(t => t.RecommendFromSupplierBatch))
+          .ForMember(x => x.RecommendArriveDate, y => y.MapFrom(t => t.RecommendFromArriveDate))
+          .ForMember(x => x.RecommendProduceDate, y => y.MapFrom(t => t.RecommendFromProduceDate))
+          .ForMember(x => x.RecommendExpireDate, y => y.MapFrom(t => t.RecommendFromExpireDate))
+          .ForMember(x => x.RecommendLot, y => y.MapFrom(t => t.RecommendFromLot))
+          .ForMember(x => x.HandledContainerCode, y => y.MapFrom(t => t.HandledToContainerCode))
+          .ForMember(x => x.HandledPackingCode, y => y.MapFrom(t => t.HandledToPackingCode))
+          .ForMember(x => x.HandledSupplierBatch, y => y.MapFrom(t => t.HandledToSupplierBatch))
+          .ForMember(x => x.HandledArriveDate, y => y.MapFrom(t => t.HandledToArriveDate))
+          .ForMember(x => x.HandledProduceDate, y => y.MapFrom(t => t.HandledToProduceDate))
+          .ForMember(x => x.HandledExpireDate, y => y.MapFrom(t => t.HandledToExpireDate))
+          .ForMember(x => x.HandledLot, y => y.MapFrom(t => t.HandledToLot))
+          .ForMember(x => x.HandledQty, y => y.MapFrom(t => t.HandledToQty))
+          .ForMember(x => x.FromPackingCode, y => y.MapFrom(t => t.HandledFromPackingCode))
+          .ForMember(x => x.ToPackingCode, y => y.MapFrom(t => t.HandledToPackingCode))
+          .ForMember(x => x.FromContainerCode, y => y.MapFrom(t => t.HandledFromContainerCode))
+          .ForMember(x => x.ToContainerCode, y => y.MapFrom(t => t.HandledToContainerCode))
+          .ForMember(x => x.FromLot, y => y.MapFrom(t => t.HandledFromLot))
+          .ForMember(x => x.ToLot, y => y.MapFrom(t => t.HandledToLot))
+          .ForMember(x => x.SupplierBatch, y => y.MapFrom(t => t.HandledToSupplierBatch))
+          .ForMember(x => x.ArriveDate, y => y.MapFrom(t => t.HandledToArriveDate))
+          .ForMember(x => x.ProduceDate, y => y.MapFrom(t => t.HandledToProduceDate))
+          .ForMember(x => x.ExpireDate, y => y.MapFrom(t => t.HandledToExpireDate))
+          .ForMember(x => x.FromLocationCode, y => y.MapFrom(t => t.HandledFromLocationCode))
+          .ForMember(x => x.FromLocationArea, y => y.MapFrom(t => t.HandledFromLocationArea))
+          .ForMember(x => x.FromLocationGroup, y => y.MapFrom(t => t.HandledFromLocationGroup))
+          .ForMember(x => x.FromLocationErpCode, y => y.MapFrom(t => t.HandledFromLocationErpCode))
+          .ForMember(x => x.FromWarehouseCode, y => y.MapFrom(t => t.HandledFromWarehouseCode))
+          .ForMember(x => x.ToLocationCode, y => y.MapFrom(t => t.HandledToLocationCode))
+          .ForMember(x => x.ToLocationArea, y => y.MapFrom(t => t.HandledToLocationArea))
+          .ForMember(x => x.ToLocationGroup, y => y.MapFrom(t => t.HandledToLocationGroup))
+          .ForMember(x => x.ToLocationErpCode, y => y.MapFrom(t => t.HandledToLocationErpCode))
+          .ForMember(x => x.ToWarehouseCode, y => y.MapFrom(t => t.HandledToWarehouseCode))
+          .ForMember(x => x.FromStatus, y => y.MapFrom(t => t.Status))
+          .ForMember(x => x.ToStatus, y => y.MapFrom(t => t.Status))
+          .ForMember(x => x.Qty, y => y.MapFrom(t => t.HandledToQty))
+          .ForMember(x => x.ItemCode, y => y.MapFrom(t => t.ItemCode))
+          .Ignore(x => x.ExpiredTime)
+
+         ;
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Notes/InjectionNoteAutoMapperProfile.cs

@@ -1,51 +0,0 @@
-using AutoMapper;
-using Volo.Abp.AutoMapper;
-using Win_in.Sfs.Wms.Inventory.Application.Contracts;
-using Win_in.Sfs.Wms.Store.Domain;
-
-namespace Win_in.Sfs.Wms.Store.Event;
-
-public partial class StoreEventAutoMapperProfile : Profile
-{
-    private void InjectionIssueNoteAutoMapperProfile()
-    {
-        CreateMap<InjectionIssueNoteDetail, TransferLogEditInput>()
-            .Ignore(x => x.DocNumber)
-            .Ignore(x => x.JobNumber)
-            .Ignore(x => x.Worker)
-            .Ignore(x => x.TransType)
-            .Ignore(x => x.ExtraProperties)
-            .Ignore(x => x.TransSubType)
-
-            .ForMember(x => x.Qty, y => y.MapFrom(t => t.HandledToQty))
-            .ForMember(x => x.SupplierBatch, y => y.MapFrom(t => t.HandledFromSupplierBatch))
-            .ForMember(x => x.ArriveDate, y => y.MapFrom(t => t.HandledFromArriveDate))
-            .ForMember(x => x.ProduceDate, y => y.MapFrom(t => t.HandledFromProduceDate))
-            .ForMember(x => x.ExpireDate, y => y.MapFrom(t => t.HandledFromExpireDate))
-
-            .ForMember(x => x.FromPackingCode, y => y.MapFrom(t => t.HandledFromPackingCode))
-            .ForMember(x => x.FromContainerCode, y => y.MapFrom(t => t.HandledFromContainerCode))
-
-            .ForMember(x => x.FromLot, y => y.MapFrom(t => t.HandledFromLot))
-            .ForMember(x => x.FromStatus, y => y.MapFrom(t => t.Status))
-
-            .ForMember(x => x.FromLocationCode, y => y.MapFrom(t => t.HandledFromLocationCode))
-            .ForMember(x => x.FromLocationGroup, y => y.MapFrom(t => t.HandledFromLocationGroup))
-            .ForMember(x => x.FromLocationArea, y => y.MapFrom(t => t.HandledFromLocationArea))
-            .ForMember(x => x.FromLocationErpCode, y => y.MapFrom(t => t.HandledFromLocationErpCode))
-            .ForMember(x => x.FromWarehouseCode, y => y.MapFrom(t => t.HandledFromWarehouseCode))
-
-            .ForMember(x => x.ToLot, y => y.MapFrom(t => t.HandledToLot))
-            .ForMember(x => x.ToStatus, y => y.MapFrom(t => t.Status))
-            .ForMember(x => x.ToPackingCode, y => y.MapFrom(t => t.HandledToPackingCode))
-            .ForMember(x => x.ToContainerCode, y => y.MapFrom(t => t.HandledToContainerCode))
-
-            .ForMember(x => x.ToLocationCode, y => y.MapFrom(t => t.HandledToLocationCode))
-            .ForMember(x => x.ToLocationGroup, y => y.MapFrom(t => t.HandledToLocationGroup))
-            .ForMember(x => x.ToLocationArea, y => y.MapFrom(t => t.HandledToLocationArea))
-            .ForMember(x => x.ToLocationErpCode, y => y.MapFrom(t => t.HandledToLocationErpCode))
-            .ForMember(x => x.ToWarehouseCode, y => y.MapFrom(t => t.HandledToWarehouseCode))
-
-            ;
-    }
-}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Notes/SparePartIssueNoteAutoMapperProfile.cs

@@ -1,6 +1,8 @@
 using AutoMapper;
+using Microsoft.OpenApi.Extensions;
 using Volo.Abp.AutoMapper;
 using Win_in.Sfs.Wms.Inventory.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 
 namespace Win_in.Sfs.Wms.Store.Event;
@@ -47,5 +49,58 @@ public partial class StoreEventAutoMapperProfile : Profile
             .ForMember(x => x.ToWarehouseCode, y => y.MapFrom(t => t.HandledToWarehouseCode))
 
             ;
+
+        CreateMap<SparePartIssueNote, IssueNoteDTO>()
+       .ForMember(x => x.RequestType, y => y.MapFrom(t => t.IssueRequestType.GetDisplayName()))
+       .Ignore(x => x.Workshop)
+
+       ;
+        CreateMap<SparePartIssueNoteDetail, IssueNoteDetailDTO>()
+          .ForMember(x => x.IssueTime, y => y.MapFrom(t => t.CreationTime))
+          .ForMember(x => x.WorkStation, y => y.MapFrom(t => t.ProdLine))
+          .ForMember(x => x.RecommendQty, y => y.MapFrom(t => t.RecommendFromQty))
+          .ForMember(x => x.RecommendContainerCode, y => y.MapFrom(t => t.RecommendFromContainerCode))
+          .ForMember(x => x.RecommendPackingCode, y => y.MapFrom(t => t.RecommendFromPackingCode))
+          .ForMember(x => x.RecommendSupplierBatch, y => y.MapFrom(t => t.RecommendFromSupplierBatch))
+          .ForMember(x => x.RecommendArriveDate, y => y.MapFrom(t => t.RecommendFromArriveDate))
+          .ForMember(x => x.RecommendProduceDate, y => y.MapFrom(t => t.RecommendFromProduceDate))
+          .ForMember(x => x.RecommendExpireDate, y => y.MapFrom(t => t.RecommendFromExpireDate))
+          .ForMember(x => x.RecommendLot, y => y.MapFrom(t => t.RecommendFromLot))
+          .ForMember(x => x.HandledContainerCode, y => y.MapFrom(t => t.HandledToContainerCode))
+          .ForMember(x => x.HandledPackingCode, y => y.MapFrom(t => t.HandledToPackingCode))
+          .ForMember(x => x.HandledSupplierBatch, y => y.MapFrom(t => t.HandledToSupplierBatch))
+          .ForMember(x => x.HandledArriveDate, y => y.MapFrom(t => t.HandledToArriveDate))
+          .ForMember(x => x.HandledProduceDate, y => y.MapFrom(t => t.HandledToProduceDate))
+          .ForMember(x => x.HandledExpireDate, y => y.MapFrom(t => t.HandledToExpireDate))
+          .ForMember(x => x.HandledLot, y => y.MapFrom(t => t.HandledToLot))
+          .ForMember(x => x.HandledQty, y => y.MapFrom(t => t.HandledToQty))
+          .ForMember(x => x.FromPackingCode, y => y.MapFrom(t => t.HandledFromPackingCode))
+          .ForMember(x => x.ToPackingCode, y => y.MapFrom(t => t.HandledToPackingCode))
+          .ForMember(x => x.FromContainerCode, y => y.MapFrom(t => t.HandledFromContainerCode))
+          .ForMember(x => x.ToContainerCode, y => y.MapFrom(t => t.HandledToContainerCode))
+          .ForMember(x => x.FromLot, y => y.MapFrom(t => t.HandledFromLot))
+          .ForMember(x => x.ToLot, y => y.MapFrom(t => t.HandledToLot))
+          .ForMember(x => x.SupplierBatch, y => y.MapFrom(t => t.HandledToSupplierBatch))
+          .ForMember(x => x.ArriveDate, y => y.MapFrom(t => t.HandledToArriveDate))
+          .ForMember(x => x.ProduceDate, y => y.MapFrom(t => t.HandledToProduceDate))
+          .ForMember(x => x.ExpireDate, y => y.MapFrom(t => t.HandledToExpireDate))
+          .ForMember(x => x.FromLocationCode, y => y.MapFrom(t => t.HandledFromLocationCode))
+          .ForMember(x => x.FromLocationArea, y => y.MapFrom(t => t.HandledFromLocationArea))
+          .ForMember(x => x.FromLocationGroup, y => y.MapFrom(t => t.HandledFromLocationGroup))
+          .ForMember(x => x.FromLocationErpCode, y => y.MapFrom(t => t.HandledFromLocationErpCode))
+          .ForMember(x => x.FromWarehouseCode, y => y.MapFrom(t => t.HandledFromWarehouseCode))
+          .ForMember(x => x.ToLocationCode, y => y.MapFrom(t => t.HandledToLocationCode))
+          .ForMember(x => x.ToLocationArea, y => y.MapFrom(t => t.HandledToLocationArea))
+          .ForMember(x => x.ToLocationGroup, y => y.MapFrom(t => t.HandledToLocationGroup))
+          .ForMember(x => x.ToLocationErpCode, y => y.MapFrom(t => t.HandledToLocationErpCode))
+          .ForMember(x => x.ToWarehouseCode, y => y.MapFrom(t => t.HandledToWarehouseCode))
+          .ForMember(x => x.FromStatus, y => y.MapFrom(t => t.Status))
+          .ForMember(x => x.ToStatus, y => y.MapFrom(t => t.Status))
+          .ForMember(x => x.Qty, y => y.MapFrom(t => t.HandledToQty))
+          .ForMember(x => x.ItemCode, y => y.MapFrom(t => t.ItemCode))
+          .Ignore(x => x.ExpiredTime)
+
+         ;
+
     }
 }