Browse Source

mrb优化

master
fengyuan_yang 3 weeks ago
parent
commit
b25490ef12
  1. 2
      cclqms-java/src/main/java/com/gaotao/modules/mrb/service/impl/MrbReportServiceImpl.java
  2. 3
      cclqms-vue/src/views/modules/mrb/mrbRecord.vue

2
cclqms-java/src/main/java/com/gaotao/modules/mrb/service/impl/MrbReportServiceImpl.java

@ -598,7 +598,7 @@ public class MrbReportServiceImpl extends ServiceImpl<MrbReportDao, MrbReportEnt
List<Map<String, Object>> occupiedList = baseMapper.queryOccupiedInspectionOrderInActiveMrb(checkList, "", "");
List<String> conflictTextList = buildOccupiedConflictTextList(occupiedList);
if (conflictTextList.isEmpty()) {
throw new XJException("选中检验单已存在于未完成MRB中,不能重复发起");
return;
}
throw new XJException("以下检验单已存在于未完成MRB中,不能重复发起:" + String.join(";", conflictTextList));
}

3
cclqms-vue/src/views/modules/mrb/mrbRecord.vue

@ -1472,6 +1472,9 @@ export default {
},
changeRequestFlag () {
return (value) => {
if (!this.isEditMode) {
return 'Y'
}
if (!this.plmChangeRequestArr) {
return 'N'
}

Loading…
Cancel
Save