zhoushihao
2024-07-26 b3fd4ee6e9d4ae51cde28be8ae705e19af5ef9e4
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
@@ -33,16 +33,13 @@
    private TemperingGlassInfoService temperingGlassInfoService;
    private JSONObject jsonObject = new JSONObject();
    public void hangzhoumes() throws InterruptedException {
    public void queryDataSource1() throws InterruptedException {
        List<Double> carPostion=new ArrayList<>();
        carPostion.add(0.25);
        carPostion.add(0.5);
        jsonObject.append("carPostion",carPostion);
        //界面展示笼子信息
        jsonObject.append("bigStorageCageInfo1", bigStorageCageService.querybigStorageCageDetail(1));
        jsonObject.append("bigStorageCageInfo2", bigStorageCageService.querybigStorageCageDetail(2));
        jsonObject.append("bigStorageCageInfo3", bigStorageCageService.querybigStorageCageDetail(3));
        jsonObject.append("bigStorageCageInfo4", bigStorageCageService.querybigStorageCageDetail(4));
        jsonObject.append("bigStorageCageInfo5", bigStorageCageService.querybigStorageCageDetail(5));
        jsonObject.append("bigStorageCageInfo6", bigStorageCageService.querybigStorageCageDetail(6));
        jsonObject.append("bigStorageCageInfo7", bigStorageCageService.querybigStorageCageDetail(7));
        jsonObject.append("bigStorageCageInfo8", bigStorageCageService.querybigStorageCageDetail(8));
        jsonObject.append("bigStorageCageInfos", bigStorageCageService.querybigStorageCageDetail());
        //进片任务数据
        List<BigStorageCageDetails> bigStorageCageDetailsFeedTask=bigStorageCageDetailsService.selectTask(1);
@@ -57,11 +54,11 @@
        jsonObject.append("bigStorageCageUsage", bigStorageCageUsage);
        //理片笼表格信息
        jsonObject.append("bigStorageCageInfo", bigStorageCageService.querybigStorageCageDetail(0));
        jsonObject.append("bigStorageCageInfo", bigStorageCageService.querybigStorageCageDetailAll());
    }
    public void salve_hangzhoumes_1() throws InterruptedException {
    public void queryDataSource2() throws InterruptedException {
        //出片队列
        List<TemperingGlassInfo> temperingGlassInfoList= temperingGlassInfoService.list();
        jsonObject.append("temperingGlassInfoList", temperingGlassInfoList);
@@ -75,8 +72,11 @@
    public void plcStorageCageTask() throws InterruptedException {
        jsonObject = new JSONObject();
        try {
            hangzhoumes();
            salve_hangzhoumes_1();
            //查询使用数据源1查询数据
            queryDataSource1();
            //查询使用数据源2查询数据
            queryDataSource2();
            ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("slicecage");
            if (sendwServer != null) {
                for (WebSocketServer webserver : sendwServer) {