From 011217be1f04727ff60985bec0de1182400d2377 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期日, 17 九月 2023 15:06:57 +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 | 21 +++++++++++----------
1 files changed, 11 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 5573950..c410d62 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
@@ -45,11 +45,11 @@
// // TODO Auto-generated catch block
// e.printStackTrace();
// }
-
+ spianService.selectAll((short)257);
//鍒ゆ柇杩涚墖璇锋眰
List<Short> datas1List = S7control.getinstance().ReadWord("DB106.24", 1);
List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);
-
+
if (datas1List != null && datas1ListState != null) {
// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
@@ -62,7 +62,7 @@
// 褰撹繘鐗囪溅绌洪棽鏃�
if (exist1 == true) {
// 鑾峰彇杩涚墖id
- List<Short> datas1ListID = S7control.getinstance().ReadWord("DB106.26", 13);
+ List<Short> datas1ListID = S7control.getinstance().ReadWord("DB106.26", 1);
if (datas1ListID != null) {
// 鑾峰彇鐜荤拑id
for (Short list1 : datas1ListID) {
@@ -76,7 +76,7 @@
// System.out.println(exist);
}
}
-
+
//spianService.selectAll((short) 111);
List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖杞︾姸鎬�
@@ -84,14 +84,15 @@
if (outlist != null) {
// 鍒ゆ柇鎸夎鍗曞嚭鐗�
outstate = outlist.contains((short) 0);
- }
- Glass glass=spianMapper.SelectDBOut();//鍒ゆ柇鏄惁鏈夎皟鎷ㄥ悗鐨勫嚭鐗囦换鍔℃湭瀹屾垚
+ Glass glass=spianMapper.SelectDBOut();//鍒ゆ柇鏄惁鏈夎皟鎷ㄥ悗鐨勫嚭鐗囦换鍔℃湭瀹屾垚
- if(outstate== true ){
- if(glass.getId()==2){
- spianService.selectout2(glass.getGlassId().toString());
+ if(outstate== true ){
+ if(glass.getId()==2){
+ spianService.selectout2(glass.getGlassId().toString());
+ }
+ }
}
- }
+
--
Gitblit v1.8.0