From b092806a662b99310cdb050292de2721ba06acd9 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 19 十一月 2024 14:43:18 +0800
Subject: [PATCH] 增加测量台直通模式，增加手动参数界面的JSON文件
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 0c83048..0970d32 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
@@ -14,6 +14,7 @@
import com.example.springboot.entity.Glass;
import com.example.springboot.entity.GlassInfo;
import com.example.springboot.entity.MeasureSetting;
+import com.example.springboot.entity.OutTask;
import com.example.springboot.entity.Out_slice;
import com.example.springboot.entity.Queue;
import com.example.springboot.entity.StorageCage;
@@ -144,10 +145,17 @@
double width = Double.valueOf(plcmes.getPlcParameter("width").getValue());//
// 瀹�
double height = Double.valueOf(plcmes.getPlcParameter("Height").getValue());// 楂�
- if ("0".equals(PlcRequest) && istest) {
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
- (short) 0);
+ // if ("0".equals(PlcRequest) && "1".equals(MesSend)|| "0".equals(PlcRequest) && "4".equals(MesSend)) {
+ // S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 0);
+ // }
+ // if ("2".equals(PlcRequest) && "1".equals(MesSend)) {
+ // S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 0);
+ // }
+ if ("4".equals(PlcRequest)) {
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 0);
+ System.out.println("鏀跺洓褰掗浂");
}
+
// System.out.println("PlcRequest:" + PlcRequest+"MesSend:" + MesSend+"width:" +
// width+"height:" + height);
@@ -206,6 +214,15 @@
List<StorageTask> StoragTaskeTaskOut = storageCageService.SelectStorageTask(1);
jsonObject.append("StoragTaskeTaskOut", StoragTaskeTaskOut);
+ // 鏌ヨ褰撳墠鍑虹墖闃熷垪
+ List<Map> OutTask = storageCageService.SelectOutTask();
+ jsonObject.append("OutTask", OutTask);
+
+ // 鏌ヨ鏈�鍚�6娆″嚭鐗囪褰�
+ List<Map> OutLog = storageCageService.SelectOutLog();
+ jsonObject.append("OutLog", OutLog);
+
+
// 鏌ヨ鎵�鏈夌幓鐠冨帤搴﹀拰鑶滅郴
List<GlassInfo> SelectMeasure = storageCageService.SelectMeasure();
jsonObject.append("SelectMeasure", SelectMeasure);
--
Gitblit v1.8.0