From f8394110ef69c27a9a3e047a2deeb1bc683adbeb Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Wed, 26 Oct 2022 10:16:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/pdm/service/dto/WorkorderDto.java | 3 +++ .../service/impl/WorkorderServiceImpl.java | 7 ++++++- .../org/nl/wms/sch/tasks/cpOut/CpOutTask.java | 19 +++++++++++-------- .../src/views/wms/pdm/workerorder/index.vue | 16 ++++++++++++++++ .../src/views/wms/sch/task/index.vue | 7 ++++++- 5 files changed, 42 insertions(+), 10 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java index d607f5a..b4c2586 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java @@ -61,6 +61,9 @@ public class WorkorderDto implements Serializable { /** 回传MES状态 */ private String passback_status; + /** 设备编码 */ + private String device_code; + /** 外部标识 */ private String ext_id; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java index 2efb31c..8addcce 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java @@ -113,6 +113,12 @@ public class WorkorderServiceImpl implements WorkordeService { @Override @Transactional(rollbackFor = Exception.class) public void create(WorkorderDto dto) { + Long device_id = dto.getDevice_id(); + if (ObjectUtil.isNotEmpty(device_id)) { + WQLObject deviceTab = WQLObject.getWQLObject("PDM_BI_Device"); + JSONObject object = deviceTab.query("device_id = '" + device_id + "'").uniqueResult(0); + dto.setDevice_code(object.getString("device_code")); + } Long currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); @@ -121,7 +127,6 @@ public class WorkorderServiceImpl implements WorkordeService { String newCode = CodeUtil.getNewCode("PDM_SHIFTORDER"); dto.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextId()); dto.setWorkorder_code(newCode); - dto.setOrder_status("1"); dto.setCreate_id(currentUserId); dto.setCreate_time(now); dto.setCreate_name(nickName); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/cpOut/CpOutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/cpOut/CpOutTask.java index 61014d2..665b98a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/cpOut/CpOutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/cpOut/CpOutTask.java @@ -51,16 +51,15 @@ public class CpOutTask extends AbstractAcsTask { throw new BadRequestException("已完成不能取消!"); } String point_code2 = taskObj.getString("point_code2"); - String point_code3 = taskObj.getString("point_code3"); - //说明未二次申请过 - if (ObjectUtil.isEmpty(point_code3)) { - JSONObject json = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0); - json.put("lock_type", "1"); - pointTab.update(json); - } + JSONObject point2Obj = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0); + taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode()); - taskObj.put("remark", "已取消"); + taskObj.put("remark", "任务已取消"); taskTab.update(taskObj); + // 释放终点点位 + point2Obj.put("lock_type", "1"); + point2Obj.put("point_status", "1"); + pointTab.update(point2Obj); } if ("1".equals(status)) { @@ -228,5 +227,9 @@ public class CpOutTask extends AbstractAcsTask { @Override public void cancel(String task_id) { + WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); + JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); + if (ObjectUtil.isNotEmpty(taskObj)) + this.updateTaskStatus(taskObj,"0"); } } diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue index 74514c9..169fab4 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -168,6 +168,22 @@ /> + + + + +