wuyouming666
2023-12-15 b4278445d7b578f33c08bda340b34f6a89e501a2
Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

# Conflicts:
# springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
3个文件已修改
14 ■■■■ 已修改文件
CanadaMes-ui/src/views/home/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/home/index.vue
@@ -891,6 +891,7 @@
                        this.CountDown();
                    }
                    //是否有进片请求
                    console.log(obj.D01RequestState[0]);
                    this.D01RequestState = obj.D01RequestState[0];
                    //是否允许出片
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -48,12 +48,14 @@
      boolean B02backs = spianService.listbool("DB106.62");// b02汇报
      StringBuilder B01glassid = spianService.queGlassid("DB103.184", 14);// BO1的玻璃id
      StringBuilder B02glassid = spianService.queGlassid("DB103.212", 14);// B02的玻璃id
      int aaa=1;
      // 当进片小车完成任务时
      if (B01backs == true) {
        // 当B01小车汇报完成时更改玻璃状态 为1
        spianService.overtask(B01glassid.toString());// 完成任务
        S7control.getinstance().WriteWord("DB106.60", (short) 0);// 恢复B01小车应答改为0
        System.out.println("汇报时B01|" + B01glassid);
        System.out.println("汇报时B01|第"+aaa+"次"+ B01glassid);
        aaa+=1;
      }
      // 当出片小车完成任务时
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -129,7 +129,7 @@
            //获取进片请求状态
            List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
            boolean D01RequestState = D01Request.contains((short) 1);
            boolean D01RequestState = D01Request.contains((short)1);
            // boolean D01RequestState =true;
            jsonObject.append("D01RequestState", D01RequestState);
@@ -140,6 +140,13 @@
                jsonObject.append("countdown", countdowns);
            }
            // jsonObject.append("countdown", true);
            //是否急停
            List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1", 1);
            for (Boolean emergencystop : emergencystops) {
                jsonObject.append("emergencystop", emergencystop);
            }
            // 铝框线交互
            // //铝框id请求字