Merge remote-tracking branch 'origin/master'

zhoushihao

2024-09-02 cfd9f0b05e4e9b46c4d72ec5cefd3c04648648ea

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java

@@ -48,7 +48,7 @@
        log.info("发送工位玻璃信息");

        JSONObject jsonObject = new JSONObject();



        List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1, 6);

        List<DownWorkstation> data = downWorkstationService.list();

        jsonObject.append("params", data);

        log.info(jsonObject.toString());

        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass");

@@ -148,6 +148,16 @@
            autoPrint = redisUtil.getCacheObject("autoPrint");

        }

        jsonObject4.append("autoPrint", autoPrint);

        //人工下片位置最后一片

        DownGlassTask takeGlass = downGlassTaskService.getOne(

                new QueryWrapper<DownGlassTask>()

                        .select("Top 1 *")

                        .eq("end_cell", Const.G13_WORK_STATION)

                        .orderByDesc("id")



        );

        jsonObject4.append("takeGlass", takeGlass);





        ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("unloadglass");

        if (sendwServer4 != null) {