licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

删除逻辑验证修改

Browse Source
This commit is contained in:
zxy 2026-01-14 17:28:45 +08:00
parent cf0d21412a
commit 02efe6762f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskreport/TaskReportServiceImpl.java
View File

@ -64,8 +64,10 @@ public class TaskReportServiceImpl implements TaskReportService {
if (ObjectUtil.isNotEmpty(taskReportDO)){ if (ObjectUtil.isNotEmpty(taskReportDO)){
TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(taskReportDO.getDispatchDetailId()); TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(taskReportDO.getDispatchDetailId());
if (ObjectUtil.isNotEmpty(taskDispatchDetailDO)){ 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); taskReportMapper.deleteByIds(id);

2
mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/index.vue
View File

@ -113,7 +113,7 @@
<template #default="scope"> <template #default="scope">
<el-tag v-if="scope.row.procedureStatus === '1'" type="warning">已报工</el-tag> <el-tag v-if="scope.row.procedureStatus === '1'" type="warning">已报工</el-tag>
<el-tag v-else-if="scope.row.procedureStatus === '2'" type="success">报工完成</el-tag> <el-tag v-else-if="scope.row.procedureStatus === '2'" type="success">报工完成</el-tag>
<el-tag v-else>未知</el-tag> <el-tag v-else>未报工</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column--> <!-- <el-table-column-->