Merge remote-tracking branch 'origin/master'

zhoushihao

2024-07-24 c1b6a6157b8cd13192f9a9f5a819150504d08701

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

@@ -78,12 +78,12 @@

    @ApiOperation("指定钢化")
    @PostMapping("/TemperingGlass")
    public Result TemperingGlass(@RequestBody String temperingLayoutId,@RequestBody String engineerId) {
        boolean result=bigStorageCageDetailsService.TemperingGlass(temperingLayoutId,engineerId);
    public Result TemperingGlass(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
        boolean result=bigStorageCageDetailsService.TemperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(),bigStorageCageDetails.getEngineerId());
        if(result==true){
            return Result.build(200,"指定钢化成功",1);
        }else {
            return Result.build(200, "已存在钢化任务", 1);
            return Result.build(200, "已存在钢化任务，请等待钢化完成再指定钢化", 1);
        }
    }