From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期五, 11 十月 2024 08:39:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java index b2693bb..ad8e5a3 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java +++ b/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()))) { // 鎺ユ敹鏈嶅姟鍣ㄥ搷搴� -- Gitblit v1.8.0