Merge remote-tracking branch 'origin/master'

wu

2024-12-23 b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af

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

@@ -4,9 +4,13 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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.vo.BigStorageQueryVO;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.common.config.Const;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.utils.RedisUtil;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
@@ -45,11 +49,11 @@
    @ApiOperation("玻璃详情查询")
    @PostMapping("/selectBigStorageCageDetails")
    public Result selectBigStorageCageDetails(@RequestBody Map map) {
        List<BigStorageCageDetails> bigStorageCageDetails=bigStorageCageDetailsService.selectBigStorageCageDetails(map.get("glassId").toString());
        if (bigStorageCageDetails.size()>0){
            return Result.build(200,"查询成功",bigStorageCageDetails);
        }else{
            return Result.build(200,"查询失败，无此玻璃id",bigStorageCageDetails);
        List<BigStorageCageDetails> bigStorageCageDetails = bigStorageCageDetailsService.selectBigStorageCageDetails(map.get("glassId").toString());
        if (bigStorageCageDetails.size() > 0) {
            return Result.build(200, "查询成功", bigStorageCageDetails);
        } else {
            return Result.build(200, "查询失败，无此玻璃id", bigStorageCageDetails);
        }
    }

@@ -57,42 +61,42 @@
    @PostMapping("/insertBigStorageCageDetails")
    public Result insertBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
        bigStorageCageDetailsService.insertBigStorageCageDetails(bigStorageCageDetails);
        return Result.build(200,"添加成功",bigStorageCageService.querybigStorageCageDetail());
        return Result.build(200, "添加成功", bigStorageCageService.querybigStorageCageDetail());
    }

    @ApiOperation("理片笼详情删除")
    @PostMapping("/deleteBigStorageCageDetails")
    public Result deleteBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
        bigStorageCageDetailsService.deleteBigStorageCageDetails(bigStorageCageDetails);
        return Result.build(200,"删除成功",bigStorageCageService.querybigStorageCageDetail());
        return Result.build(200, "删除成功", bigStorageCageService.querybigStorageCageDetail());
    }

    @ApiOperation("理片笼任务破损0/拿走1")
    @PostMapping("/damageBigStorageCageDetails")
    public Result damageBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails,int status) {
        bigStorageCageDetailsService.damageBigStorageCageDetails(bigStorageCageDetails.getGlassId(),status);
        return Result.build(200,"破损/拿走成功",1);
    public Result damageBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails, int status) {
        bigStorageCageDetailsService.damageBigStorageCageDetails(bigStorageCageDetails.getGlassId(), status);
        return Result.build(200, "破损/拿走成功", 1);
    }

    @ApiOperation("理片笼任务完成")
    @PostMapping("/finishBigStorageCageDetails")
    public Result finishBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
        bigStorageCageDetailsService.finishBigStorageCageDetails(bigStorageCageDetails);
        return Result.build(200,"任务完成成功",1);
        return Result.build(200, "任务完成成功", 1);
    }

    @ApiOperation("理片笼任务出片")
    @PostMapping("/outBigStorageCageDetails")
    public Result outBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
        bigStorageCageDetailsService.outBigStorageCageDetails(bigStorageCageDetails);
        return Result.build(200,"出片添加成功",1);
        return Result.build(200, "出片添加成功", 1);
    }

    @ApiOperation("指定钢化")
    @PostMapping("/TemperingGlass")
    public Result temperingGlass(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
        boolean result = bigStorageCageDetailsService
                .temperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(), bigStorageCageDetails.getEngineerId(),bigStorageCageDetails.getTemperingFeedSequence().toString());
                .temperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(), bigStorageCageDetails.getEngineerId(), bigStorageCageDetails.getTemperingFeedSequence().toString());
        if (result == true) {
            return Result.build(200, "指定钢化成功", 1);
        } else {
@@ -100,10 +104,27 @@
        }
    }

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

    @ApiOperation("钢化/非钢化查询：0 非钢化  1：钢化")
    @PostMapping("/selectTemperingGlass")
    public Result selectTemperingGlass() {
        return Result.build(200, "查询成功", bigStorageCageDetailsService.selectTemperingGlass());
    public Result<List<TemperingGlassCountDTO>> selectTemperingGlass(int isTempering) {
        return Result.build(200, "查询成功", bigStorageCageDetailsService.selectTemperingGlass(isTempering));
    }

    @ApiOperation("缺片数量查询")
    @PostMapping("/queryLackGlassInfo")
    public Result<List<GlassInfoLackDTO>> queryLackGlassInfo(@RequestBody BigStorageQueryVO bigStorageQueryVO) {
        return Result.build(200, "查询成功", bigStorageCageDetailsService.queryLackGlassInfo(bigStorageQueryVO));
    }

    @ApiOperation("是否调度开关")
@@ -123,11 +144,11 @@
    @ApiOperation("流程卡查询")
    @PostMapping("/selectFlowCardByCache")
    public Result selectFlowCardByCache() {
        List<Map<String, Object>> flowCardIdCount=bigStorageCageDetailsService.listMaps(
        List<Map<String, Object>> flowCardIdCount = bigStorageCageDetailsService.listMaps(
                new QueryWrapper<BigStorageCageDetails>()
                        .select("flow_card_id,layer,count(*) as count")
                        .eq("state", Const.GLASS_STATE_IN)
                        .eq("tempering_layout_id",0)
                        .eq("tempering_layout_id", 0)
                        .groupBy("flow_card_id,layer")
        );
        return Result.build(200, "查询成功", flowCardIdCount);
@@ -136,30 +157,29 @@
    @ApiOperation("指定流程卡")
    @PostMapping("/appointFlowCard")
    public Result appointFlowCard(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
        List<BigStorageCageDetails> bigStorageCageDetailsList=bigStorageCageDetailsService.list(
        List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsService.list(
                new LambdaQueryWrapper<BigStorageCageDetails>()
                .eq(BigStorageCageDetails::getState,Const.GLASS_STATE_ARTIFICIAL)
                        .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL)
        );
        if(bigStorageCageDetailsList.size()==0){
        if (bigStorageCageDetailsList.size() == 0) {
            bigStorageCageDetailsService.update(
                    new LambdaUpdateWrapper<BigStorageCageDetails>()
                            .set(BigStorageCageDetails::getState,Const.GLASS_STATE_ARTIFICIAL)
                            .eq(BigStorageCageDetails::getFlowCardId,bigStorageCageDetails.getFlowCardId())
                            .eq(BigStorageCageDetails::getLayer,bigStorageCageDetails.getLayer())
                            .eq(BigStorageCageDetails::getState,Const.GLASS_STATE_IN)
                            .set(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL)
                            .eq(BigStorageCageDetails::getFlowCardId, bigStorageCageDetails.getFlowCardId())
                            .eq(BigStorageCageDetails::getLayer, bigStorageCageDetails.getLayer())
                            .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
            );
            return Result.build(200, "指定流程卡成功", 1);
        }else{
        } else {
            return Result.build(200, "指定流程卡成功", 1);
        }
    }
    @ApiOperation("大理片笼报破损")
    @PostMapping("/bigStorageGlassDamageByGlassId")

    @ApiOperation("指定工程")
    @PostMapping("/appointEngineerId")
    public Result appointEngineerId(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
        bigStorageCageDetailsService.appointEngineerId(bigStorageCageDetails.getEngineerId());
        return Result.build(200, "修改成功", 1);
    public Result<String> bigStorageGlassDamageByGlassId(@RequestBody Map<String, String> map) {
        String glassId=map.get("glassId");
        return Result.build(200, "报破损成功", bigStorageCageDetailsService.bigStorageGlassDamageByGlassId(glassId));
    }

}