root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
liuxy
2023-02-01 09:42:47 +08:00
parent ff3031f289
commit 5d0fc1addd
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java
View File

@@ -97,6 +97,19 @@ public class EmptyVehicleTask extends AbstractAcsTask {
// 更新删除字段 // 更新删除字段
map.put("is_delete","1"); map.put("is_delete","1");
map.put("update_time", DateUtil.now()); map.put("update_time", DateUtil.now());
HashMap<String, String> 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())) { if (status.equals(TaskStatusEnum.EXECUTING.getCode())) {
map.put("task_status", TaskStatusEnum.EXECUTING.getCode()); map.put("task_status", TaskStatusEnum.EXECUTING.getCode());

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
View File

@@ -156,7 +156,7 @@ public class OutTask extends AbstractAcsTask {
String sort_seq_last = NumberUtil.sub(jsonTask.getString("sort_seq"), "1").toString(); 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); 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")+"的任务！");
} }
// 调用标识完成 // 调用标识完成