Merge remote-tracking branch 'origin/master'

zhoushihao

2025-11-06 b21caa5499c50384f3a3a5dd795a7a0ad197d36f

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

@@ -6,19 +6,19 @@
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.entity.dto.GlassInfoLackDTO;
import com.mes.bigstorage.entity.dto.TemperingGlassCountDTO;
import com.mes.bigstorage.entity.request.BigCageDetailsRequest;
import com.mes.bigstorage.entity.vo.BigStorageQueryVO;
import com.mes.bigstorage.entity.vo.BigCageDetailsVO;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.common.config.Const;
import com.mes.pp.entity.OptimizeProject;
import com.mes.utils.RedisUtil;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;
@@ -119,9 +119,9 @@
    public Result<Boolean> cancelTemperingTask() {
        boolean result = bigStorageCageDetailsService.cancelTemperingTask();
        if (result == true) {
            return Result.build(200, "指定钢化成功", result);
            return Result.build(200, "取消当前钢化成功", result);
        } else {
            return Result.build(200, "已存在钢化任务，请等待钢化完成再指定钢化", result);
            return Result.build(200, "取消当前钢化失败", result);
        }
    }

@@ -197,5 +197,27 @@
        String glassId = map.get("glassId");
        return Result.build(200, "报破损成功", bigStorageCageDetailsService.bigStorageGlassDamageByGlassId(glassId));
    }

    @ApiOperation("查询工程待排产信息")
    @PostMapping("/queryEngineer") //显示工程排产信息
    @ResponseBody
    public Result<List<BigStorageCageDetails>> queryEngineer() {
        List<BigStorageCageDetails> result = bigStorageCageDetailsService.queryEngineer();
        return Result.build(200, "", result);
    }
    @ApiOperation("查询钢化排产顺序")
    @PostMapping("/queryTemperingOrder") //显示工程排产信息
    @ResponseBody
    public Result<List<OptimizeProject>> queryTemperingOrder() {
        List<OptimizeProject> result = bigStorageCageDetailsService.queryTemperingOrder();
        return Result.build(200, "", result);
    }

    @ApiOperation("（列表）按列表照查询条件（设备id、流程卡、膜系）获取设备对应的笼子玻璃信息")
    @PostMapping("/queryVerticalSheetCageDetailsList")
    public Result<List<BigCageDetailsVO>> queryVerticalSheetCageDetailsList(@RequestBody BigCageDetailsRequest request) {
        return Result.build(200, "查询成功", bigStorageCageDetailsService.queryVerticalSheetCageDetailsList(request));
    }

}