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

终检过程检 弹框消失

Browse Source
This commit is contained in:
Ledo 2025-01-15 13:44:13 +08:00
parent 7cefab756a
commit f7051fef36
3 changed files with 82 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
View File

@ -468,51 +468,90 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
crossOrderManager.generateStockInOrder(taskDispatchDetailDO.getDispatchId(), now, lastReportDO.getAmount()); crossOrderManager.generateStockInOrder(taskDispatchDetailDO.getDispatchId(), now, lastReportDO.getAmount());
break; break;
case FINISH: case FINISH:
taskDispatchDetailDO.setProcedureStatus(TaskDispatchProcedureStatusEnum.COMPLETED.getCode());
// TaskDispatchDO taskDispatchDO = taskDispatchMapper.selectById(taskDispatchDetailDO.getDispatchId());
List<Long> idsProduction = new ArrayList<>();
List<Long> idsAssemble = new ArrayList<>();
List<TaskDispatchDO> taskDispatchDOS = taskDispatchMapper.selectList(TaskDispatchDO::getPlanId, taskDispatchDO.getPlanId());
if(CollUtil.isNotEmpty(taskDispatchDOS)){
idsAssemble = taskDispatchDOS.stream().filter(e-> e.getDispatchType().equals("ASSEMBLE"))
.map(TaskDispatchDO::getId)
.collect(Collectors.toList());
idsProduction = taskDispatchDOS.stream().filter(e-> e.getDispatchType().equals("PRODUCTION"))
.map(TaskDispatchDO::getId)
.collect(Collectors.toList());
List<TaskDispatchDetailDO> taskDispatchDetailAssembleList = taskDispatchDetailMapper.selectList(new LambdaQueryWrapper<TaskDispatchDetailDO>()
.in(TaskDispatchDetailDO::getDispatchId, idsAssemble));
List<TaskDispatchDetailDO> taskDispatchDetailProductionList = taskDispatchDetailMapper.selectList(new LambdaQueryWrapper<TaskDispatchDetailDO>()
.in(TaskDispatchDetailDO::getDispatchId, idsProduction));
boolean isProductionOver = true; taskDispatchDetailDO.setProcedureStatus(TaskDispatchProcedureStatusEnum.COMPLETED.getCode());
boolean isAssembleOver = true; //子项目装配是否完成
for (TaskDispatchDetailDO dispatchDetailDO : taskDispatchDetailAssembleList) { List<TaskDispatchDO> taskDispatchAssembleOverList = taskDispatchMapper.selectList(
if (dispatchDetailDO.getId() != taskDispatchDetailDO.getId()){ new LambdaQueryWrapper<TaskDispatchDO>()
if (dispatchDetailDO.getProcedureStatus()!= TaskDispatchProcedureStatusEnum.COMPLETED.getCode()){ .eq(TaskDispatchDO::getProjectSubId, taskDispatchDO.getProjectSubId())
isAssembleOver = false; .eq(TaskDispatchDO::getDispatchType,"ASSEMBLE"));
//零件是否生产完成
List<TaskDispatchDetailDO> taskDispatchDetailDOS = taskDispatchDetailMapper.selectListByDispatchId(taskDispatchDO.getId());
List<TaskDispatchDetailDO> productionList = taskDispatchDetailDOS.stream().filter(e -> e.getDispatchType().equals("PRODUCTION") && !e.getId().equals(taskDispatchDetailDO.getId())).collect(Collectors.toList());
//过程检 零件所有生产派工完成生成
boolean isBomDetailProductionOver = true;
//终检 子项目装配派工都完成
boolean isProjectSubAssembleOver = true;
//生产零件派工判断是否生成过程检
if (CollUtil.isNotEmpty(productionList)){
for (TaskDispatchDetailDO dispatchDetailDO : productionList) {
if (dispatchDetailDO.getProcedureStatus() !=TaskDispatchProcedureStatusEnum.COMPLETED.getCode()){
isBomDetailProductionOver = false;
break; break;
} }
} }
} }
for (TaskDispatchDetailDO dispatchDetailDO : taskDispatchDetailProductionList) { if (CollUtil.isNotEmpty(productionList)){
if (dispatchDetailDO.getId() != taskDispatchDetailDO.getId()){ for (TaskDispatchDetailDO dispatchDetailDO : productionList) {
if (dispatchDetailDO.getProcedureStatus()!= TaskDispatchProcedureStatusEnum.COMPLETED.getCode()){ if (!dispatchDetailDO.getId().equals(taskDispatchDetailDO.getId()) &&
isProductionOver = false; dispatchDetailDO.getProcedureStatus() !=TaskDispatchProcedureStatusEnum.COMPLETED.getCode()){
//如果其他的有未完成的
isProjectSubAssembleOver = false;
break; break;
} }
} }
} }
if (taskDispatchDO.getDispatchType().equals("PRODUCTION") && isProductionOver){ if (taskDispatchDO.getDispatchType().equals("PRODUCTION") && isBomDetailProductionOver){
pgMasterService.insertPgList(planDO.getId(),planDO.getProjectId()); pgMasterService.insertPgList(planDO.getId(),planDO.getProjectId());
}else if (taskDispatchDO.getDispatchType().equals("ASSEMBLE") && isAssembleOver){ }else if (taskDispatchDO.getDispatchType().equals("ASSEMBLE") && isProjectSubAssembleOver){
zjPgMasterService.insertZjList(planDO.getId(),planDO.getProjectId()); zjPgMasterService.insertZjList(planDO.getId(),planDO.getProjectId());
} }
if (isProductionOver&&isAssembleOver){ // // TaskDispatchDO taskDispatchDO = taskDispatchMapper.selectById(taskDispatchDetailDO.getDispatchId());
planDO.setStatus(3); // List<Long> idsProduction = new ArrayList<>();
planMapper.updateById(planDO); // List<Long> idsAssemble = new ArrayList<>();
} // //生产计划是否完成 查所有
} // List<TaskDispatchDO> taskDispatchDOS = taskDispatchMapper.selectList(new LambdaQueryWrapper<TaskDispatchDO>()
// .eq(TaskDispatchDO::getPlanId, taskDispatchDO.getPlanId()));
// if(CollUtil.isNotEmpty(taskDispatchDOS)){
// idsAssemble = taskDispatchDOS.stream().filter(e-> e.getDispatchType().equals("ASSEMBLE"))
// .map(TaskDispatchDO::getId)
// .collect(Collectors.toList());
// idsProduction = taskDispatchDOS.stream().filter(e-> e.getDispatchType().equals("PRODUCTION"))
// .map(TaskDispatchDO::getId)
// .collect(Collectors.toList());
// List<TaskDispatchDetailDO> taskDispatchDetailAssembleList = taskDispatchDetailMapper.selectList(new LambdaQueryWrapper<TaskDispatchDetailDO>()
// .in(TaskDispatchDetailDO::getDispatchId, idsAssemble));
// List<TaskDispatchDetailDO> taskDispatchDetailProductionList = taskDispatchDetailMapper.selectList(new LambdaQueryWrapper<TaskDispatchDetailDO>()
// .in(TaskDispatchDetailDO::getDispatchId, idsProduction));
//
// boolean isProductionOver = true;
// boolean isAssembleOver = true;
// for (TaskDispatchDetailDO dispatchDetailDO : taskDispatchDetailAssembleList) {
// if (dispatchDetailDO.getId() != taskDispatchDetailDO.getId()){
// if (dispatchDetailDO.getProcedureStatus()!= TaskDispatchProcedureStatusEnum.COMPLETED.getCode()){
// isAssembleOver = false;
// break;
// }
// }
// }
// for (TaskDispatchDetailDO dispatchDetailDO : taskDispatchDetailProductionList) {
// if (dispatchDetailDO.getId() != taskDispatchDetailDO.getId()){
// if (dispatchDetailDO.getProcedureStatus()!= TaskDispatchProcedureStatusEnum.COMPLETED.getCode()){
// isProductionOver = false;
// break;
// }
// }
// }
// if (taskDispatchDO.getDispatchType().equals("PRODUCTION") && isProductionOver){
// pgMasterService.insertPgList(planDO.getId(),planDO.getProjectId());
// }else if (taskDispatchDO.getDispatchType().equals("ASSEMBLE") && isAssembleOver){
// zjPgMasterService.insertZjList(planDO.getId(),planDO.getProjectId());
// }
// if (isProductionOver&&isAssembleOver){
// planDO.setStatus(3);
// planMapper.updateById(planDO);
// }
// }
taskDispatchDetailMapper.updateById(taskDispatchDetailDO); taskDispatchDetailMapper.updateById(taskDispatchDetailDO);
break; break;
} }

1
mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue
View File

@ -859,6 +859,7 @@ const centerDialogVisible = ref(false);
const isSureCancle = ref(false) const isSureCancle = ref(false)
const sureToCancle = () =>{ const sureToCancle = () =>{
isSureCancle.value = true; isSureCancle.value = true;
centerDialogVisible.value = false;
submitForm('CANCEL_SUBMIT'); submitForm('CANCEL_SUBMIT');
} }
const submitForm = async (operate) => { const submitForm = async (operate) => {

1
mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue
View File

@ -1030,6 +1030,7 @@ const queryData = async (id?: number) => {
const isSureCancle = ref(false) const isSureCancle = ref(false)
const sureToCancle = () =>{ const sureToCancle = () =>{
isSureCancle.value = true; isSureCancle.value = true;
centerDialogVisible.value = false;
submitForm('CANCEL_SUBMIT'); submitForm('CANCEL_SUBMIT');
} }
const submitForm = async (operate) => { const submitForm = async (operate) => {