diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java index a3a7e81..f11ad3d 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java @@ -131,8 +131,13 @@ public class StructFindUtil { }*/ //判断输送线上料位置有无空位置 result = pointTable.query("device_id = '" + deviceObj.getString("device_id") + "' and device_point_type='01'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(result)){ - break; + if (ObjectUtil.isNotEmpty(result)) { + String point_code = result.getString("point_code"); + JSONObject joo = taskTable.query("next_point_code = '" + point_code + "' and is_delete='0' and task_status in('04','05','06')").uniqueResult(0); + if (ObjectUtil.isEmpty(joo)) { + break; + } + } } return result;