From fdf078d0adec8aaa4bdf39a61db38ed68184b50d Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 11 四月 2024 09:04:35 +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 | 82 +++++++++++++++++++++--------------------
1 files changed, 42 insertions(+), 40 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 f332474..3ac31c8 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
@@ -123,9 +123,7 @@
// if(plcmes.==null){
// }
-
-
// 鑾峰彇娴嬮噺鐨勯暱锛屽
boolean istest = true;
// String PlcRequest = "1";
@@ -135,27 +133,30 @@
// 鍖归厤
// 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);
+ if (plcmes.getPlcParameter("GaToMES").getValue() != null) {
+ 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) {
@@ -192,27 +193,28 @@
List<FlowCard> OrderTask = storageCageService.SelectOrderTask();
jsonObject.append("OrderTask", OrderTask);
+ // jsonObject.append("params", new short[] { 30, 40, });
+ // System.out.println("jsonObject:" + jsonObject);
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
+
+ if (webserver != null) {
+
+ List<String> messages = webserver.getMessages();
+
+ if (!messages.isEmpty()) {
+ // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+ webserver.clearMessages();
+ }
+ }
+
+ }
+ }
+
} catch (InterruptedException e) {
e.printStackTrace();
- }
-
- // jsonObject.append("params", new short[] { 30, 40, });
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- webserver.sendMessage(jsonObject.toString());
-
- if (webserver != null) {
-
- List<String> messages = webserver.getMessages();
-
- if (!messages.isEmpty()) {
- // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- webserver.clearMessages();
- }
- }
-
- }
}
}
}
--
Gitblit v1.8.0