diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionJobs/InjectionJobAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionJobs/InjectionJobAutoMapperProfile.cs index c1b17e043..883f77001 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionJobs/InjectionJobAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionJobs/InjectionJobAutoMapperProfile.cs @@ -9,9 +9,10 @@ public partial class StoreApplicationAutoMapperProfile : Profile { private void InjectionJobAutoMapperProfile() { - CreateMap(); + CreateMap() + .ReverseMap(); - CreateMap(); + //CreateMap(); CreateMap() ; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs index 55b7fc0cf..a6b97f3ea 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs @@ -99,6 +99,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile DeliverJobAutoMapperProfile(); InspectJobAutoMapperProfile(); IssueJobAutoMapperProfile(); + InjectionJobAutoMapperProfile(); ContainerJobAutoMapperProfile(); JisDeliverJobAutoMapperProfile(); ProductReceiveJobAutoMapperProfile(); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/InjectionRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/InjectionRequestEventHandler.cs index 40d749e08..355c83d65 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/InjectionRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/InjectionRequestEventHandler.cs @@ -71,7 +71,7 @@ public class InjectionRequestEventHandler { await _injectionRequestManager.SubmitAsync(entity).ConfigureAwait(false); } - + } } @@ -163,10 +163,10 @@ public class InjectionRequestEventHandler return jobs; } - var enableMultipleCreateInjectionJob = await SettingManager.IsTrueAsync(StoreSettings.InjectionRequest.EnableMultipleCreateInjectionJob).ConfigureAwait(false); + var enableMultipleCreateInjectionJob = await SettingManager.IsTrueAsync(StoreSettings.MaterialRequest.EnableMultipleCreateIssueJob).ConfigureAwait(false); if (enableMultipleCreateInjectionJob) { - injectionRequest.Partial(); + //injectionRequest.Partial(); } else { @@ -190,6 +190,10 @@ public class InjectionRequestEventHandler job.WarehouseCode = fromLocation.WarehouseCode; job.ProdLine = fromLocation.LocationGroupCode; job.Worker = injectionRequest.Worker; + if(string.IsNullOrEmpty(job.Worker)) + { + job.Worker = "admin"; + } job.InjectionRequestNumber = injectionRequest.Number; return job; } @@ -225,7 +229,7 @@ public class InjectionRequestEventHandler jobDetails.Add(detail); injectionRequestDetail.IssuedQty += recommend.Qty; - await _injectionRequestManager.UpdateDetailsAsync(injectionRequest).ConfigureAwait(false); + //await _injectionRequestManager.UpdateDetailsAsync(injectionRequest).ConfigureAwait(false); } } @@ -234,7 +238,7 @@ public class InjectionRequestEventHandler private async Task BuildInjectionJobDetailAsync(InjectionRequestDetail injectionRequestDetail, BalanceDTO balance, string toLocationGroupCode) { - ProductionLineDTO prodLine = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationGroupCode).ConfigureAwait(false); + //ProductionLineDTO prodLine = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationGroupCode).ConfigureAwait(false); var detail = ObjectMapper.Map(balance); detail.RequestLocationCode = injectionRequestDetail.ToLocationCode; @@ -263,9 +267,10 @@ public class InjectionRequestEventHandler detail.ToLocationErpCode = injectionRequestDetail.ToLocationErpCode; detail.ToLocationArea = injectionRequestDetail.ToLocationArea; detail.ToWarehouseCode = injectionRequestDetail.ToWarehouseCode; - detail.ToLocationGroup = injectionRequestDetail.ToLocationGroup; + detail.ToLocationGroup = injectionRequestDetail.ToLocationGroup; - detail.ProdLine = prodLine == null ? toLocationGroupCode : prodLine.Code; + //detail.ProdLine = prodLine == null ? toLocationGroupCode : prodLine.Code; + detail.ProdLine = toLocationGroupCode ; await Task.CompletedTask.ConfigureAwait(false); return detail;