Merge remote-tracking branch 'origin/master'

zhoushihao

2024-10-11 d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678

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

@@ -172,9 +172,11 @@
                        .select("Top 1 *")

                        .eq("end_cell", Const.G13_WORK_STATION)

                        .lt("task_status", Const.UNLOAD_GLASS_DOWN)

                        .orderByDesc("id")

                        .orderByAsc("id")

        );

        jsonObject4.append("takeGlass", takeGlass);

        if(takeGlass!=null){

            jsonObject4.append("takeGlass", takeGlass);

        }



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

        if (sendwServer4 != null) {

@@ -208,9 +210,9 @@


    @Scheduled(fixedDelay = Long.MAX_VALUE)

    public void scanCodeTask() {

        JSONObject jsonObject = new JSONObject();

        log.info("扫描任务已启动");

        while (true) {

            JSONObject jsonObject = new JSONObject();

            try (Socket socket = new Socket(scanIp, scanPort);

                 BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()))) {

                // 接收服务器响应