From 1041e97ce5915219b409600af5422e0a966c9e08 Mon Sep 17 00:00:00 2001 From: Ledo Date: Fri, 10 Oct 2025 01:12:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E6=B4=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heli/service/plansubdetail/PlanSubDetailServiceImpl.java | 4 ++-- mes-ui/mes-ui-admin-vue3/src/views/heli/interrupt/index.vue | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plansubdetail/PlanSubDetailServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plansubdetail/PlanSubDetailServiceImpl.java index 0e040975..1ee9fd39 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plansubdetail/PlanSubDetailServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plansubdetail/PlanSubDetailServiceImpl.java @@ -303,8 +303,8 @@ public class PlanSubDetailServiceImpl implements PlanSubDetailService { if (planSubDetailMapper.selectCount(wrapper)>0) return CommonResult.error(400,"该子项目存在多时间段派工,不允许从中间修改！"); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(PlanSubDetailDO::getProjectSubId,updateReqVO.getProjectSubId()); -// queryWrapper.eq(PlanSubDetailDO::getTwoDimOwner,updateReqVO.getTwoDimOwner()); - queryWrapper.eq(PlanSubDetailDO::getSubType,updateReqVO.getSubType()); + queryWrapper.eq(PlanSubDetailDO::getTwoDimOwner,updateReqVO.getTwoDimOwner()); + queryWrapper.eq(PlanSubDetailDO::getSubType,updateReqVO.getSubType()); //注释原因，这样只考虑这个类型的了 if (ObjectUtil.isNotEmpty(updateReqVO.getId())){ queryWrapper.ne(PlanSubDetailDO::getId,updateReqVO.getId()); } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/interrupt/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/interrupt/index.vue index ecbfa59a..9bcc87e7 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/interrupt/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/interrupt/index.vue @@ -627,6 +627,7 @@ const currentRow = ref(null) const insertList = ref([]) const beforeList = ref([]) const modification = async (row) => { +beforeList.value = [] var data = row as unknown as PlansubdetailApi.PlanSubDetailVO const res = await PlansubdetailApi.modificationPlanSubDetail(data) if (res.list) {