root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
liuxy
2022-07-21 09:45:40 +08:00
parent f9b3b1095d
commit fcab824551
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/impl/DeviceScrapServiceImpl.java
View File

@@ -90,15 +90,6 @@ public class DeviceScrapServiceImpl implements DeviceScrapService {
JSONObject json = fileTab.query("devicerecord_id ='" + devicerecord_id + "' and is_delete = '0'").uniqueResult(0); JSONObject json = fileTab.query("devicerecord_id ='" + devicerecord_id + "' and is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isEmpty(json)) throw new BootstrapMethodError("档案已被删除"); 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("status", "90");
json.put("update_optid", currentUserId); json.put("update_optid", currentUserId);
json.put("update_optname", nickName); json.put("update_optname", nickName);

2
mes/qd/src/views/wms/sb/run/devicescrap/index.vue
View File

@@ -278,7 +278,7 @@ export default {
this.crud.toQuery() this.crud.toQuery()
}) })
} else { } else {
return this.crud.notify('设备状态不为正常或者闲置', CRUD.NOTIFICATION_TYPE.INFO) return this.crud.notify('设备状态不正确，需启动设备或完成维修单及保养单', CRUD.NOTIFICATION_TYPE.INFO)
} }
}, },
downloadWord() { downloadWord() {