From c1153764e921e9ffb2dddc740589c252a6b64f8e Mon Sep 17 00:00:00 2001
From: youjie <j.you@huahengweld.com>
Date: Mon, 26 Oct 2020 11:20:58 +0800
Subject: [PATCH] update
---
src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java b/src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java
index c0aea18..898f6e2 100644
--- a/src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java
+++ b/src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java
@@ -173,7 +173,7 @@ public class TaskAssignServiceImpl implements TaskAssignService {
}
Location insideNear = locationService.getInsideNear(location);
- if(insideNear != null) {
+ if(location.getRowFlag().intValue() == 1) {
String locationCode = location.getCode();
LambdaQueryWrapper<TaskHeader> lambdaWrapper3 = Wrappers.lambdaQuery();
lambdaWrapper3.eq(TaskHeader::getFromLocation, locationCode)
@@ -182,7 +182,7 @@ public class TaskAssignServiceImpl implements TaskAssignService {
.ge(TaskHeader::getStatus, 1);
List<TaskHeader> taskHeader3 = taskHeaderService.list(lambdaWrapper3);
if (taskHeader3 != null && taskHeader3.size() > 0) {
- String insideNearCode = location.getCode();
+ String insideNearCode = insideNear.getCode();
LambdaQueryWrapper<TaskHeader> lambdaWrapper4 = Wrappers.lambdaQuery();
lambdaWrapper4.eq(TaskHeader::getFromLocation, insideNearCode)
.lt(TaskHeader::getStatus, 100)
--
libgit2 0.22.2