From e7110f57152cc0428dfa18ea34a924b06b2d89b3 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 09 四月 2024 14:12:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 113e5ad..f663b3c 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
@@ -130,8 +130,8 @@
boolean istest = true;
// String PlcRequest = "1";
// String MesSend = "0";
- // double width = 402;
- // double height = 402;
+ // double width = 516;
+ // double height = 507;
//鍖归厤
//System.err.println(PlcRequest+","+MesSend+","+width+","+height);
@@ -157,8 +157,14 @@
nullQueue.setglassId("");
nullQueue.setglassheight(0);
nullQueue.setglasswidth(0);
+ nullQueue.setglassheightmm(0);
+ nullQueue.setglasswidthmm(0);
jsonObject.append("LastQueue", nullQueue);
}else{
+ if (LastQueue.getstate()<1) {
+ LastQueue.setglasswidth(0);
+ LastQueue.setglassheight(0);
+ }
jsonObject.append("LastQueue", LastQueue);
}
// String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
--
Gitblit v1.8.0