From fcab824551313b81358e3de225b10681bc5499ca Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 21 Jul 2022 09:45:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/sb/run/service/impl/DeviceScrapServiceImpl.java | 9 --------- mes/qd/src/views/wms/sb/run/devicescrap/index.vue | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/impl/DeviceScrapServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/impl/DeviceScrapServiceImpl.java index ba383079..3a41fcd9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/impl/DeviceScrapServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/impl/DeviceScrapServiceImpl.java @@ -90,15 +90,6 @@ public class DeviceScrapServiceImpl implements DeviceScrapService { JSONObject json = fileTab.query("devicerecord_id ='" + devicerecord_id + "' and is_delete = '0'").uniqueResult(0); if (ObjectUtil.isEmpty(json)) throw new BootstrapMethodError("档案已被删除"); - String status = json.getString("status"); - if (StrUtil.equals(status, "11")) { - // 需完成保养单或者维修单 - JSONObject jsonMain = mainTab.query("devicerecord_id = '" + devicerecord_id + "' and is_delete = '0' and invstatus = '99'").uniqueResult(0); - JSONObject jsonRe = reTab.query("devicerecord_id = '" + devicerecord_id + "' and is_delete = '0' and invstatus = '99'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonMain) || ObjectUtil.isEmpty(jsonRe)) { - throw new BadRequestException("保养单或维修单未完成"); - } - } json.put("status", "90"); json.put("update_optid", currentUserId); json.put("update_optname", nickName); diff --git a/mes/qd/src/views/wms/sb/run/devicescrap/index.vue b/mes/qd/src/views/wms/sb/run/devicescrap/index.vue index 979e4db7..0c7516b9 100644 --- a/mes/qd/src/views/wms/sb/run/devicescrap/index.vue +++ b/mes/qd/src/views/wms/sb/run/devicescrap/index.vue @@ -278,7 +278,7 @@ export default { this.crud.toQuery() }) } else { - return this.crud.notify('设备状态不为正常或者闲置', CRUD.NOTIFICATION_TYPE.INFO) + return this.crud.notify('设备状态不正确，需启动设备或完成维修单及保养单', CRUD.NOTIFICATION_TYPE.INFO) } }, downloadWord() {