From 70a26fc2c55092318d58ced4771c4360e4af102b Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 4 Apr 2023 10:36:58 +0800 Subject: [PATCH] =?UTF-8?q?rev:=20=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/nl/common/enums/AcsTaskEnum.java | 7 +++++++ .../nl/wms/sch/service/impl/PointServiceImpl.java | 6 +++--- .../sch/tasks/callEmpty/PlotterCallEmptyTask.java | 7 ++++--- .../tasks/callMaterial/WrapCallMaterialTask.java | 3 +-- .../wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java | 8 ++++---- .../sendMaterial/PlotterSendMaterialTask.java | 3 +-- .../main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql | 4 +++- .../src/views/wms/basedata/master/class/index.vue | 14 +++++++------- mes/qd/src/views/wms/sch/task/index.vue | 2 +- 9 files changed, 31 insertions(+), 23 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 985ef829..8001f00c 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 @@ -43,6 +43,13 @@ public enum AcsTaskEnum { // AGV_SYSTEM_NB("1","诺宝机器人任务"), AGV_SYSTEM_XC("1","叉车任务"), + + TASK_TYPE_AGV_DOUBLE_STATION("0101","AGV双工位"), + TASK_TYPE_CLEANING_TASK("0102","清洗任务"), + TASK_TYPE_PLOTTER_FULL_OF_MATERIAL("010301","刻字满料"), + TASK_TYPE_PLOTTER_FILL_THE_BLANK_BOX("010302","刻字补空框"), + TASK_TYPE_WARP_CALL_MATERIAL("010401","包装叫料"), + TASK_TYPE_WARP_SEND_BLANK_BOX("010402","包装送空框"), ; private String code; private String desc; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java index 9f5fc5d7..c0b798d3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java @@ -167,14 +167,14 @@ public class PointServiceImpl implements PointService { dto.setUpdate_name(nickName); String pointStatus = dto.getPoint_status(); - if (ObjectUtil.isNotEmpty(pointStatus) && pointStatus.equals("1")) { // 空位 + if (ObjectUtil.isNotEmpty(pointStatus) && pointStatus.equals(StatusEnum.POINT_STATUS_EMPTY.getCode())) { // 空位 dto.setMaterial_id(""); dto.setVehicle_type(""); dto.setVehicle_code(""); dto.setVehicle_qty(0); - } else if (pointStatus.equals("3")) { // 空载具 + } else if (pointStatus.equals(StatusEnum.POINT_STATUS_EMPTY_VEHICLE.getCode())) { // 空载具 dto.setMaterial_id(null); - } else if (pointStatus.equals("2")) { // 有料 + } else if (pointStatus.equals(StatusEnum.POINT_STATUS_FULL.getCode())) { // 有料 if (ObjectUtil.isEmpty(dto.getMaterial_id())) throw new BadRequestException("物料不能为空"); JSONObject materialObj = materialBaseTab.query("material_id = '" + dto.getMaterial_id() + "'").uniqueResult(0); if (ObjectUtil.isEmpty(materialObj)) throw new BadRequestException("未找到该物料"); 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 c8b8217f..a2f1a587 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 @@ -98,7 +98,9 @@ public class PlotterCallEmptyTask extends AbstractAcsTask { throw new BadRequestException("终点不能为空！"); } // 判断当前点是否有未完成的任务 - JSONObject taskObj = taskTab.query("is_delete='0' and point_code2 = '" + end_point_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); + JSONObject taskObj = taskTab.query("is_delete='0' and point_code2 = '" + end_point_code + "' " + + "and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "' " + + "and task_status <> '" + TaskStatusEnum.CANCEL.getCode() + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(taskObj)) { throw new BadRequestException("当前点位" + end_point_code + "存在未完成的任务"); } @@ -108,13 +110,12 @@ public class PlotterCallEmptyTask extends AbstractAcsTask { throw new BadRequestException("下发工单不存在未完成工单："+workorder); } // 查找任务状态 -// JSONObject classObj = classTab.query("class_code = '010301'").uniqueResult(0); String taskdtl_id = IdUtil.getSnowflake(1, 1).nextIdStr(); 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", classObj.getString("class_id")); // todo: 未知 + task.put("task_type", AcsTaskEnum.TASK_TYPE_PLOTTER_FILL_THE_BLANK_BOX.getCode()); // todo: 未知 task.put("task_status", StatusEnum.TASK_CREATE.getCode()); task.put("material_id", workOrderObj.getString("material_id")); task.put("point_code2", end_point_code); 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 bb025948..fdcbcd1c 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 @@ -107,13 +107,12 @@ public class WrapCallMaterialTask extends AbstractAcsTask { throw new BadRequestException("下发工单不存在未完成工单："+workorder); } // 查找任务状态 -// JSONObject classObj = classTab.query("class_code = '010301'").uniqueResult(0); 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_code", CodeUtil.getNewCode("TASK_CODE")); -// task.put("task_type", classObj.getString("class_id")); // todo: 未知 + task.put("task_type", AcsTaskEnum.TASK_TYPE_WARP_CALL_MATERIAL.getCode()); // todo: 未知 task.put("task_status", StatusEnum.TASK_CREATE.getCode()); task.put("point_code2", end_point_code); task.put("handle_class", this.getClass().getName()); 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 82a81863..e51e4fa9 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 @@ -96,7 +96,9 @@ public class WrapSendEmptyTask extends AbstractAcsTask { throw new BadRequestException("起点不能为空！"); } // 判断当前点是否有未完成的任务 - JSONObject taskObj = taskTab.query("is_delete='0' and point_code1 = '" + start_point_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); + JSONObject taskObj = taskTab.query("is_delete='0' and point_code1 = '" + start_point_code + "' " + + "and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "' " + + "and task_status <> '" + TaskStatusEnum.CANCEL.getCode() + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(taskObj)) { throw new BadRequestException("当前点位" + start_point_code + "存在未完成的任务"); } @@ -106,14 +108,12 @@ public class WrapSendEmptyTask extends AbstractAcsTask { // if (ObjectUtil.isEmpty(workOrderObj)){ // throw new BadRequestException("下发工单不存在未完成工单："+workorder); // } - // 查找任务状态 -// JSONObject classObj = classTab.query("class_code = '010301'").uniqueResult(0); 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_code", CodeUtil.getNewCode("TASK_CODE")); -// task.put("task_type", classObj.getString("class_id")); // todo: 未知 + task.put("task_type", AcsTaskEnum.TASK_TYPE_WARP_SEND_BLANK_BOX.getCode()); // todo: 未知 task.put("task_status", StatusEnum.TASK_CREATE.getCode()); task.put("point_code1", start_point_code); task.put("handle_class", this.getClass().getName()); 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 82642de9..d0cfa199 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 @@ -111,13 +111,12 @@ public class PlotterSendMaterialTask extends AbstractAcsTask { throw new BadRequestException("下发工单不存在未完成工单："+workorder); } // 查找任务状态 - JSONObject classObj = classTab.query("class_code = '010301'").uniqueResult(0); 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_code", CodeUtil.getNewCode("TASK_CODE")); - task.put("task_type", classObj.getString("class_id")); // todo: 未知 + task.put("task_type", AcsTaskEnum.TASK_TYPE_PLOTTER_FULL_OF_MATERIAL.getCode()); // todo: 未知 task.put("material_id", workOrderObj.getString("material_id")); task.put("task_status", StatusEnum.TASK_CREATE.getCode()); task.put("point_code1", start_point_code); 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 2709a736..6711f8fc 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,7 +57,8 @@ 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 + reg4.region_name as point4_region_name, + cl.class_name FROM sch_base_task task LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code @@ -74,6 +75,7 @@ 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 <> "" diff --git a/mes/qd/src/views/wms/basedata/master/class/index.vue b/mes/qd/src/views/wms/basedata/master/class/index.vue index c7e90509..5cc132db 100644 --- a/mes/qd/src/views/wms/basedata/master/class/index.vue +++ b/mes/qd/src/views/wms/basedata/master/class/index.vue @@ -274,13 +274,13 @@ export default { }, // 提交前的验证 [CRUD.HOOK.afterValidateCU]() { - if (this.form.parent_class_id !== null && this.form.parent_class_id === this.form.class_id) { - this.$message({ - message: '顶级类目不能为空', - type: 'warning' - }) - return false - } + // if (this.form.parent_class_id !== null && this.form.parent_class_id === this.form.class_id) { + // this.$message({ + // message: '顶级类目不能为空', + // type: 'warning' + // }) + // return false + // } if (this.form.isTop === '1') { this.form.parent_class_id = 0 } diff --git a/mes/qd/src/views/wms/sch/task/index.vue b/mes/qd/src/views/wms/sch/task/index.vue index 92393d79..b5728309 100644 --- a/mes/qd/src/views/wms/sch/task/index.vue +++ b/mes/qd/src/views/wms/sch/task/index.vue @@ -133,7 +133,7 @@ - +