From eaa749c5939632dd1aa7aa9440570886e29e6a63 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 26 三月 2024 15:32:42 +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/PlcHoldNew.java | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
index eed7ccf..513af57 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
@@ -33,17 +33,7 @@
// \\ TODO Auto-generated catch block
e.printStackTrace();
}
- // List<Short> ss= S7control.getinstance().ReadWord("DB14.0", 1);
- // System.out.println(ss);
- // System.out.println(111111);
- // List<Short> E0sss1id = S7control.getinstance().ReadWord("DB14.0",1);
- // String E01id = S7control.getinstance().readStrings("DB14.38");
- // System.out.println(E01id);
- // if (S7control.getinstance().CheckCsonnected() == false) {
- List<Short> E0sss1id = S7control.getinstance().ReadWord("DB14.206",1);
- List<String> st= S7control.getinstance().readStrings("DB14.206");
- byte[] E0sss1ids = S7control.getinstance().ReadByte("DB14.206",2);
- byte[] E0sss1idss = S7control.getinstance().ReadByte("DB14.0",210);
+
spianService = WebSocketServer.applicationContext.getBean(SpianServiceNew.class);
albaniaMapper = WebSocketServer.applicationContext.getBean(AlbaniaMapper.class);
//spianService.selectAll(albaniaMapper.SelectGlass());
@@ -64,20 +54,21 @@
S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(), (short) 1);
spianService.selectout(1);
}
- //浜岀嚎鍙疯姹傛椂
+ // //浜岀嚎鍙疯姹傛椂
if (ExportToMES2.equals("1") == true&&B01State.equals("0")==true) {
//灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(), (short) 1);
spianService.selectout(2);
}
//杩涚墖璇锋眰鏃�
+ if(PLCToMES!=null && B01State!=null){
if(PLCToMES.equals("1")==true&&B01State.equals("0")==true){
//灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(), (short) 1);
+ //S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(), (short) 1);
spianService.selectAll(albaniaMapper.SelectGlass());
}
-
+
//浠诲姟瀹屾垚鏃�
if(TastState.equals("1")==true){
@@ -93,7 +84,7 @@
}
}
}
-
+ }
// 鏌ヨ鏁版嵁搴�
// 鎺ㄩ�佸埌鍓嶇
--
Gitblit v1.8.0