From ca1ae93196be366e707647c42e3039512a2cf45f Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 12 十一月 2024 14:00:24 +0800
Subject: [PATCH] 字段显示，结束任务功能更新，界面调整，测量显示
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
index 20a2049..0c83048 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -158,8 +158,9 @@
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
(short) 1);
- } else if (istest) {
- // 閲嶆柊娴嬮噺
+ }
+ else if (istest) {
+ // 鍖归厤澶辫触
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
(short) 4);
@@ -173,7 +174,7 @@
List<GlassInfo> glassInfoFlowCard = glassInfoMapper.selectOrderState(1);
jsonObject.append("glassInfoFlowCard", glassInfoFlowCard);
- Queue LastQueue = QueueMapper.selectLastQueue();
+ Queue LastQueue = QueueMapper.selectLastQueue2();
if (LastQueue == null) {
Queue nullQueue = new Queue();
nullQueue.setglassId("");
@@ -185,8 +186,8 @@
jsonObject.append("LastQueue", nullQueue);
} else {
if (LastQueue.getstate() < 1) {
- LastQueue.setglasswidth(0);
- LastQueue.setglassheight(0);
+ LastQueue.setglasswidth(LastQueue.getglasswidthmm());
+ LastQueue.setglassheight(LastQueue.getglassheightmm());
}
jsonObject.append("LastQueue", LastQueue);
}
--
Gitblit v1.8.0