From 1632ba92d37e43baf671f7d465b67d644d545cf5 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 03 一月 2024 08:06:57 +0800
Subject: [PATCH] 测试更新,添加出片队列排序

---
 springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 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 ab4638f..cb92ba3 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
@@ -28,6 +28,7 @@
         // \\ TODO Auto-generated catch block
         e.printStackTrace();
       }
+      if (S7control.getinstance().CheckConnected() == true) {
       spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
       spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
       jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
@@ -39,7 +40,7 @@
       // // TODO Auto-generated catch block
       // e.printStackTrace();
       // }
-      spianService.selectAll("X12345610402GV");
+      //spianService.selectAll("X12345610402GV");
        // 鍑虹墖浠诲姟////////////////////////////////
       List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖杞︾姸鎬�
       List<Short> outlist1 = S7control.getinstance().ReadWord("DB105.18", 1); // 鍑虹墖浠诲姟鏄惁鍚姩
@@ -101,8 +102,8 @@
         spianService.overtask(B02glassid.toString());// 瀹屾垚浠诲姟
         S7control.getinstance().WriteWord("DB106.62", (short) 0);// 鎭㈠B02灏忚溅搴旂瓟鏀逛负0
         System.out.println("姹囨姤鏃禕02|" + B02glassid);
-        boolean yingda = spianService.listbool("DB106.62");// b01姹囨姤
-        System.out.println("姹囨姤鏃禕01|绗�"+aaa+"娆�"+ B02glassid+"搴旂瓟"+yingda);
+        boolean yingda = spianService.listbool("DB106.62");// b02姹囨姤
+        System.out.println("姹囨姤鏃禕02|绗�"+aaa+"娆�"+ B02glassid+"搴旂瓟"+yingda);
       }
 
       // 鑾峰彇DO1鏁版嵁
@@ -157,5 +158,6 @@
 
     }
   }
+}
 
 }

--
Gitblit v1.8.0