springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -161,21 +161,23 @@
                    String cleanedLayer = cleanedLayers.isEmpty() ? "" : cleanedLayers;
                    if ("4".equals(PlcRequest)) {
                        S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 0);
                        S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
                                (short) 0);
                        System.out.println("收四归零");
                    }
                    // 扫码请求时
                    if ("1".equals(A01ToMES) && "0".equals(MESToA01)&&"0".equals(MesSend)&&"0".equals(PlcRequest)) {
                        if(cleanedMateid==""||cleanedLayer==""){
                            cleanedMateid="0";
                            cleanedLayer="0";
                    if ("1".equals(A01ToMES) && "0".equals(MESToA01) && "0".equals(MesSend) && "0".equals(PlcRequest)) {
                        if (cleanedMateid == "" || cleanedLayer == "") {
                            cleanedMateid = "0";
                            cleanedLayer = "0";
                        }
                        int cont = storageCageService.ScanMatch(celanedOrder, Integer.parseInt(cleanedMateid),Integer.parseInt(cleanedLayer));
                        int cont = storageCageService.ScanMatch(celanedOrder, Integer.parseInt(cleanedMateid),
                                Integer.parseInt(cleanedLayer));
                        if (cont > 0) {
                            System.out.println("扫码成功");
                            System.out.println(
                                    "Order:" + celanedOrder + " Mateid:" + cleanedMateid + " Layer:" + cleanedLayer);
                            S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToA01").getAddress(),
                                    (short) 1);
                            S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
@@ -274,37 +276,47 @@
                // System.out.println("jsonObject:" + jsonObject);
                ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
                if (sendwServer != null) {
                    Iterator<WebSocketServer> iterator = sendwServer.iterator();
                    while (iterator.hasNext()) {
                        WebSocketServer webserver = iterator.next();
                        webserver.sendMessage(jsonObject.toString());
                    try {
                        Iterator<WebSocketServer> iterator = sendwServer.iterator();
                        while (iterator.hasNext()) {
                            WebSocketServer webserver = iterator.next();
                            webserver.sendMessage(jsonObject.toString());
                            List<String> messages = webserver.getMessages();
                            if (!messages.isEmpty()) {
                                // // 将最后一个消息转换为整数类型的列表
                                webserver.clearMessages();
                            }
                            }
                        }
                    } catch (Exception e) {
                        e.printStackTrace(); // 打印堆栈信息,方便定位问题
                        System.out.println("webserver出现异常: " + e.getMessage());
                        // TODO: handle exception
                    }
                }
                // ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
                // ArrayList<WebSocketServer> sendwServer =
                // WebSocketServer.sessionMap.get("Home");
                // if (sendwServer != null) {
                //     for (WebSocketServer webserver : sendwServer) {
                //         webserver.sendMessage(jsonObject.toString());
                //         if (webserver != null) {
                //             List<String> messages = webserver.getMessages();
                // for (WebSocketServer webserver : sendwServer) {
                // webserver.sendMessage(jsonObject.toString());
                // if (webserver != null) {
                // List<String> messages = webserver.getMessages();
                //             if (!messages.isEmpty()) {
                //                 // // 将最后一个消息转换为整数类型的列表
                //                 webserver.clearMessages();
                //             }
                //         }
                // if (!messages.isEmpty()) {
                // // // 将最后一个消息转换为整数类型的列表
                // webserver.clearMessages();
                // }
                // }
                //     }
                // }
                // }
            } catch (InterruptedException e) {
                System.out.println("线程出现异常");
                e.printStackTrace();
            }
        }