From 9505647ceeb20a0ede862be0eb87c15934d1aa04 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Thu, 11 May 2023 16:08:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E4=B8=8D=E6=9F=A5=E8=AF=A2=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/sch/tasks/OutTask.java | 57 +++++++++---------- 1 file changed, 28 insertions(+), 29 deletions(-) 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 8e297b8e1..cca6a341a 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 @@ -45,38 +45,37 @@ public class OutTask extends AbstractAcsTask { */ //任务表 WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task"); - WQLObject dis_tab = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); JSONObject map = new JSONObject(); map.put("flag", "1"); map.put("handle_class", THIS_CLASS); - JSONArray arr = WQL.getWO("TASK01").addParamMap(map).process().getResultJSONArray(0); - + //JSONArray arr = WQL.getWO("TASK01").addParamMap(map).process().getResultJSONArray(0); + JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0); ArrayList resultList = new ArrayList<>(); for (int i = 0; i < arr.size(); i++) { JSONObject json = arr.getJSONObject(i); // 1.查询此任务是否有任务组 - if (ObjectUtil.isEmpty(json.getString("task_group_id"))) { - char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length()-1); - AcsTaskDto dto = AcsTaskDto.builder() - .ext_task_id(json.getString("task_id")) - .task_code(json.getString("task_code")) - .task_type(json.getString("acs_task_type")) - .start_device_code(json.getString("point_code1")) - .next_device_code(json.getString("point_code2")) - .vehicle_code(json.getString("vehicle_code")) - .priority(json.getString("priority")) - .dtl_type(String.valueOf(dtl_type)) - .remark(json.getString("remark")) - .build(); - resultList.add(dto); + //if (ObjectUtil.isEmpty(json.getString("task_group_id"))) { + char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1); + AcsTaskDto dto = AcsTaskDto.builder() + .ext_task_id(json.getString("task_id")) + .task_code(json.getString("task_code")) + .task_type(json.getString("acs_task_type")) + .start_device_code(json.getString("point_code1")) + .next_device_code(json.getString("point_code2")) + .vehicle_code(json.getString("vehicle_code")) + .priority(json.getString("priority")) + .dtl_type(String.valueOf(dtl_type)) + .remark(json.getString("remark")) + .build(); + resultList.add(dto); - // 更新任务为下发 - JSONObject paramMap = new JSONObject(); - paramMap.put("task_status", TaskStatusEnum.ISSUE.getCode()); - wo_Task.update(paramMap,"task_id ='"+json.getString("task_id")+"'"); - } else { + // 更新任务为下发 + JSONObject paramMap = new JSONObject(); + paramMap.put("task_status", TaskStatusEnum.ISSUE.getCode()); + wo_Task.update(paramMap, "task_id ='" + json.getString("task_id") + "'"); + /*} else { // 2.有任务组：按照执行顺序下发 大到小 JSONArray taskArr = wo_Task.query("task_group_id = '" + json.getString("task_group_id") + "' order by sort_seq ASC").getResultJSONArray(0); @@ -100,10 +99,10 @@ public class OutTask extends AbstractAcsTask { } // 更新任务为下发 - /* JSONObject paramMap = new JSONObject(); + *//* JSONObject paramMap = new JSONObject(); paramMap.put("task_status", TaskStatusEnum.ISSUE.getCode()); - wo_Task.update(paramMap,"task_group_id ='"+json.getString("task_group_id")+"'");*/ - } + wo_Task.update(paramMap,"task_group_id ='"+json.getString("task_group_id")+"'");*//* + }*/ } return resultList; } @@ -121,11 +120,11 @@ public class OutTask extends AbstractAcsTask { if (StrUtil.equals(status, "0")) { // 任务为下发之后就不允许取消 if (jsonTask.getIntValue("task_status") > Integer.valueOf(TaskStatusEnum.START_AND_POINT.getCode())) { - throw new BadRequestException("任务:"+jsonTask.getString("task_code")+"已下发，不可取消"); + throw new BadRequestException("任务:" + jsonTask.getString("task_code") + "已下发，不可取消"); } // 更新删除字段 - jsonTask.put("is_delete","1"); + jsonTask.put("is_delete", "1"); jsonTask.put("update_time", DateUtil.now()); taskTab.update(jsonTask); @@ -134,7 +133,7 @@ public class OutTask extends AbstractAcsTask { map.put("work_status", "00"); map.put("point_id", ""); - disTab.update(map,"task_id = '"+task_id+"'"); + disTab.update(map, "task_id = '" + task_id + "'"); } @@ -192,7 +191,7 @@ public class OutTask extends AbstractAcsTask { JSONObject json = new JSONObject(); json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); - json.put("task_code", IdUtil.getSnowflake(1,1).nextId()); + json.put("task_code", IdUtil.getSnowflake(1, 1).nextId()); json.put("task_type", form.getString("task_type")); json.put("vehicle_code", form.getString("vehicle_code"));