From 4cdcf84577f52d8dd991cd90045264170da81c0c Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 18 九月 2023 01:26:19 +0800
Subject: [PATCH] 晚上调试修改的内容
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 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 75153b0..1637ab3 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
@@ -27,7 +27,7 @@
while (this != null) {
try {
- Thread.sleep(500);
+ Thread.sleep(1000);
} catch (InterruptedException e) {
// \\ TODO Auto-generated catch block
e.printStackTrace();
@@ -47,15 +47,19 @@
// }
// spianService.selectAll((short)257);
//鍒ゆ柇杩涚墖璇锋眰
- List<Short> datas1List = S7control.getinstance().ReadWord("DB106.24", 1);
- List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);
-
+ 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);// 鑾峰彇杩涚墖杞︿换鍔℃槸鍚﹀惎鍔�
+
if (datas1List != null && datas1ListState != null) {
// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
boolean exist = datas1List.contains((short) 1);
// 鑾峰彇杩涚墖杞︾姸鎬�
boolean exist1 = datas1ListState.contains((short) 0);
+ //鍒ゆ柇杩涚墖杞︿换鍔℃槸鍚﹀惎鍔�
+ boolean exist2 = datas1ListState2.contains((short) 1);
+
String glassid="";
StringBuilder strId=new StringBuilder();
@@ -64,7 +68,7 @@
// 褰撹繘鐗囪溅绌洪棽鏃�
if (exist1 == true) {
// 鑾峰彇杩涚墖id
- byte[] datas1ListID = S7control.getinstance().ReadByte("DB106.26", 4);
+ byte[] datas1ListID = S7control.getinstance().ReadByte("DB106.26", 1);
if (datas1ListID != null) {
// 鑾峰彇鐜荤拑id
for (byte list1 : datas1ListID) {
@@ -73,28 +77,43 @@
}
spianService.selectAll(strId.toString());
//spianService.selectAll(Short.parseShort(strId.toString()));
- S7control.getinstance().WriteByte("DB105.16",datas1ListID);
+ S7control.getinstance().WriteByte("DB105.16",datas1ListID);//娲惧彂杩涚墖id
}
}
// System.out.println(exist);
+ }
+
+ if(exist1==false){//涓嬪彂浠诲姟鍚庡皢浠诲姟鍚姩鏀逛负0
+ if(exist2==true) {
+ S7control.getinstance().WriteWord("DB105.12",(short)0);//杩涚墖浠诲姟鍚姩鏀逛负0
+ }
}
}
//spianService.selectAll((short) 111);
List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖杞︾姸鎬�
+ List<Short> outlist1 = S7control.getinstance().ReadWord("DB105.14", 1); // 鍑虹墖浠诲姟鏄惁鍚姩
boolean outstate=false;//鍑虹墖杞︾┖闂插垽鏂�
- if (outlist != null) {
+ boolean outstate1=false;//鍑虹墖杞︿换鍔℃槸鍚﹀惎鍔�
+ if (outlist != null&&outlist1!=null) {
// 鍒ゆ柇鎸夎鍗曞嚭鐗�
- outstate = outlist.contains((short) 0);
+ outstate = outlist.contains((short) 0);//鍑虹墖杞︾┖闂插垽鏂�
+ outstate1 = outlist1.contains((short) 1);//鍑虹墖杞︿换鍔℃槸鍚﹀惎鍔�
+
Glass glass=spianMapper.SelectDBOut();//鍒ゆ柇鏄惁鏈夎皟鎷ㄥ悗鐨勫嚭鐗囦换鍔℃湭瀹屾垚
if(outstate== true ){
- if(glass.getId()==2){
+ if(glass.getId()==2){
spianService.selectout2(glass.getGlassId().toString());
}
- }
+ }
+ if(outstate==false){//涓嬪彂浠诲姟鍚庡皢浠诲姟鍚姩鏀逛负0//鍑虹墖杞︾┖闂插垽鏂�
+ if(outstate1==true){
+ S7control.getinstance().WriteWord("DB105.14",(short)0);//鍑虹墖浠诲姟鍚姩鏀逛负0
+ }
+ }
}
--
Gitblit v1.8.0