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 977c851e1..c175b6355 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 @@ -49,36 +49,19 @@ public class ThirdLocationJobManager : SfsJobManagerBase p.ItemCode == entity.Details[0].ItemCode); - //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.RecommendQty= jobDetail.RecommendQty- input.Details[0].HandledQty; - jobDetail.SingleCodeJob = input.Details[0].SingleCodeJob; - isDone = true; - } - else + foreach(var jobDetail in entity.Details) { - jobDetail.HandledQty += input.Details[0].HandledQty; - jobDetail.RecommendQty = jobDetail.RecommendQty - input.Details[0].HandledQty; - jobDetail.SingleCodeJob = input.Details[0].SingleCodeJob; - isDone = false; - } + var inputDetail= input.Details.FirstOrDefault(p=>p.ItemCode== jobDetail.ItemCode); + jobDetail.HandledQty += inputDetail.HandledQty; + jobDetail.RecommendQty = jobDetail.RecommendQty - inputDetail.HandledQty; + jobDetail.SingleCodeJob = inputDetail.SingleCodeJob; + + inputDetail.RecommendQty = jobDetail.RecommendQty; + } - foreach (var item in entity.Details.FindAll(p => p.ItemCode != entity.Details[0].ItemCode)) + foreach (var item in entity.Details) { - if (item.RecommendQty == item.HandledQty) + if (item.RecommendQty == 0) { isDone = true; } @@ -91,15 +74,14 @@ public class ThirdLocationJobManager : SfsJobManagerBase