代码更新

ZengTao

2024-02-23 9102806e784fff6ebbd8773f2f07f8e5768de702

代码更新

 CanadaMes-ui/src/lang/locales/en-US.json

@@ -1,6 +1,6 @@
{

  "Clear":"Clear",

  "ip":"192.168.10.21",

  "ip":"localhost",

  "systemTitle": "Login System",

  "usernamePlaceholder": "Please enter username",

  "passwordPlaceholder": "Please enter password",


 CanadaMes-ui/src/lang/locales/zh-CN.json

@@ -1,6 +1,6 @@
{

  "Clear":"清除",

  "ip":"192.168.10.21",

  "ip":"localhost",

  "systemTitle": "登录系统",

  "usernamePlaceholder": "请输入用户名",

  "passwordPlaceholder": "请输入密码",


 CanadaMes-ui/src/views/home/index.vue

@@ -1124,8 +1124,9 @@


                    if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 0) {

                        this.loadglassheight1 = 70;

                        if (this.form5.glassId != obj.form3[0].glassId) {

                        if (this.form5.glassId != obj.form3[0].glassId&&this.ManuallyInfeedGlass==false) {

                            this.showform3();

                            
                        }

                        this.form5 = obj.form3[0];

                        this.glassid1 = "";


 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 = "";

    // 是否需要手动确认玻璃

@@ -126,9 +126,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 +273,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 +288,7 @@
                    }

                }



                // }

                }



            } catch (InterruptedException e) {

                e.printStackTrace();


 springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java

@@ -21,24 +21,24 @@
        // new PLCAutoMes().start();

        new Plchome().start();
         new PlcLayout().start();
         new Plcalarm().start();
        //  new PlcLayout().start();
        //  new Plcalarm().start();

         new Plcsign().start();
        //  new Plcsign().start();

         new Plcstate().start();
         new PlcPositioning1().start();
        //  new Plcstate().start();
        //  new PlcPositioning1().start();

         new PlcParameter2().start();
         new PLCAutomaticParameterSetting().start();
        //  new PlcParameter2().start();
        //  new PLCAutomaticParameterSetting().start();

         new PlcManualonePosition().start();
         new PlcManualonePosition2().start();
         new PlcServoManualone().start();
         new PLCManualJog().start();
         new Plclog().start();
        //  new PlcManualonePosition().start();
        //  new PlcManualonePosition2().start();
        //  new PlcServoManualone().start();
        //  new PLCManualJog().start();
        //  new Plclog().start();

         new PlcInteractionState().start();
        //  new PlcInteractionState().start();
        //new PlcParameter1Review().start();
        //new PLCAutomaticParameterSettingReview2().start();