From 4b4545d1e3ad228ba819e3313853a6e987ef36e6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 20 九月 2023 01:19:50 +0800
Subject: [PATCH] 1,取消在开始进片或出片时结束之前的任务,改为进片车或出片车变空闲后立即结束数据库任务表的任务状态; 2,手动删除玻璃时恢复数据库理片笼信息中的剩余宽度

---
 springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
index 5e4d59e..17b9d6d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
@@ -21,9 +21,9 @@
 //      JSONObject jsonObject = new JSONObject();
 //      jsonObject.append("params", new short[]{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0});
 
-//      List<Boolean> paramlist = S7control.getinstance().ReadBits("DB100.DBW", 12);
-      Boolean[] values = {false, true,false, true,false, true,false, true,false, true,false, true,false, true,false, true,false, true,false, true,false, true};
-      List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
+ List<Boolean> paramlist = S7control.getinstance().ReadBits("DB2.0.0", 26);
+//      Boolean[] values = {true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,false, true};
+//      List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
       if (paramlist == null) {
 
       } else {
@@ -47,7 +47,7 @@
 
           List<String> messages = webSocketServer.getMessages();
 
-          String addressList = "DB100.DBW0";
+          String addressList = "DB2.0.0";
 
           if (!messages.isEmpty()) {
             // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
@@ -70,7 +70,7 @@
             // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
             List<Boolean> messageBooleans = new ArrayList<>();
             for (Integer value : messageValues) {
-              messageBooleans.add(value == 0 ? true : false);
+              messageBooleans.add(value == 1 ? true : false);
             }
 
             // 灏嗗竷灏斿垪琛ㄥ啓鍏� PLC

--
Gitblit v1.8.0