From 865ff82a55657d93516225d724fa0261965e0df2 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 24 十月 2023 10:18:51 +0800
Subject: [PATCH] 上片弹窗提示
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 30 ++++++++++++++++++++----------
1 files changed, 20 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 feaec32..cccfa0e 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
@@ -48,12 +48,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);// 鑾峰彇杩涚墖杞︿换鍔℃槸鍚﹀惎鍔�
-
+ // 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);
+ spianMapper.insertqueue("1",1);
+
if (datas1List != null && datas1ListState != null) {
// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
@@ -74,6 +82,7 @@
if(inglassbegin&exist1)
{
inglassbegin=false;
+ spianMapper.Updatetask(1, 0);//绔嬪嵆缁撴潫鏁版嵁搴撹〃涓殑涓婄墖浠诲姟
spianMapper.UpdataAddCageState(1,2);
}
// 杩涚墖璇锋眰涓�1鏃�
@@ -82,7 +91,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);
@@ -100,7 +109,7 @@
{
spianService.selectAll(strId.toString());
S7control.getinstance().WriteByte("DB105.16",datas1ListID);//娲惧彂杩涚墖id
-
+
}
//spianService.selectAll(Short.parseShort(strId.toString()));
}
@@ -108,9 +117,9 @@
}
// System.out.println(exist);
}
-
- if(exist1==false){//涓嬪彂浠诲姟鍚庡皢浠诲姟鍚姩鏀逛负0
- if(exist2==true) {
+//涓嬪彂浠诲姟鍚庡皢浠诲姟鍚姩鏀逛负0
+ if(exist1==false){ //杩涚墖杞﹀繖纰屾椂
+ if(exist2==true) { //浠诲姟宸插惎鍔ㄦ椂
S7control.getinstance().WriteWord("DB105.12",(short)0);//杩涚墖浠诲姟鍚姩鏀逛负0
}
}
@@ -145,6 +154,7 @@
if(outglassbegin&outstate)//褰撲换鍔″紑濮嬩笖鍑虹墖杞︾┖闂叉椂
{
outglassbegin=false;
+ spianMapper.UpdatetaskOut(); //瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔�
spianMapper.UpdataAddCageState(0,3);
}
--
Gitblit v1.8.0