From 75c5e7ac09345c5ee636e16f1d54e903b9ef0859 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 05 九月 2024 10:37:01 +0800
Subject: [PATCH] 下片添加显示扫码枪玻璃信息，添加下片任务状态
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 54b5416..de467ff 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
@@ -167,11 +167,10 @@
new QueryWrapper<DownGlassTask>()
.select("Top 1 *")
.eq("end_cell", Const.G13_WORK_STATION)
+ .lt("task_status", Const.UNLOAD_GLASS_DOWN)
.orderByDesc("id")
-
);
jsonObject4.append("takeGlass", takeGlass);
-
ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("unloadglass");
if (sendwServer4 != null) {
@@ -205,21 +204,24 @@
@Scheduled(fixedDelay = Long.MAX_VALUE)
public void scanCodeTask() {
+ JSONObject jsonObject = new JSONObject();
while (true) {
try (Socket socket = new Socket(scanIp, scanPort);
BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()))) {
// 鎺ユ敹鏈嶅姟鍣ㄥ搷搴�
+ socket.setSoTimeout(1000);
String response;
while ((response = in.readLine()) != null) {
- List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("scanCode");
+ List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass");
if (CollectionUtils.isNotEmpty(sendwServer)) {
//鎸夌収鐜荤拑id鑾峰彇鐜荤拑淇℃伅杩斿洖缁欏墠绔晫闈紝鍏蜂綋闇�瑕佸摢浜涙暟鎹緟纭
GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
- .eq(GlassInfo::getGlassId, response).last("limit 1"));
+ .eq(GlassInfo::getGlassId, response));
if (null == glassInfo) {
log.info("鎸夌収鐜荤拑id锛歿}锛屾棤娉曟壘鍒扮幓鐠冧俊鎭�", response);
} else {
- sendwServer.get(0).sendMessage(glassInfo.toString());
+ jsonObject.append("scanGlass",glassInfo);
+ sendwServer.get(0).sendMessage(jsonObject.toString());
}
}
}
--
Gitblit v1.8.0