From 241e5b5b546f0824ed405914b26dde8e1e502b02 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期日, 17 九月 2023 17:54:06 +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 | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 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..75153b0 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杩涚墖璇锋眰鏁版嵁
@@ -57,26 +57,30 @@
// 鑾峰彇杩涚墖杞︾姸鎬�
boolean exist1 = datas1ListState.contains((short) 0);
String glassid="";
+ StringBuilder strId=new StringBuilder();
+
// 杩涚墖璇锋眰涓�1鏃�
if (exist == true) {
// 褰撹繘鐗囪溅绌洪棽鏃�
if (exist1 == true) {
// 鑾峰彇杩涚墖id
- List<Short> datas1ListID = S7control.getinstance().ReadWord("DB106.26", 13);
+ byte[] datas1ListID = S7control.getinstance().ReadByte("DB106.26", 4);
if (datas1ListID != null) {
// 鑾峰彇鐜荤拑id
- for (Short list1 : datas1ListID) {
- glassid=glassid.concat(list1.toString());
+ for (byte list1 : datas1ListID) {
+ strId.append(list1);
}
- spianService.selectAll(Short.parseShort(glassid));
+ spianService.selectAll(strId.toString());
+ //spianService.selectAll(Short.parseShort(strId.toString()));
+ S7control.getinstance().WriteByte("DB105.16",datas1ListID);
}
}
// System.out.println(exist);
}
}
-
+
//spianService.selectAll((short) 111);
List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖杞︾姸鎬�
@@ -84,14 +88,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