From dd5432591b4018bd1244102b8cf86c22569ec163 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 24 一月 2024 16:40:15 +0800
Subject: [PATCH] 地址参数设置增加  设定按钮

---
 springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java |   91 ++++++++++++++++++++++++---------------------
 1 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
index ba8ef60..d81c8d7 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -54,21 +54,19 @@
     @Override
     public void run() {
         while (this != null) {
+            JSONObject jsonObject = new JSONObject();
             try {
                 Thread.sleep(1000);
-
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            JSONObject jsonObject = new JSONObject();
-
-            // 娉ㄥ叆mapper
+                // 娉ㄥ叆mapper
 
             homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
             spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
             spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
             outSliceServive = WebSocketServer.applicationContext.getBean(OutSliceServive.class);
             north_Glass_Buffer1Service = WebSocketServer.applicationContext.getBean(North_Glass_Buffer1Service.class);
+            storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
+            dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
+
             // 绗煎瓙浣跨敤鎯呭喌
             List<StorageCage> tableData = homeMapper.selectAll();
             jsonObject.append("tableData", tableData);
@@ -119,41 +117,46 @@
             Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
             jsonObject.append("CurrentFrame", CurrentFrame);
 
-            // List<Short> listd17 = S7control.getinstance().ReadWord("DB17.0",10);
-            // String id=spianService.queGlassid("DB17.10", 14).toString();
-            //
+            // String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
+            // String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));
+
+            
+
+            
+            
+
+           
 
             // 閾濇绾夸氦浜�
-            try {
-                if (CurrentFrame != null) {
-                    spianService.outmesid(CurrentFrame.getBarCode(), "DB17.0");
-                }
-
-                List<Short> framerequests = S7control.getinstance().ReadWord("閾濇id璇锋眰瀛楀湴鍧�", 1);
-                for (Short framerequest : framerequests) {
-                    if (framerequest == 1) {
-                        // 閾濇id
-                        String franmeno = spianService.queGlassid("DB17.10", 14).toString();
-                        String position;
-                        try {
-                            position = dbserve.SelectPositionByFrameBarcode(franmeno);
-                        } catch (SQLException e) {
-                            // TODO Auto-generated catch block
-                            position = "0";
-                            e.printStackTrace();
-                        }
-                        Short send;
-                        if (position == "0") {
-                            send = 0;
-                        } else {
-                            send = 1;
-                        }
-                        S7control.getinstance().WriteWord("閾濇缈昏浆鍙戦�佸湴鍧�", (short) send);
-                    }
-                }
-            } catch (Exception e) {
-                // TODO: handle exception
+            if (CurrentFrame != null) {
+                S7controlLK.getinstance().writeStrings(CurrentFrame.getBarCode(),"DB17.0");
             }
+            String E01id=S7controlLK.getinstance().readStrings("DB17.0");
+            String J01id=S7controlLK.getinstance().readStrings("DB17.22");
+            
+            List<Short> liststates=S7controlLK.getinstance().ReadWord("DB17.38", 1);
+            List<Short> liststate=S7controlLK.getinstance().ReadWord("DB17.20", 1);
+            Short framerequest = liststate.get(0);
+                if (framerequest == 1) {
+                    // 閾濇id
+                    String position;
+                    try {
+                        position = dbserve.SelectPositionByFrameBarcode(J01id);
+                    } catch (SQLException e) {
+                        // TODO Auto-generated catch block
+                        position = "0";
+                        e.printStackTrace();
+                    }
+                    Short send;
+                    if (position.equals("0")) {
+                        send = 0;
+                    } else {
+                        send = 1;
+                    }
+                    S7controlLK.getinstance().WriteWord("DB17.38", (short) send);
+                }
+            
+            
 
             if (S7control.getinstance().CheckConnected() == true) {
                 // 鑾峰彇褰撳墠鎵爜鏂瑰紡
@@ -211,7 +214,6 @@
                     if (inglassInfo.size() > 0) {
                         jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
                     }
-
                 }
                 // // 鑾峰彇閾濇idDB106.DBW64锛屾坊鍔犲埌鍑虹墖闃熷垪
                 // String frameno="X21763329601FB";
@@ -268,8 +270,13 @@
                 }
             }
 
-            storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
-            dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            
+
+            
+            
             boolean dbconnected = false;
             try {
                 dbserve.getConn();

--
Gitblit v1.8.0