diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ItemTransformRequests/ItemTransformRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ItemTransformRequests/ItemTransformRequestAppService.cs index 255b76fa2..ec2059cc0 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ItemTransformRequests/ItemTransformRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ItemTransformRequests/ItemTransformRequestAppService.cs @@ -103,7 +103,7 @@ public class ItemTransformRequestAppService : detail.ItemName= fromItemBasicDto.Name; detail.Uom = fromItemBasicDto.BasicUom; - detail.ToItemCode = toItemBasicDto.Desc1; + detail.ToItemCode = toItemBasicDto.Code; detail.ToItemDesc1 = toItemBasicDto.Desc2; detail.ToItemDesc2 = toItemBasicDto.Name; detail.ItemName = toItemBasicDto.BasicUom; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestManager.cs index fb77b0bf5..5a74b77d6 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestManager.cs @@ -1,6 +1,8 @@ +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using DocumentFormat.OpenXml.Math; using Win_in.Sfs.Shared.Domain.Shared; using Win_in.Sfs.Shared.Event; using static Win_in.Sfs.Wms.Store.Domain.Shared.StoreSettings; @@ -12,12 +14,15 @@ public class MaterialRequestManager , IMaterialRequestManager { private readonly IMaterialRequestRepository _repository; + private readonly IIssueJobRepository _issueJobRepository; public MaterialRequestManager( IMaterialRequestRepository repository + , IIssueJobRepository issueJobRepository ) : base(repository) { _repository = repository; + _issueJobRepository = issueJobRepository; } /// @@ -133,7 +138,7 @@ public class MaterialRequestManager SetMaterialRequestDetailStatus(detail); } - SetMaterialRequestStatus(oldEntity); + await SetMaterialRequestStatus(oldEntity).ConfigureAwait(false); await Repository.UpdateAsync(oldEntity).ConfigureAwait(false); } @@ -157,11 +162,15 @@ public class MaterialRequestManager } } - private void SetMaterialRequestStatus(MaterialRequest materialRequest) + private async Task SetMaterialRequestStatus(MaterialRequest materialRequest) { if (materialRequest.Details.All(p => p.Status == EnumStatus.Close)) { - materialRequest.RequestStatus = EnumRequestStatus.Completed; + var issueJobs = await _issueJobRepository.GetListAsync(t => t.MaterialRequestNumber == materialRequest.Number).ConfigureAwait(false); + if (issueJobs.All(t => t.JobStatus == EnumJobStatus.Done)) + { + materialRequest.RequestStatus = EnumRequestStatus.Completed; + } } }