fix(erp): 修复流程驳回状态未正确处理的问题

- 各业务流程中增加对驳回(BACK)状态的处理
- 驳回时将业务状态还原为草稿(DRAFT),允许重新编辑和提交
- 涉及项目验收、变更、计划与收货模块的状态管理调整
- 完善流程状态与业务状态的同步更新逻辑
dev
zangch@mesnac.com 4 weeks ago
parent 6f64659d7e
commit 8248c8c3f1

@ -357,6 +357,9 @@ public class ErpProjectAcceptanceServiceImpl implements IErpProjectAcceptanceSer
} else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.INVALID.getStatus())
|| Objects.equals(processEvent.getStatus(), BusinessStatusEnum.TERMINATION.getStatus())) {
acceptance.setAcceptanceStatus(OAStatusEnum.INVALID.getStatus());
}else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.BACK.getStatus())) {
// 流程驳回:业务状态还原为草稿,允许重新编辑和提交
acceptance.setAcceptanceStatus(OAStatusEnum.DRAFT.getStatus());
}
baseMapper.updateById(acceptance);
}

@ -661,7 +661,14 @@ public class ErpProjectChangeServiceImpl implements IErpProjectChangeService {
String handler = Convert.toStr(params.get("handler"));
}
if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.FINISH.getStatus())){
// 流程完成:业务状态置为可用
projectChange.setProjectChangeStatus(OAStatusEnum.COMPLETED.getStatus());
} else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.INVALID.getStatus())) {
// 流程作废:业务状态置为作废
projectChange.setProjectChangeStatus(OAStatusEnum.INVALID.getStatus());
} else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.BACK.getStatus())) {
// 流程驳回:业务状态还原为草稿,允许重新编辑和提交
projectChange.setProjectChangeStatus(OAStatusEnum.DRAFT.getStatus());
}
baseMapper.updateById(projectChange);
});

@ -371,6 +371,11 @@ public class ErpProjectPlanServiceImpl implements IErpProjectPlanService {
}
if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.FINISH.getStatus())) {
projectPlan.setProjectPlanStatus(OAStatusEnum.COMPLETED.getStatus());
}else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.INVALID.getStatus())) {
projectPlan.setProjectPlanStatus(OAStatusEnum.INVALID.getStatus());
}else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.BACK.getStatus())) {
// 流程驳回:业务状态还原为草稿,允许重新编辑和提交
projectPlan.setProjectPlanStatus(OAStatusEnum.DRAFT.getStatus());
}
baseMapper.updateById(projectPlan);
});

@ -352,6 +352,9 @@ public class ErpProjectReceivingServiceImpl implements IErpProjectReceivingServi
} else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.INVALID.getStatus())
|| Objects.equals(processEvent.getStatus(), BusinessStatusEnum.TERMINATION.getStatus())) {
receiving.setReceivingStatus(OAStatusEnum.INVALID.getStatus());
}else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.BACK.getStatus())) {
// 流程驳回:业务状态还原为草稿,允许重新编辑和提交
receiving.setReceivingStatus(OAStatusEnum.DRAFT.getStatus());
}
baseMapper.updateById(receiving);
}

Loading…
Cancel
Save