From 17b8d077f7efe3db20344987cdad9da9d9ab3de6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 03 十一月 2023 15:21:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
index c7c8b6a..b5023ae 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -38,6 +38,12 @@
spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
+ spianService.selectout("1145");
+ //spianService.selectAll2();
+ //澧炲姞闃熷垪琛ㄦ暟鎹�
+ //spianMapper.insertqueue("1",1,1500);
+
+
// 鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�,鍗曠嫭鏁版嵁婧�
// try {
@@ -48,12 +54,20 @@
// // TODO Auto-generated catch block
// e.printStackTrace();
// }
- // spianService.selectAll((short)257);
+
//鍒ゆ柇杩涚墖璇锋眰
List<Short> datas1List = S7control.getinstance().ReadWord("DB106.24", 1);// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 鑾峰彇杩涚墖杞︾姸鎬�
List<Short> datas1ListState2 = S7control.getinstance().ReadWord("DB105.12", 1);// 鑾峰彇杩涚墖杞︿换鍔℃槸鍚﹀惎鍔�
-
+ //娴嬭瘯鍚姩鑷畾涔塸rc鍊�
+ // List<Short> datas1List=new ArrayList<>();
+ // datas1List.add((short)1);
+ // List<Short> datas1ListState=new ArrayList<>();
+ // datas1List.add((short)0);
+ // List<Short> datas1ListState2=new ArrayList<>();
+ // datas1List.add((short)0);
+
+
if (datas1List != null && datas1ListState != null) {
// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
@@ -67,11 +81,11 @@
StringBuilder strId=new StringBuilder();
StringBuilder writedstrId=new StringBuilder();
- if(!inglassbegin&!exist1)
+ if(!inglassbegin&!exist1)//褰撹繘鐗囪溅涓嶇┖闂叉椂
{
inglassbegin=true;
}
- if(inglassbegin&exist1)
+ if(inglassbegin&exist1)//褰撹繘鐗囪溅绌洪棽鏃�
{
inglassbegin=false;
spianMapper.Updatetask(1, 0);//绔嬪嵆缁撴潫鏁版嵁搴撹〃涓殑涓婄墖浠诲姟
@@ -83,7 +97,7 @@
if (exist1 == true) {
//鑾峰彇宸蹭笅鍙戠殑杩涚墖id 涓巔lc璇锋眰鐨刬d浣滄瘮杈�
byte[] writedglassidbytes = S7control.getinstance().ReadByte("DB105.16", 1);
- if (writedglassidbytes != null) {
+ if (writedglassidbytes != null) { //
// 鑾峰彇鐜荤拑id
for (byte iditem : writedglassidbytes) {
writedstrId.append(iditem);
@@ -99,9 +113,15 @@
}
if(!writedstrId.toString().equals(strId.toString())) //宸茬粡涓嬪彂鐨刬d涓巔lc璇锋眰鐨刬d涓嶄竴鏍锋椂锛岃涓轰笉鏄噸澶嶇殑浠诲姟锛屾墠鎵ц涓嬪彂浠诲姟鎸囦护
{
- spianService.selectAll(strId.toString());
+
+ int glasslimit=1;//鍒ゆ柇鏄惁鏄鐗囦笂鐗�
+ if(glasslimit==1){
+ spianService.selectAll(strId.toString());
+ }else{
+ spianService.selectAll(strId.toString());
+ }
S7control.getinstance().WriteByte("DB105.16",datas1ListID);//娲惧彂杩涚墖id
-
+
}
//spianService.selectAll(Short.parseShort(strId.toString()));
}
--
Gitblit v1.8.0