wu
2024-04-23 0c1eda923c60852f9652f1b9444230c256dad178
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -37,7 +37,7 @@
    public static Boolean isAllowQueue = true;
    public static Boolean isAllowReordering = true;
    // 出片队列警告
    public static Boolean isQueueWarning = false;
    public static Boolean isQueueWarning = true;
    // 铝框id
    public static String FrameNo = "";
    // 是否需要手动确认玻璃
@@ -63,6 +63,9 @@
            JSONObject jsonObject = new JSONObject();
            try {
                Thread.sleep(1000);
                String s1=S7controlalbia.getinstance().readStrings("DB14.38");
                String s2=S7controlalbia.getinstance().readStrings("DB14.40");
                // 注入mapper                
                homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
                spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
@@ -126,9 +129,7 @@
                // String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
                // String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));
                // if (S7control.getinstance().CheckConnected() == true) {
                if (S7control.getinstance().CheckConnected() == true) {
                // 铝框线交互
                if (S7controlLK.getinstance().CheckConnected() == true) {
@@ -275,7 +276,8 @@
                // 自动进片
                isConfirm=true;
                if (isConfirm == true && form3.getglassId() != null && form3.getglassId() != "") {
                    if ((form3.getglassheight() < 380 || form3.getglasswidth() < 390 || form3.getglassheight() > 1810
                        if ((form3.getglassheight() < 380 || form3.getglasswidth() < 390
                                || form3.getglassheight() > 1810
                            || form3.getglasswidth() > 2760)
                            || (form3.getglassheight() < 390 || form3.getglasswidth() < 380
                                    || form3.getglassheight() > 2760 || form3.getglasswidth() > 1810)) {
@@ -289,7 +291,7 @@
                    }
                }
                // }
                }
            } catch (InterruptedException e) {
                e.printStackTrace();