1、大理片笼详情按钮修复 2、websocket不在向前端推送详情数据

zhoushihao

2024-12-17 004391aaa734854dd498bb6351f32e237138a378

1、大理片笼详情按钮修复
2、websocket不在向前端推送详情数据

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

@@ -8,9 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@@ -38,8 +36,8 @@
    }

    @ApiOperation("按照查询条件（设备id、流程卡、膜系）获取设备对应的笼子玻璃信息")
    @GetMapping("/querybigStorageCageDetail")
    public Result<List<BigStorageAndDetailsDTO>> querybigStorageCageDetail(BigStorageDetailsQueryVO query) {
    @PostMapping("/querybigStorageCageDetail")
    public Result<List<BigStorageAndDetailsDTO>> querybigStorageCageDetail(@RequestBody BigStorageDetailsQueryVO query) {
        return Result.build(200, "查询成功", bigStorageCageService.querybigStorageCageDetail(query));
    }


 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/vo/BigStorageDetailsQueryVO.java

@@ -21,20 +21,20 @@
     * 膜系
     */
    private String filmsId;
    /**
     *最小宽度
     */
    private Integer minWidth;
    /**
     *最大宽度
     */
    private Integer maxWidth;
    /**
     *最小高度
     */
    private Integer minHeight;
    /**
     *最大高度
     */
    private Integer maxHeight;
//    /**
//     *最小宽度
//     */
//    private Integer minWidth;
//    /**
//     *最大宽度
//     */
//    private Integer maxWidth;
//    /**
//     *最小高度
//     */
//    private Integer minHeight;
//    /**
//     *最大高度
//     */
//    private Integer maxHeight;
}

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java

@@ -221,10 +221,10 @@
        MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>();
        wrapper.selectAll(BigStorageCage.class).selectCollection(BigStorageCageDetails.class, BigStorageCage::getBigStorageCageDetails)
                .leftJoin(BigStorageCageDetails.class, on -> on.eq(BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
                        .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL, Const.GLASS_STATE_OUT_ING))
                .eq(BigStorageCageDetails::getDeviceId,query.getDeviceId())
                .eq(StringUtils.isNotBlank(query.getFilmsId()),BigStorageCageDetails::getFilmsId,query.getFilmsId())
                .eq(StringUtils.isNotBlank(query.getFlowCardId()),BigStorageCageDetails::getFlowCardId,query.getFlowCardId())
                        .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL, Const.GLASS_STATE_OUT_ING))
                .eq(BigStorageCage::getDeviceId, query.getDeviceId())
                .orderByAsc(BigStorageCage::getDeviceId)
                .orderByAsc(BigStorageCage::getSlot);
        return bigStorageCageMapper.selectJoinList(BigStorageAndDetailsDTO.class, wrapper);

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java

@@ -69,6 +69,7 @@
        //界面展示笼子信息
        jsonObject.append("bigStorageCageInfos", bigStorageCageService.querybigStorageCageDetail());

        try{
        //进片任务数据
        List<BigStorageCageTask> inTaskList = new ArrayList();
        ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.FROM1");
@@ -87,12 +88,14 @@
            }
        }
        jsonObject.append("bigStorageCageDetailsFeedTask", inTaskList);
        }catch(Exception e){
            //todo:不做任务处理
        }

        //出片任务数据
        List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage("big_storage_cage_out_one_task");
        jsonObject.append("bigStorageCageDetailsOutTask", outTaskList);

        //理片笼表格信息
        jsonObject.append("bigStorageCageInfo", bigStorageCageService.querybigStorageCageDetailAll());

        //钢化开关
        boolean temperingSwitch = false;
@@ -116,8 +119,6 @@
        List<Map<String, Object>> bigStorageCageUsage = bigStorageCageService.selectBigStorageCageUsage();
        jsonObject.append("bigStorageCageUsage", bigStorageCageUsage);

        //理片笼表格信息
        jsonObject.append("bigStorageCageInfo", bigStorageCageService.querybigStorageCageDetailAll());

        //打印开关
        boolean autoPrint = false;