diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ThirdLocationJobs/ThirdLocationJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ThirdLocationJobs/ThirdLocationJobManager.cs index fa2a182ba..b96bb7b6c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ThirdLocationJobs/ThirdLocationJobManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ThirdLocationJobs/ThirdLocationJobManager.cs @@ -50,14 +50,27 @@ public class ThirdLocationJobManager : SfsJobManagerBase p.ItemCode == entity.Details[0].ItemCode); - if (jobDetail.RecommendQty == jobDetail.HandledQty + input.Details[0].HandledQty) + //if (jobDetail.RecommendQty == jobDetail.HandledQty + input.Details[0].HandledQty) + //{ + // jobDetail.HandledQty += input.Details[0].HandledQty; + // isDone = true; + //} + //else + //{ + // jobDetail.HandledQty = input.Details[0].HandledQty; + // isDone = false; + //} + + if (jobDetail.RecommendQty == input.Details[0].HandledQty) { - jobDetail.HandledQty += input.Details[0].HandledQty; + jobDetail.HandledQty += input.Details[0].HandledQty; + jobDetail.RecommendQty= jobDetail.RecommendQty- input.Details[0].HandledQty; isDone = true; } else { - jobDetail.HandledQty = input.Details[0].HandledQty; + jobDetail.HandledQty += input.Details[0].HandledQty; + jobDetail.RecommendQty = jobDetail.RecommendQty - input.Details[0].HandledQty; isDone = false; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/ThirdLocationJobAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/ThirdLocationJobAutoMapperProfile.cs index 5d4c55db3..b01ee989b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/ThirdLocationJobAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/ThirdLocationJobAutoMapperProfile.cs @@ -45,6 +45,7 @@ public partial class StoreEventAutoMapperProfile : Profile .ForMember(x => x.ToLocationCode, y => y.MapFrom(d => d.ToLocationCode)) .Ignore(x => x.ToLocationArea) .Ignore(x => x.ProdLine) + .Ignore(x => x.WorkStation) .Ignore(x => x.ToLocationGroup) .Ignore(x => x.ToLocationErpCode) ;