From 6202b514c23d08d2a2e208f16b8d55df2733df8b Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 6 Apr 2023 20:16:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?acs=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/common/enums/AcsTaskEnum.java | 63 +++++++++++++----- .../acs/service/impl/WmsToAcsServiceImpl.java | 3 +- .../org/nl/wms/sch/rest/TaskController.java | 16 ++--- .../org/nl/wms/sch/service/TaskService.java | 9 +++ .../wms/sch/service/impl/TaskServiceImpl.java | 15 ++++- .../tasks/callEmpty/PlotterCallEmptyTask.java | 11 +-- .../callMaterial/WrapCallMaterialTask.java | 11 +-- .../tasks/sendEmpty/WrapSendEmptyTask.java | 11 +-- .../sendMaterial/PlotterSendMaterialTask.java | 11 +-- .../java/org/nl/wms/sch/wql/QSCH_TASK_01.wql | 6 +- .../src/main/java/org/nl/wms/sch/wql/sch.xls | Bin 185856 -> 186880 bytes mes/qd/src/api/wms/sch/task.js | 7 ++ mes/qd/src/views/wms/sch/task/index.vue | 41 +++++++++--- 13 files changed, 141 insertions(+), 63 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java index 1c2ce95a..4bd686fc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java @@ -1,13 +1,14 @@ package org.nl.common.enums; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import lombok.AllArgsConstructor; import lombok.Getter; +import org.nl.common.utils.MapOf; import org.springframework.util.CollectionUtils; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; -import java.util.Optional; +import java.util.*; +import java.util.function.Consumer; import java.util.stream.Collectors; /* @@ -18,7 +19,7 @@ import java.util.stream.Collectors; @Getter @AllArgsConstructor public enum AcsTaskEnum { - UNDEFINED("0","未定义类型"), + TASK_UNDEFINED("0","未定义类型"), //任务类型：3个点，任务编号，无需载具 TASK_PRODUCT_MAC("1","专机-专机满料任务"), //3个点，任务编号，缓存线空载具列表 @@ -27,6 +28,10 @@ public enum AcsTaskEnum { TASK_CACHELINE_OUT("3","缓存线-专机出库任务"), //专机到深坑任务：深坑业务单独处理 TASK_PRODUCT_WASH("4","专机-深坑任务"), + TASK_PLOTTER_MAC("5","刻字机-满料入库"), + TASK_PLOTTER_EMPTY("6","刻字机-呼叫空框"), + TASK_WARP_MAC("7","包装机-叫料出库"), + TASK_WARP_EMPTY("8","包装机-送空框"), //回调状态 STATUS_START("1","执行中"), @@ -42,18 +47,18 @@ public enum AcsTaskEnum { // AGV_SYSTEM_NB("1","诺宝机器人任务"), - AGV_SYSTEM_XC("1","叉车任务"), + AGV_SYSTEM_XC("2","叉车任务"), - TASK_TYPE_NOBLE_DOUBLE_TASK("1","诺宝双工任务"), - TASK_TYPE_NOBLE_SINGLE_TASK("2","诺宝单工任务"), - TASK_TYPE_NOBLE_SINGLE_ENTRY_TASK("3","诺宝单入-单任务"), - TASK_TYPE_NOBLE_DOUBLE_ENTRY_TASK("4","诺宝双入-双任务"), - TASK_TYPE_NOBLE_POINT_POINT_TASK("5","诺宝点对点任务"), - TASK_TYPE_WEIGHING_TASK_OF_PS20("6","PS20称重任务（刻字-包装）"), - TASK_TYPE_NON_WEIGHING_TASK_OF_PS20("7","PS20不称重任务（刻字-包装）"), + ACS_TASK_TYPE_NOBLE_DOUBLE_TASK("1","诺宝双工任务"), + ACS_TASK_TYPE_NOBLE_SINGLE_TASK("2","诺宝单工任务"), + ACS_TASK_TYPE_NOBLE_SINGLE_ENTRY_TASK("3","诺宝单入-单任务"), + ACS_TASK_TYPE_NOBLE_DOUBLE_ENTRY_TASK("4","诺宝双入-双任务"), + ACS_TASK_TYPE_NOBLE_POINT_POINT_TASK("5","诺宝点对点任务"), + ACS_TASK_TYPE_WEIGHING_TASK_OF_PS20("6","PS20称重任务（刻字-包装）"), + ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20("7","PS20不称重任务（刻字-包装）"), - TASK_FINISHED_TYPE_AUTO("1", "自动完成任务"), - TASK_FINISHED_TYPE_MANUAL("2", "手动完成任务"), + AUTO_TASK_FINISHED_TYPE("1", "自动完成任务"), + MANUAL_TASK_FINISHED_TYPE("2", "手动完成任务"), ; private String code; private String desc; @@ -63,6 +68,32 @@ public enum AcsTaskEnum { if (first.isPresent()){ return first.get(); } - return AcsTaskEnum.UNDEFINED; + return AcsTaskEnum.TASK_UNDEFINED; + } + + public static JSONArray getTaskTypes() { + List task = Arrays.stream(AcsTaskEnum.values()).filter(taskEnum -> taskEnum.name().startsWith("TASK_")).collect(Collectors.toList()); + JSONArray res = new JSONArray(); + task.forEach(t -> { + JSONObject taskEnum = new JSONObject(); + taskEnum.put("name", t.getDesc()); + taskEnum.put("code", t.getCode()); + res.add(taskEnum); + }); + return res; + } + + public static List getAcsTaskTypes() { + List task = Arrays.stream(AcsTaskEnum.values()) + .filter(taskEnum -> taskEnum.name().startsWith("ACS_TASK_")) + .collect(Collectors.toList()); + List list = new ArrayList<>(task.size()); + task.forEach(t-> list.add(t.getDesc())); + return list; + } + + + public static void main(String[] args) { + getAcsTaskTypes(); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java index e1cb4703..25bb93dc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java @@ -49,11 +49,10 @@ public class WmsToAcsServiceImpl implements WmsToAcsService{ for (Object o : arr) { JSONObject task = (JSONObject) o; JSONObject param = new JSONObject(MapOf.of("task_id", task.getString("task_id") - , "acs_task_type", task.getString("acs_task_type") , "task_code", task.getString("task_code") , "start_point_code", task.getString("point_code1")//起点 , "next_point_code", task.getString("point_code2")//空盘返回点 - , "task_type", task.getString("task_type") + , "task_type", task.getString("acs_task_type") , "priority", task.getString("priority") , "is_send", task.getString("is_send") , "vehicle_code", task.getString("vehicle_code") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java index 141cea9a..4bb730f7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java @@ -86,15 +86,13 @@ public class TaskController { @Log("获取任务类型列表") @ApiOperation("获取任务类型列表") public ResponseEntity getTaskType() { - TaskTypeEnum[] values = TaskTypeEnum.values(); - JSONArray arr = new JSONArray(); - for (TaskTypeEnum value : values) { - JSONObject json = new JSONObject(); - json.put("code", value.getCode()); - json.put("name", value.getName()); - arr.add(json); - } - return new ResponseEntity<>(arr, HttpStatus.OK); + return new ResponseEntity<>(taskService.getTaskTypes(), HttpStatus.OK); + } + @GetMapping("/acsTaskType") + @Log("获取acs任务类型列表") + @ApiOperation("获取acs任务类型列表") + public ResponseEntity getAcsTaskType() { + return new ResponseEntity<>(taskService.getAcsTaskType(), HttpStatus.OK); } @GetMapping("/finishType") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/TaskService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/TaskService.java index 94118952..a315e423 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/TaskService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/TaskService.java @@ -1,6 +1,7 @@ package org.nl.wms.sch.service; +import com.alibaba.fastjson.JSONArray; import org.nl.wms.sch.service.dto.TaskDto; import org.springframework.data.domain.Pageable; @@ -84,4 +85,12 @@ public interface TaskService { * @param param */ void operation(Map param); + + /** + * 获取任务类型 + * @return + */ + JSONArray getTaskTypes(); + + List getAcsTaskType(); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java index 55791a7c..b6b41efc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java @@ -85,8 +85,8 @@ public class TaskServiceImpl implements TaskService { map.put("vehicle_code", "%" + whereJson.getString("vehicle_code") + "%"); } if (StrUtil.isNotEmpty(whereJson.getString("task_type"))) { - ClassstandardDto task_type = classstandardService.findById(whereJson.getString("task_type")); - map.put("task_type", task_type.getClass_code()); +// ClassstandardDto task_type = classstandardService.findById(whereJson.getString("task_type")); + map.put("task_type", whereJson.getString("task_type")); } if (StrUtil.isNotEmpty(whereJson.getString("finishTypeList"))) { map.put("finishTypeList", whereJson.getString("finishTypeList")); @@ -200,7 +200,7 @@ public class TaskServiceImpl implements TaskService { JSONObject res = new JSONObject(); res.put("task_id", task_id); res.put("status", AcsTaskEnum.STATUS_FINISH.getCode()); - res.put("finished_type", AcsTaskEnum.TASK_FINISHED_TYPE_MANUAL.getCode()); // 手动完成 + res.put("finished_type", AcsTaskEnum.MANUAL_TASK_FINISHED_TYPE.getCode()); // 手动完成 finish.add(res); acsToWmsService.receiveTaskStatusAcs(JSON.toJSONString(finish)); break; @@ -216,4 +216,13 @@ public class TaskServiceImpl implements TaskService { } } + @Override + public JSONArray getTaskTypes() { + return AcsTaskEnum.getTaskTypes(); + } + + @Override + public List getAcsTaskType() { + return AcsTaskEnum.getAcsTaskTypes(); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java index efb0ee57..28a52047 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java @@ -66,7 +66,7 @@ public class PlotterCallEmptyTask extends AbstractAcsTask { taskObj.put("task_status", StatusEnum.TASK_FINISH.getCode()); taskObj.put("update_time", DateUtil.now()); taskObj.put("finished_type", ObjectUtil.isNotEmpty(task.getString("finished_type"))? - task.getString("finished_type"):AcsTaskEnum.TASK_FINISHED_TYPE_AUTO.getCode()); + task.getString("finished_type"):AcsTaskEnum.AUTO_TASK_FINISHED_TYPE.getCode()); taskTab.update(taskObj); } else { /** @@ -85,7 +85,7 @@ public class PlotterCallEmptyTask extends AbstractAcsTask { taskObj.put("task_status", StatusEnum.TASK_CANNEL.getCode()); taskObj.put("update_time", DateUtil.now()); taskObj.put("finished_type", ObjectUtil.isNotEmpty(task.getString("finished_type"))? - task.getString("finished_type"):AcsTaskEnum.TASK_FINISHED_TYPE_AUTO.getCode()); + task.getString("finished_type"):AcsTaskEnum.AUTO_TASK_FINISHED_TYPE.getCode()); taskTab.update(taskObj); } } @@ -120,8 +120,9 @@ public class PlotterCallEmptyTask extends AbstractAcsTask { JSONObject task = new JSONObject(); task.put("task_id", taskdtl_id); task.put("task_code", CodeUtil.getNewCode("TASK_CODE")); - task.put("task_name", "刻字机呼叫空框"); - task.put("task_type", AcsTaskEnum.TASK_TYPE_NON_WEIGHING_TASK_OF_PS20.getCode()); // todo: 未知???????? + task.put("task_name", AcsTaskEnum.TASK_PLOTTER_EMPTY.getDesc()); + task.put("task_type", AcsTaskEnum.TASK_PLOTTER_EMPTY.getCode()); + task.put("acs_task_type", AcsTaskEnum.ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20.getCode()); task.put("task_status", StatusEnum.TASK_CREATE.getCode()); task.put("material_id", workOrderObj.getString("material_id")); task.put("point_code2", end_point_code); @@ -135,7 +136,7 @@ public class PlotterCallEmptyTask extends AbstractAcsTask { task.put("create_time", DateUtil.now()); task.put("update_time", DateUtil.now()); task.put("priority", "1"); - task.put("agv_system_type", "2"); + task.put("agv_system_type", AcsTaskEnum.AGV_SYSTEM_XC.getCode()); WQLObject.getWQLObject("SCH_BASE_Task").insert(task); // 找终点 try { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java index 13346fe9..292d5318 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java @@ -67,7 +67,7 @@ public class WrapCallMaterialTask extends AbstractAcsTask { taskObj.put("task_status", StatusEnum.TASK_FINISH.getCode()); taskObj.put("update_time", DateUtil.now()); taskObj.put("finished_type", ObjectUtil.isNotEmpty(task.getString("finished_type"))? - task.getString("finished_type"):AcsTaskEnum.TASK_FINISHED_TYPE_AUTO.getCode()); + task.getString("finished_type"):AcsTaskEnum.AUTO_TASK_FINISHED_TYPE.getCode()); taskTab.update(taskObj); } else { /** @@ -86,7 +86,7 @@ public class WrapCallMaterialTask extends AbstractAcsTask { taskObj.put("task_status", StatusEnum.TASK_CANNEL.getCode()); taskObj.put("update_time", DateUtil.now()); taskObj.put("finished_type", ObjectUtil.isNotEmpty(task.getString("finished_type"))? - task.getString("finished_type"):AcsTaskEnum.TASK_FINISHED_TYPE_AUTO.getCode()); + task.getString("finished_type"):AcsTaskEnum.AUTO_TASK_FINISHED_TYPE.getCode()); taskTab.update(taskObj); } } @@ -118,9 +118,10 @@ public class WrapCallMaterialTask extends AbstractAcsTask { String taskdtl_id = IdUtil.getSnowflake(1, 1).nextIdStr(); JSONObject task = new JSONObject(); task.put("task_id", taskdtl_id); - task.put("task_name", "包装叫料"); + task.put("task_name", AcsTaskEnum.TASK_WARP_MAC.getDesc()); + task.put("task_type", AcsTaskEnum.TASK_WARP_MAC.getCode()); task.put("task_code", CodeUtil.getNewCode("TASK_CODE")); - task.put("task_type", AcsTaskEnum.TASK_TYPE_NON_WEIGHING_TASK_OF_PS20.getCode()); // todo: 未知 + task.put("acs_task_type", AcsTaskEnum.ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20.getCode()); task.put("task_status", StatusEnum.TASK_CREATE.getCode()); task.put("point_code2", end_point_code); task.put("handle_class", this.getClass().getName()); @@ -133,7 +134,7 @@ public class WrapCallMaterialTask extends AbstractAcsTask { task.put("create_time", DateUtil.now()); task.put("update_time", DateUtil.now()); task.put("priority", "1"); - task.put("agv_system_type", "2"); + task.put("agv_system_type", AcsTaskEnum.AGV_SYSTEM_XC.getCode()); WQLObject.getWQLObject("SCH_BASE_Task").insert(task); // 找终点 try { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java index 8ae4b23f..c970249d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java @@ -65,7 +65,7 @@ public class WrapSendEmptyTask extends AbstractAcsTask { taskObj.put("task_status", StatusEnum.TASK_FINISH.getCode()); taskObj.put("update_time", DateUtil.now()); taskObj.put("finished_type", ObjectUtil.isNotEmpty(task.getString("finished_type"))? - task.getString("finished_type"):AcsTaskEnum.TASK_FINISHED_TYPE_AUTO.getCode()); + task.getString("finished_type"):AcsTaskEnum.AUTO_TASK_FINISHED_TYPE.getCode()); taskTab.update(taskObj); } else { /** @@ -84,7 +84,7 @@ public class WrapSendEmptyTask extends AbstractAcsTask { taskObj.put("task_status", StatusEnum.TASK_CANNEL.getCode()); taskObj.put("update_time", DateUtil.now()); taskObj.put("finished_type", ObjectUtil.isNotEmpty(task.getString("finished_type"))? - task.getString("finished_type"):AcsTaskEnum.TASK_FINISHED_TYPE_AUTO.getCode()); + task.getString("finished_type"):AcsTaskEnum.AUTO_TASK_FINISHED_TYPE.getCode()); taskTab.update(taskObj); } } @@ -106,9 +106,10 @@ public class WrapSendEmptyTask extends AbstractAcsTask { String taskdtl_id = IdUtil.getSnowflake(1, 1).nextId() + ""; JSONObject task = new JSONObject(); task.put("task_id", taskdtl_id); - task.put("task_name", "包装送空框"); + task.put("task_name", AcsTaskEnum.TASK_WARP_EMPTY.getDesc()); + task.put("task_type", AcsTaskEnum.TASK_WARP_EMPTY.getCode()); task.put("task_code", CodeUtil.getNewCode("TASK_CODE")); - task.put("task_type", AcsTaskEnum.TASK_TYPE_NON_WEIGHING_TASK_OF_PS20.getCode()); // todo: 未知 + task.put("acs_task_type", AcsTaskEnum.ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20.getCode()); task.put("task_status", StatusEnum.TASK_CREATE.getCode()); task.put("point_code1", start_point_code); task.put("handle_class", this.getClass().getName()); @@ -121,7 +122,7 @@ public class WrapSendEmptyTask extends AbstractAcsTask { task.put("create_time", DateUtil.now()); task.put("update_time", DateUtil.now()); task.put("priority", "1"); - task.put("agv_system_type", "2"); + task.put("agv_system_type", AcsTaskEnum.AGV_SYSTEM_XC.getCode()); WQLObject.getWQLObject("SCH_BASE_Task").insert(task); // 找终点 try { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java index 090e0902..d2795cef 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java @@ -67,7 +67,7 @@ public class PlotterSendMaterialTask extends AbstractAcsTask { taskObj.put("task_status", StatusEnum.TASK_FINISH.getCode()); taskObj.put("update_time", DateUtil.now()); taskObj.put("finished_type", ObjectUtil.isNotEmpty(task.getString("finished_type"))? - task.getString("finished_type"):AcsTaskEnum.TASK_FINISHED_TYPE_AUTO.getCode()); + task.getString("finished_type"):AcsTaskEnum.AUTO_TASK_FINISHED_TYPE.getCode()); taskTab.update(taskObj); } else { /** @@ -86,7 +86,7 @@ public class PlotterSendMaterialTask extends AbstractAcsTask { taskObj.put("task_status", StatusEnum.TASK_CANNEL.getCode()); taskObj.put("update_time", DateUtil.now()); taskObj.put("finished_type", ObjectUtil.isNotEmpty(task.getString("finished_type"))? - task.getString("finished_type"):AcsTaskEnum.TASK_FINISHED_TYPE_AUTO.getCode()); + task.getString("finished_type"):AcsTaskEnum.AUTO_TASK_FINISHED_TYPE.getCode()); taskTab.update(taskObj); } } @@ -120,9 +120,10 @@ public class PlotterSendMaterialTask extends AbstractAcsTask { String taskdtl_id = IdUtil.getSnowflake(1, 1).nextId() + ""; JSONObject task = new JSONObject(); task.put("task_id", taskdtl_id); - task.put("task_name", "刻字机送料"); + task.put("task_name", AcsTaskEnum.TASK_PLOTTER_MAC.getDesc()); + task.put("task_type", AcsTaskEnum.TASK_PLOTTER_MAC.getCode()); task.put("task_code", CodeUtil.getNewCode("TASK_CODE")); - task.put("task_type", AcsTaskEnum.TASK_TYPE_WEIGHING_TASK_OF_PS20.getCode()); // todo: 未知 + task.put("acs_task_type", AcsTaskEnum.ACS_TASK_TYPE_WEIGHING_TASK_OF_PS20.getCode()); task.put("material_id", workOrderObj.getString("material_id")); task.put("task_status", StatusEnum.TASK_CREATE.getCode()); task.put("point_code1", start_point_code); @@ -136,7 +137,7 @@ public class PlotterSendMaterialTask extends AbstractAcsTask { task.put("create_time", DateUtil.now()); task.put("update_time", DateUtil.now()); task.put("priority", "1"); - task.put("agv_system_type", "2"); + task.put("agv_system_type", AcsTaskEnum.AGV_SYSTEM_XC.getCode()); WQLObject.getWQLObject("SCH_BASE_Task").insert(task); // 找终点 try { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql index 65cd7f06..7eaa46ef 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql @@ -57,8 +57,7 @@ reg1.region_name as point1_region_name, reg2.region_name as point2_region_name, reg3.region_name as point3_region_name, - reg4.region_name as point4_region_name, - cl.class_name + reg4.region_name as point4_region_name FROM sch_base_task task LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code @@ -75,11 +74,10 @@ LEFT JOIN SCH_BASE_Region reg4 ON reg4.region_code = ( SELECT p4.region_code FROM SCH_BASE_Point p4 WHERE p4.point_code = task.point_code4 ) - LEFT JOIN MD_PB_ClassStandard cl ON cl.class_code = task.task_type WHERE task.is_delete = '0' OPTION 输入.task_type <> "" - task.task_type = ( select md2.class_code from md_pb_classstandard md2 where md2.class_code = 输入.task_type ) + task.task_type = 输入.task_type ENDOPTION OPTION 输入.finished_type <> "" task.finished_type = 输入.finished_type diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls index 732b4c784787130bd4bf6f82484aa1c83c56b0aa..90efc0a19fc968beeae2834d2fd5175699d62a3c 100644 GIT binary patch delta 14332 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 + + + + + + + + + - + placeholder="任务类型" + class="filter-item" + clearable + @change="hand" + > + + - - - + @@ -269,6 +285,7 @@ export default { create_time: [], taskStatusList: [], taskTypeList: [], + acsTaskTypeList: [], finishTypeList: [], permission: { @@ -285,6 +302,12 @@ export default { crudTask.getFinishType().then(data => { this.finishTypeList = data }) + crudTask.getTaskType().then(res => { + this.taskTypeList = res + }) + crudTask.getAcsTaskType().then(res => { + this.acsTaskTypeList = res + }) // this.crud.query.task_status = ['-1'] // this.crud.toQuery() },