feat(mes): 优化MES模块生产调度与数据管理功能

云

17 小时以前 e09f103259fa602382bb5ce2a03361a6397af46a

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java

@@ -18,7 +18,6 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderProcessDO;
import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderProductionStatusEnum;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
@@ -111,6 +110,13 @@
    public CommonResult<PageResult<MesProWorkOrderRespVO>> getWorkOrderPage(@Valid MesProWorkOrderPageReqVO pageReqVO) {
        PageResult<MesProWorkOrderDO> pageResult = workOrderService.getWorkOrderPage(pageReqVO);
        return success(new PageResult<>(buildWorkOrderRespVOList(pageResult.getList()), pageResult.getTotal()));
    }

    @GetMapping("/approve-process-list")
    @Operation(summary = "获取审批报工的流程定义列表")
    @PreAuthorize("@ss.hasPermission('mes:pro-work-order:query')")
    public CommonResult<List<Map<String, Object>>> getWorkOrderApproveProcessDefinitionList() {
        return success(workOrderService.getWorkOrderApproveProcessDefinitionList());
    }

    @GetMapping("/schedule-page")
@@ -230,14 +236,12 @@
                vo.setCompletionProgress(produced.compareTo(BigDecimal.ZERO) > 0 ? new BigDecimal("100.00") : BigDecimal.ZERO);
            }
                    
            // 计算进度和状态
            // 计算工序进度
            List<MesProWorkOrderProcessDO> processes = woProcessMap.getOrDefault(vo.getId(), Collections.emptyList());
            List<MesProTaskDO> tasks = woTaskMap.getOrDefault(vo.getId(), Collections.emptyList());
            

            List<MesProWorkOrderProcessProgressVO> progressList = new ArrayList<>();
            boolean allCompleted = !processes.isEmpty();
            boolean anyStarted = false;
            

            Map<Long, List<MesProTaskDO>> processTaskMap = convertMultiMap(tasks, MesProTaskDO::getProcessId);
            
            for (MesProWorkOrderProcessDO process : processes) {
@@ -256,25 +260,9 @@
                    progressVO.setProgress(totalProduced.compareTo(BigDecimal.ZERO) > 0 ? new BigDecimal("100.00") : BigDecimal.ZERO);
                }
                progressList.add(progressVO);
                
                if (totalProduced.compareTo(BigDecimal.ZERO) > 0) {
                    anyStarted = true;
                }
                if (totalQty.compareTo(BigDecimal.ZERO) == 0 || totalProduced.compareTo(totalQty) < 0) {
                    allCompleted = false;
                }
            }
            

            vo.setProcessProgressList(progressList);
            if (processes.isEmpty()) {
                vo.setProductionStatus(MesProWorkOrderProductionStatusEnum.WAITING.getStatus()); // 待生产
            } else if (allCompleted) {
                vo.setProductionStatus(MesProWorkOrderProductionStatusEnum.FINISHED.getStatus()); // 生产完成
            } else if (anyStarted) {
                vo.setProductionStatus(MesProWorkOrderProductionStatusEnum.PRODUCING.getStatus()); // 生产中
            } else {
                vo.setProductionStatus(MesProWorkOrderProductionStatusEnum.WAITING.getStatus()); // 待生产
            }
        });
    }