Commit c1153764e921e9ffb2dddc740589c252a6b64f8e
1 parent
8b65df26
update
Showing
1 changed file
with
2 additions
and
2 deletions
src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java
@@ -173,7 +173,7 @@ public class TaskAssignServiceImpl implements TaskAssignService { | @@ -173,7 +173,7 @@ public class TaskAssignServiceImpl implements TaskAssignService { | ||
173 | } | 173 | } |
174 | 174 | ||
175 | Location insideNear = locationService.getInsideNear(location); | 175 | Location insideNear = locationService.getInsideNear(location); |
176 | - if(insideNear != null) { | 176 | + if(location.getRowFlag().intValue() == 1) { |
177 | String locationCode = location.getCode(); | 177 | String locationCode = location.getCode(); |
178 | LambdaQueryWrapper<TaskHeader> lambdaWrapper3 = Wrappers.lambdaQuery(); | 178 | LambdaQueryWrapper<TaskHeader> lambdaWrapper3 = Wrappers.lambdaQuery(); |
179 | lambdaWrapper3.eq(TaskHeader::getFromLocation, locationCode) | 179 | lambdaWrapper3.eq(TaskHeader::getFromLocation, locationCode) |
@@ -182,7 +182,7 @@ public class TaskAssignServiceImpl implements TaskAssignService { | @@ -182,7 +182,7 @@ public class TaskAssignServiceImpl implements TaskAssignService { | ||
182 | .ge(TaskHeader::getStatus, 1); | 182 | .ge(TaskHeader::getStatus, 1); |
183 | List<TaskHeader> taskHeader3 = taskHeaderService.list(lambdaWrapper3); | 183 | List<TaskHeader> taskHeader3 = taskHeaderService.list(lambdaWrapper3); |
184 | if (taskHeader3 != null && taskHeader3.size() > 0) { | 184 | if (taskHeader3 != null && taskHeader3.size() > 0) { |
185 | - String insideNearCode = location.getCode(); | 185 | + String insideNearCode = insideNear.getCode(); |
186 | LambdaQueryWrapper<TaskHeader> lambdaWrapper4 = Wrappers.lambdaQuery(); | 186 | LambdaQueryWrapper<TaskHeader> lambdaWrapper4 = Wrappers.lambdaQuery(); |
187 | lambdaWrapper4.eq(TaskHeader::getFromLocation, insideNearCode) | 187 | lambdaWrapper4.eq(TaskHeader::getFromLocation, insideNearCode) |
188 | .lt(TaskHeader::getStatus, 100) | 188 | .lt(TaskHeader::getStatus, 100) |