Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes

wu

2024-04-11 fdf078d0adec8aaa4bdf39a61db38ed68184b50d

 springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java

@@ -124,8 +124,6 @@

                // }
                

                
                // 获取测量的长，宽
                boolean istest = true;
                // String PlcRequest = "1";
@@ -135,27 +133,30 @@

                // 匹配
                // System.err.println(PlcRequest+","+MesSend+","+width+","+height);
                // String PlcRequest = plcmes.getPlcParameter("GaToMES").getValue();// 请求
                // String MesSend = plcmes.getPlcParameter("MESToGaStatus").getValue();// 发送
                // double width = Double.valueOf(plcmes.getPlcParameter("width").getValue());// 宽
                // double height = Double.valueOf(plcmes.getPlcParameter("Height").getValue());// 高
                // if ("0".equals(PlcRequest) && istest) {
                //     S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 0);
                // }
                // if ("1".equals(PlcRequest) && "0".equals(MesSend)) {
                //     boolean is = HomeService.Normal(width, height, "1");
                //     if (is && istest) {
                //         // 测量成功
                //         S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
                //                 (short) 1);
                if (plcmes.getPlcParameter("GaToMES").getValue() != null) {
                    String PlcRequest = plcmes.getPlcParameter("GaToMES").getValue();// 请求
                    String MesSend = plcmes.getPlcParameter("MESToGaStatus").getValue();// 发送
                    double width = Double.valueOf(plcmes.getPlcParameter("width").getValue());// 宽
                    double height = Double.valueOf(plcmes.getPlcParameter("Height").getValue());// 高
                    if ("0".equals(PlcRequest) && istest) {
                        S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
                                (short) 0);
                    }
                    if ("1".equals(PlcRequest) && "0".equals(MesSend)) {
                        boolean is = HomeService.Normal(width, height, "1");
                        if (is && istest) {
                            // 测量成功
                            S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
                                    (short) 1);

                //     } else if (istest) {
                //         // 重新测量
                //         S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
                //                 (short) 4);
                //     }
                        } else if (istest) {
                            // 重新测量
                            S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
                                    (short) 4);
                        }
                    }
                }

                // }
                // S7control.getinstance().WriteWord("DB14.170", (short)0);
                Queue LastQueue = QueueMapper.selectLastQueue();
                if (LastQueue == null) {
@@ -192,11 +193,8 @@
                List<FlowCard> OrderTask = storageCageService.SelectOrderTask();
                jsonObject.append("OrderTask", OrderTask);

            } catch (InterruptedException e) {
                e.printStackTrace();
            }

            // jsonObject.append("params", new short[] { 30, 40, });
                // System.out.println("jsonObject:" + jsonObject);
            ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
            if (sendwServer != null) {
                for (WebSocketServer webserver : sendwServer) {
@@ -214,6 +212,10 @@

                }
            }

            } catch (InterruptedException e) {
                e.printStackTrace();
            }
        }
    }
}