fix(qc): 修复巡检记录校验缺少租户隔离问题

云

2 天以前 616a6b2e9a7824da8d11a4e11730fd2f9b615299

 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;
@@ -68,6 +67,16 @@
    private MesProTaskService taskService;
    @Resource
    private MesProProcessService processService;
    @Resource
    private cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderTechnicalFileService technicalFileService;

    @GetMapping("/technical-files")
    @Operation(summary = "获得工单创建时的技术文件快照")
    @PreAuthorize("@ss.hasPermission('mes:pro-work-order:query')")
    public CommonResult<List<cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemTechnicalFileRespVO>> getTechnicalFiles(@RequestParam("id") Long id) {
        workOrderService.validateWorkOrderExists(id);
        return success(technicalFileService.list(id));
    }

    @PostMapping("/create")
    @Operation(summary = "创建生产工单")
@@ -96,7 +105,6 @@
    @GetMapping("/get")
    @Operation(summary = "获得生产工单")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('mes:pro-work-order:query')")
    public CommonResult<MesProWorkOrderRespVO> getWorkOrder(@RequestParam("id") Long id) {
        MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(id);
        if (workOrder == null) {
@@ -107,7 +115,6 @@

    @GetMapping("/page")
    @Operation(summary = "获得生产工单分页")
    @PreAuthorize("@ss.hasPermission('mes:pro-work-order:query')")
    public CommonResult<PageResult<MesProWorkOrderRespVO>> getWorkOrderPage(@Valid MesProWorkOrderPageReqVO pageReqVO) {
        PageResult<MesProWorkOrderDO> pageResult = workOrderService.getWorkOrderPage(pageReqVO);
        return success(new PageResult<>(buildWorkOrderRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -115,14 +122,12 @@

    @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")
    @Operation(summary = "获得生产工单调度状态分页")
    @PreAuthorize("@ss.hasPermission('mes:pro-work-order:query')")
    public CommonResult<PageResult<MesProWorkOrderRespVO>> getWorkOrderSchedulePage(@Valid MesProWorkOrderPageReqVO pageReqVO) {
        PageResult<MesProWorkOrderDO> pageResult = workOrderService.getWorkOrderSchedulePage(pageReqVO);
        return success(new PageResult<>(buildWorkOrderRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -170,7 +175,6 @@
    @GetMapping("/progress/{id}")
    @Operation(summary = "获取工单进度详情")
    @Parameter(name = "id", description = "编号", required = true)
    @PreAuthorize("@ss.hasPermission('mes:pro-work-order:query')")
    public CommonResult<MesProWorkOrderProgressRespVO> getWorkOrderProgress(@PathVariable("id") Long id) {
        return success(workOrderService.getWorkOrderProgress(id));
    }
@@ -237,14 +241,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) {
@@ -263,25 +265,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()); // 待生产
            }
        });
    }