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 15:06:21 +08:00
parent 1034f6f20b
commit cf0d21412a
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java
View File

@ -129,6 +129,7 @@ public interface ErrorCodeConstants {
ErrorCode TASK_DISPATCH_TASK_REPORT_AMOUNT_EXCESS = new ErrorCode(1_009_006, "无法超额报工"); ErrorCode TASK_DISPATCH_TASK_REPORT_AMOUNT_EXCESS = new ErrorCode(1_009_006, "无法超额报工");
ErrorCode TASK_REPORT_OTHER_PERSON_NO_SUBMIT = new ErrorCode(1_009_020, "其他人员尚未报工，无法结束生产"); ErrorCode TASK_REPORT_OTHER_PERSON_NO_SUBMIT = new ErrorCode(1_009_020, "其他人员尚未报工，无法结束生产");
ErrorCode THE_REPORT_APPLICATION_NOT_ENDED = new ErrorCode(1_009_021, "该报工没有结束，请刷新界面"); ErrorCode THE_REPORT_APPLICATION_NOT_ENDED = new ErrorCode(1_009_021, "该报工没有结束，请刷新界面");
ErrorCode THE_DATA_DOES_NOT_EXIST = new ErrorCode(1_009_022, "该数据不存在，请刷新界面");
//1_009_021已被使用 //1_009_021已被使用
/*************质量管理***********/ /*************质量管理***********/
ErrorCode UNQUALIFIED_NOTIFICATION_NOT_EXISTS = new ErrorCode(1_010_001, "品质异常通知单审核不存在"); ErrorCode UNQUALIFIED_NOTIFICATION_NOT_EXISTS = new ErrorCode(1_010_001, "品质异常通知单审核不存在");

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

@ -92,14 +92,14 @@ public class TaskReportServiceImpl implements TaskReportService {
public void rework(Long id, String remark) { public void rework(Long id, String remark) {
TaskReportDO taskReportDO = taskReportMapper.selectById(id); TaskReportDO taskReportDO = taskReportMapper.selectById(id);
if (taskReportDO == null) { if (taskReportDO == null) {
throw exception(TASK_REPORT_NOT_EXISTS); throw exception(THE_DATA_DOES_NOT_EXIST);
} }
TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(taskReportDO.getDispatchDetailId()); TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(taskReportDO.getDispatchDetailId());
if (taskDispatchDetailDO != null) { if (taskDispatchDetailDO != null) {
if (taskDispatchDetailDO.getReportProcess() != 2) { if (taskDispatchDetailDO.getProcedureStatus() != 2) {
throw exception(THE_REPORT_APPLICATION_NOT_ENDED); throw exception(TASK_IN_REPORT_NOT_REWORK);
} else { } else {
taskDispatchDetailDO.setReportProcess(1); taskDispatchDetailDO.setProcedureStatus(1);
taskDispatchDetailDO.setReturnRemark(remark); taskDispatchDetailDO.setReturnRemark(remark);
taskDispatchDetailMapper.updateById(taskDispatchDetailDO); taskDispatchDetailMapper.updateById(taskDispatchDetailDO);
} }

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

@ -169,6 +169,7 @@
返工 返工
</el-button> </el-button>
<el-button <el-button
v-if="scope.row.procedureStatus != 2"
link link
type="danger" type="danger"
@click="handleDelete(scope.row.id)" @click="handleDelete(scope.row.id)"