From 3633e4fac369d00b8da0c2fd4f867df097fa083a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 02 一月 2025 14:13:19 +0800
Subject: [PATCH] 添加取消出片任务
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 7 ++++---
1 files changed, 4 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 baa53ca..6871663 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,10 +167,11 @@
new QueryWrapper<DownGlassTask>()
.select("Top 1 *")
.eq("end_cell", Const.G13_WORK_STATION)
+ .eq("task_type", 3)
.lt("task_status", Const.UNLOAD_GLASS_DOWN)
.orderByAsc("id")
);
- if(takeGlass!=null){
+ if (takeGlass != null) {
jsonObject4.append("takeGlass", takeGlass);
}
@@ -224,8 +225,8 @@
log.info("鎸夌収鐜荤拑id锛歿}锛屾棤娉曟壘鍒扮幓鐠冧俊鎭�", glassId);
} else {
for (WebSocketServer webserver : sendwServer) {
- jsonObject.append("scanGlass", glassInfo);
- webserver.sendMessage(jsonObject.toString());
+ jsonObject.append("scanGlass", glassInfo);
+ webserver.sendMessage(jsonObject.toString());
}
}
}
--
Gitblit v1.8.0