1、fixbug:缺片详情临时解决 将所有缺片信息返回 2、新增膜系 状态：避免同一块玻璃占用完相同尺寸关系表 3、中空界面注释开始暂停按钮 4、领取...

zhoushihao

2024-12-07 f62353986a6afff2e2a5a17cfdec30d04a4e600d

 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java

@@ -27,18 +27,30 @@
    @ApiOperation("领取任务")
    @PostMapping("/receiveTask")
    public Result<HollowGlassOutRelationInfo> receiveTask(String flowCardId, int cell, int totalPairQuantity) {
        return Result.success(hollowGlassOutRelationInfoService.receiveTask(flowCardId, cell, totalPairQuantity));
        HollowGlassOutRelationInfo hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService.receiveTask(flowCardId, cell, totalPairQuantity);
        if (null == hollowGlassOutRelationInfo) {
            return Result.error(500, "有正在执行的任务，请先确保任务完成后，再次领取任务");
        } else {
            return Result.success(hollowGlassOutRelationInfo);
        }

    }

    @ApiOperation("强制出片")
    @PostMapping("/forceOutGlass")
    public Result<HollowGlassOutRelationInfo> forceOutGlass(String flowCardId, int cell, int totalPairQuantity) {
        return Result.success(hollowGlassOutRelationInfoService.forceOutGlass(flowCardId, cell, totalPairQuantity));
        HollowGlassOutRelationInfo hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService.forceOutGlass(flowCardId, cell, totalPairQuantity);
        if (null == hollowGlassOutRelationInfo) {
            return Result.error(500, "有正在执行的任务，请先确保任务完成后，再次强制执行任务");
        } else {
            return Result.success(hollowGlassOutRelationInfo);
        }
    }

    @ApiOperation("是否调度开关")
    @PostMapping("/dispatchHollowSwitch")
    public Result<Boolean> dispatchHollowSwitch(Boolean flag) {
        return Result.build(200, "修改成功",hollowGlassOutRelationInfoService.dispatchHollowSwitch(flag));
        return Result.build(200, "修改成功", hollowGlassOutRelationInfoService.dispatchHollowSwitch(flag));
    }

}