diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java index 487febcee..6b78771e7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java @@ -97,6 +97,19 @@ public class EmptyVehicleTask extends AbstractAcsTask { // 更新删除字段 map.put("is_delete","1"); map.put("update_time", DateUtil.now()); + + HashMap point_map = new HashMap<>(); + point_map.put("lock_type","1"); + if (task_jo.getString("task_type").equals("010502")) { + point_table.update(point_map, "point_code = '" + task_jo.getString("point_code2") + "'"); + struct_table.update(point_map, "struct_code = '" + task_jo.getString("point_code2") + "'"); + } + + if (task_jo.getString("task_type").equals("010504")) { + point_table.update(point_map, "point_code = '" + task_jo.getString("point_code1") + "'"); + struct_table.update(point_map, "struct_code = '" + task_jo.getString("point_code1") + "'"); + } + } if (status.equals(TaskStatusEnum.EXECUTING.getCode())) { map.put("task_status", TaskStatusEnum.EXECUTING.getCode()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java index 0c784ad4d..0a917050a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java @@ -156,7 +156,7 @@ public class OutTask extends AbstractAcsTask { String sort_seq_last = NumberUtil.sub(jsonTask.getString("sort_seq"), "1").toString(); JSONObject jsonTaskLast = taskTab.query("task_group_id = '" + task_group_id + "' and sort_seq = '" + sort_seq_last + "' and task_status <> '07'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonTaskLast)) throw new BadRequestException("请先完成"+jsonTaskLast.getString("task_code")+"的任务!"); +// if (ObjectUtil.isNotEmpty(jsonTaskLast)) throw new BadRequestException("请先完成"+jsonTaskLast.getString("task_code")+"的任务!"); } // 调用标识完成