From b25490ef12e3067c8058435f5e7ad59325708b6f Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 3 Sep 2026 11:26:51 +0800 Subject: [PATCH] =?UTF-8?q?mrb=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gaotao/modules/mrb/service/impl/MrbReportServiceImpl.java | 2 +- cclqms-vue/src/views/modules/mrb/mrbRecord.vue | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cclqms-java/src/main/java/com/gaotao/modules/mrb/service/impl/MrbReportServiceImpl.java b/cclqms-java/src/main/java/com/gaotao/modules/mrb/service/impl/MrbReportServiceImpl.java index 90f1729..2b2ac19 100644 --- a/cclqms-java/src/main/java/com/gaotao/modules/mrb/service/impl/MrbReportServiceImpl.java +++ b/cclqms-java/src/main/java/com/gaotao/modules/mrb/service/impl/MrbReportServiceImpl.java @@ -598,7 +598,7 @@ public class MrbReportServiceImpl extends ServiceImpl> occupiedList = baseMapper.queryOccupiedInspectionOrderInActiveMrb(checkList, "", ""); List conflictTextList = buildOccupiedConflictTextList(occupiedList); if (conflictTextList.isEmpty()) { - throw new XJException("选中检验单已存在于未完成MRB中，不能重复发起"); + return; } throw new XJException("以下检验单已存在于未完成MRB中，不能重复发起：" + String.join("；", conflictTextList)); } diff --git a/cclqms-vue/src/views/modules/mrb/mrbRecord.vue b/cclqms-vue/src/views/modules/mrb/mrbRecord.vue index a87d6a9..f61fe73 100644 --- a/cclqms-vue/src/views/modules/mrb/mrbRecord.vue +++ b/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' }