From fddf1c716af76c2968e08ce11895eaa1c26319a5 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 26 十一月 2024 14:43:21 +0800
Subject: [PATCH] 增加翻译文件和bug解决
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 109 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 78 insertions(+), 31 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 0970d32..7bac542 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
@@ -2,6 +2,7 @@
import cn.hutool.json.JSONObject;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -140,25 +141,60 @@
// 鍖归厤
// System.err.println(PlcRequest+","+MesSend+","+width+","+height);
if (plcmes.getPlcParameter("GaToMES").getValue() != null) {
- String PlcRequest = plcmes.getPlcParameter("GaToMES").getValue();// 璇锋眰
- String MesSend = plcmes.getPlcParameter("MESToGaStatus").getValue();// 鍙戦��
+ String PlcRequest = plcmes.getPlcParameter("GaToMES").getValue();// plc璇锋眰瀛�
+ String MesSend = plcmes.getPlcParameter("MESToGaStatus").getValue();// mes鍙戦�佸瓧
+ String A01ToMES = plcmes.getPlcParameter("A01ToMES").getValue();// 鎵爜璇锋眰
+ String MESToA01 = plcmes.getPlcParameter("MESToA01").getValue();// 纭鎵爜
+ String Layer = plcmes.getPlcParameter("Layer").getValue();// 灞傚彿
+ String Mateid = plcmes.getPlcParameter("A01MateID").getValue();// 閰嶅鍙�
+ String Order = plcmes.getPlcParameter("A01OrderID").getValue();// 璁㈠崟鍙�
double width = Double.valueOf(plcmes.getPlcParameter("width").getValue());//
// 瀹�
double height = Double.valueOf(plcmes.getPlcParameter("Height").getValue());// 楂�
- // 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)) {
+
+ String celanedOrders = Order.replaceAll("[^a-zA-Z0-9.]", "").trim().split("\\.")[0];
+ String cleanedMateids = Mateid.replaceAll("[^0-9.]", "").trim().split("\\.")[0]; // 绉婚櫎鎵�鏈夐潪鏁板瓧瀛楃
+ String cleanedLayers = Layer.replaceAll("[^0-9.]", "").trim().split("\\.")[0]; //
+
+ String celanedOrder = celanedOrders.isEmpty() ? "" : celanedOrders;
+ String cleanedMateid = cleanedMateids.isEmpty() ? "" : cleanedMateids;
+ String cleanedLayer = cleanedLayers.isEmpty() ? "" : cleanedLayers;
+
+ 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);
+ // 鎵爜璇锋眰鏃�
+ if ("1".equals(A01ToMES) && "0".equals(MESToA01)&&"0".equals(MesSend)&&"0".equals(PlcRequest)) {
+ if(cleanedMateid==""||cleanedLayer==""){
+ cleanedMateid="0";
+ cleanedLayer="0";
+ }
+ int cont = storageCageService.ScanMatch(celanedOrder, Integer.parseInt(cleanedMateid),Integer.parseInt(cleanedLayer));
+ if (cont > 0) {
+ System.out.println("鎵爜鎴愬姛");
+ System.out.println(
+ "Order:" + celanedOrder + " Mateid:" + cleanedMateid + " Layer:" + cleanedLayer);
+
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToA01").getAddress(),
+ (short) 1);
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
+ (short) 1);
+ } else {
+ // QueueMapper.insertMatchFailure(1000, 1000, -1);
+ System.out.println(
+ "Order:" + celanedOrder + " Mateid:" + cleanedMateid + " Layer:" + cleanedLayer);
+ System.out.println("鎵爜娣诲姞澶辫触");
+ }
+ }
+ // 璇锋眰褰掗浂鏃�
+ if ("4".equals(A01ToMES)) {
+ System.out.println("鎵爜褰掗浂鎴愬姛");
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToA01").getAddress(), (short) 0);
+ }
+
+ // 娴嬮噺璇锋眰鏃�
if ("1".equals(PlcRequest) && "0".equals(MesSend)) {
boolean is = HomeService.Normal(width, height, "1");
if (is && istest) {
@@ -166,12 +202,10 @@
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
(short) 1);
- }
- else if (istest) {
+ } else if (istest) {
// 鍖归厤澶辫触
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
(short) 4);
-
}
}
}
@@ -214,14 +248,13 @@
List<StorageTask> StoragTaskeTaskOut = storageCageService.SelectStorageTask(1);
jsonObject.append("StoragTaskeTaskOut", StoragTaskeTaskOut);
- // 鏌ヨ褰撳墠鍑虹墖闃熷垪
- List<Map> OutTask = storageCageService.SelectOutTask();
- jsonObject.append("OutTask", OutTask);
+ // 鏌ヨ褰撳墠鍑虹墖闃熷垪
+ List<Map> OutTask = storageCageService.SelectOutTask();
+ jsonObject.append("OutTask", OutTask);
- // 鏌ヨ鏈�鍚�6娆″嚭鐗囪褰�
- List<Map> OutLog = storageCageService.SelectOutLog();
- jsonObject.append("OutLog", OutLog);
-
+ // 鏌ヨ鏈�鍚�6娆″嚭鐗囪褰�
+ List<Map> OutLog = storageCageService.SelectOutLog();
+ jsonObject.append("OutLog", OutLog);
// 鏌ヨ鎵�鏈夌幓鐠冨帤搴﹀拰鑶滅郴
List<GlassInfo> SelectMeasure = storageCageService.SelectMeasure();
@@ -239,24 +272,38 @@
// 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) {
-
+ Iterator<WebSocketServer> iterator = sendwServer.iterator();
+ while (iterator.hasNext()) {
+ WebSocketServer webserver = iterator.next();
+ webserver.sendMessage(jsonObject.toString());
List<String> messages = webserver.getMessages();
-
if (!messages.isEmpty()) {
// // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
webserver.clearMessages();
- }
- }
-
+ }
}
}
+ // 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();
}
--
Gitblit v1.8.0