Merge remote-tracking branch 'origin/master'

zhoushihao

2 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java

@@ -114,6 +114,17 @@
        }
    }

    @ApiOperation("取消当前钢化")
    @PostMapping("/cancelTemperingTask")
    public Result<Boolean> cancelTemperingTask() {
        boolean result = bigStorageCageDetailsService.cancelTemperingTask();
        if (result == true) {
            return Result.build(200, "取消当前钢化成功", result);
        } else {
            return Result.build(200, "取消当前钢化失败", result);
        }
    }

    @ApiOperation("钢化/非钢化查询：0 非钢化  1：钢化")
    @PostMapping("/selectTemperingGlass")
    public Result<List<TemperingGlassCountDTO>> selectTemperingGlass(int isTempering) {