Merge remote-tracking branch 'origin/ywMes'

zhoushihao

2024-12-03 cf33278c73767f72e35a4898c23765f52a3bfd1d

 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollowqueue/controller/HollowGlassQueueInfoController.java

@@ -26,15 +26,8 @@

    @ApiOperation("强制出片")
    @PostMapping("/forceOutGlass")
    public Result<String> forceOutGlass(String flowCardId, int cell) {
        hollowGlassQueueInfoService.forceOutGlass(flowCardId, cell);
        return Result.success("success");
    }

    @ApiOperation("切换线路强制出片")
    @PostMapping("/changeForceOutGlass")
    public Result<String> changeForceOutGlass(String flowCardId, int cell) {
        hollowGlassQueueInfoService.changeForceOutGlass(flowCardId, cell);
    public Result<String> forceOutGlass(String flowCardId, int cell, int totalPairQuantity) {
        hollowGlassQueueInfoService.forceOutGlass(flowCardId, cell, totalPairQuantity);
        return Result.success("success");
    }