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

Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-07-21 10:20:55 +08:00
parent d284a29a9d fcab824551
commit 646619b06c
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/QEM_EQUIPMENTFILE01.wql
View File

@@ -108,6 +108,7 @@
EM_BI_EquipmentSpareBOM bomdtl EM_BI_EquipmentSpareBOM bomdtl
left join md_me_materialbase materialbase on materialbase.material_id = bomdtl.material_id left join md_me_materialbase materialbase on materialbase.material_id = bomdtl.material_id
left join md_pb_classstandard classstandard on materialbase.material_type_id = classstandard.class_id left join md_pb_classstandard classstandard on materialbase.material_type_id = classstandard.class_id
where 1=1
OPTION 输入.devicerecord_id <> "" OPTION 输入.devicerecord_id <> ""
bomdtl.devicerecord_id = 输入.devicerecord_id bomdtl.devicerecord_id = 输入.devicerecord_id
ENDOPTION ENDOPTION

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() {