diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskreport/TaskReportServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskreport/TaskReportServiceImpl.java index 567a1275..eef99eee 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskreport/TaskReportServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskreport/TaskReportServiceImpl.java @@ -64,8 +64,10 @@ public class TaskReportServiceImpl implements TaskReportService { if (ObjectUtil.isNotEmpty(taskReportDO)){ TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(taskReportDO.getDispatchDetailId()); if (ObjectUtil.isNotEmpty(taskDispatchDetailDO)){ - if (taskDispatchDetailDO.getProcedureStatus() == 2) return CommonResult.error(400,"该派工单已报工完成,不允许删除!"); + if (taskDispatchDetailDO.getProcedureStatus() == 2) return CommonResult.error(400,"该报工已完成,不允许删除,请确认"); } + taskDispatchDetailDO.setProcedureStatus(0); + taskDispatchDetailMapper.updateById(taskDispatchDetailDO); } // 删除 taskReportMapper.deleteByIds(id); diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/index.vue index 6e195f67..b633498e 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/index.vue @@ -113,7 +113,7 @@