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

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAutoMapperProfile.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using Volo.Abp.AutoMapper;
+using Volo.Abp.Data;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 
@@ -91,6 +92,9 @@ public partial class StoreApplicationAutoMapperProfile : Profile
             .Ignore(x => x.TenantId)
             .Ignore(x => x.Id)
             .Ignore(x => x.ExtraProperties)
-            .Ignore(x => x.Remark);
+            .Ignore(x => x.Remark)
+            .AfterMap((x, y) => y.SetProperty(nameof(x.FromVinCode), x.FromVinCode))
+            .AfterMap((x, y) => y.SetProperty(nameof(x.ToVinCode), x.ToVinCode))
+            ;
     }
 }

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

@@ -275,6 +275,7 @@ public class DeliverRequestEventHandler
                 createInput.WarehouseCode = location.WarehouseCode;
                 createInput.WorkGroupCode = location.WorkGroupCode;
             }
+
         }
 
         createInput.Priority = PriorityHelper.GetPriority(Clock);