From ced0655bb9f83906eb9986462c9641c15baa5918 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 09 四月 2024 14:18:03 +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 | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 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 727b9cb..f332474 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
@@ -135,27 +135,27 @@
// 鍖归厤
// System.err.println(PlcRequest+","+MesSend+","+width+","+height);
- String PlcRequest = plcmes.getPlcParameter("GaToMES").getValue();// 璇锋眰
- String MesSend = plcmes.getPlcParameter("MESToGaStatus").getValue();// 鍙戦��
- 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 ("1".equals(PlcRequest) && "0".equals(MesSend)) {
- boolean is = HomeService.Normal(width, height, "1");
- if (is && istest) {
- // 娴嬮噺鎴愬姛
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
- (short) 1);
+ // String PlcRequest = plcmes.getPlcParameter("GaToMES").getValue();// 璇锋眰
+ // String MesSend = plcmes.getPlcParameter("MESToGaStatus").getValue();// 鍙戦��
+ // 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 ("1".equals(PlcRequest) && "0".equals(MesSend)) {
+ // boolean is = HomeService.Normal(width, height, "1");
+ // if (is && istest) {
+ // // 娴嬮噺鎴愬姛
+ // S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
+ // (short) 1);
- } else if (istest) {
- // 閲嶆柊娴嬮噺
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
- (short) 4);
- }
+ // } else if (istest) {
+ // // 閲嶆柊娴嬮噺
+ // S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
+ // (short) 4);
+ // }
- }
+ // }
// S7control.getinstance().WriteWord("DB14.170", (short)0);
Queue LastQueue = QueueMapper.selectLastQueue();
if (LastQueue == null) {
--
Gitblit v1.8.0