diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskinreport/TaskInReportMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskinreport/TaskInReportMapper.java index ded29f18..1ef02753 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskinreport/TaskInReportMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskinreport/TaskInReportMapper.java @@ -1,6 +1,7 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.taskinreport; import java.time.LocalDateTime; +import java.util.List; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; @@ -66,4 +67,10 @@ public interface TaskInReportMapper extends BaseMapperX { return selectPage(reqVO, query); } -} \ No newline at end of file + default List selectList(Long dispatchDetailId, Long id) { + return selectList(new MPJLambdaWrapper() + .eq(TaskInReportDO::getDispatchDetailId, dispatchDetailId) + .ne(TaskInReportDO::getId, id) + .disableSubLogicDel()); + } +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskinreport/TaskInReportServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskinreport/TaskInReportServiceImpl.java index ca143ff5..a155614a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskinreport/TaskInReportServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskinreport/TaskInReportServiceImpl.java @@ -81,8 +81,11 @@ public class TaskInReportServiceImpl implements TaskInReportService { if (taskDispatchDetailDO.getInReportProcess() == 2) { throw new RuntimeException("该报工已完成,不允许删除,请确认"); } else { - taskDispatchDetailDO.setInReportProcess(0); - taskDispatchDetailMapper.updateById(taskDispatchDetailDO); + List taskInReportDOS = taskInReportMapper.selectList(taskInReportDO.getDispatchDetailId(), taskInReportDO.getId()); + if (taskInReportDOS.isEmpty()) { + taskDispatchDetailDO.setInReportProcess(0); + taskDispatchDetailMapper.updateById(taskDispatchDetailDO); + } } } // 删除