ZengTao
2024-01-19 70a93a33fabd58e1f4b3a50410060ae1b855c8ed
更换清除id按钮
3个文件已修改
421 ■■■■■ 已修改文件
CanadaMes-ui/src/views/home/index.vue 122 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java 271 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/home/index.vue
@@ -375,37 +375,81 @@
                <div class="device" :style="'top: 262px;left: 150px;background-color: ' + ShowDeviceList(8) + ';'">D05</div>
                <div class="device" :style="'top: 339px;left: 150px;background-color: ' + ShowDeviceList(9) + ';'">D06</div>
                <div class="glass D01" style="top: 54px;left: 1055px;position: absolute;"
                    @click="ClearGlassId('DB101.9.2', 0)">{{ ShowGlassIdList(0) }}</div>
                <div class="glass D02" style="top: 132px;left: 1055px;position: absolute;"
                    @click="ClearGlassId('DB101.9.2', 1)">{{ ShowGlassIdList(1) }}</div>
                <div class="glass D01" style="top: 39px;left: 1055px;position: absolute;"
                    >{{ ShowGlassIdList(0) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.2', 0)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass D02" style="top: 117px;left: 1055px;position: absolute;"
                    >{{ ShowGlassIdList(1) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.2', 1)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass B01" style="top: 270px;left: 640px;position: absolute;"
                    @click="ClearGlassId('DB101.10.2', 2)">
                    B01:{{ ShowGlassIdList(2) }}</div>
                    >
                    B01:{{ ShowGlassIdList(2) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.2', 2)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass B02" style="top: 290px;left: 640px;position: absolute;"
                    @click="ClearGlassId('DB101.10.3', 3)">B02:{{ ShowGlassIdList(3) }}</div>
                    >B02:{{ ShowGlassIdList(3) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.3', 3)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass A01" style="top: 270px;left: 289px;position: absolute;"
                    @click="ClearGlassId('DB101.10.0', 4)">
                    A01.1:{{ ShowGlassIdList(4) }}</div>
                    >
                    A01.1:{{ ShowGlassIdList(4) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.0', 4)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass A01" style="top: 290px;left: 289px;position: absolute;"
                    @click="ClearGlassId('DB101.10.1,5',5)">A01.2:{{ ShowGlassIdList(5) }}</div>
                <div class="glass A01" style="top: 315px;left: 289px;position: absolute;"
                    >A01.2:{{ ShowGlassIdList(5) }}X21942611703GV
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.1,5', 5)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass A02" style="top: 310px;left: 289px;position: absolute;"
                    @click="ClearGlassId('DB101.10.2,6',6)">A02:{{ ShowGlassIdList(6) }}</div>
                <div class="glass A02" style="top: 360px;left: 289px;position: absolute;"
                    >A02:{{ ShowGlassIdList(6) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.2,6', 6)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass D03" style="top: 137px;left: 42px;position: absolute;"
                    @click="ClearGlassId('DB101.9.4', 7)">
                    {{ ShowGlassIdList(7) }}</div>
                <div class="glass D04" style="top: 213px;left: 42px;position: absolute;"
                    @click="ClearGlassId('DB101.9.5', 8)">
                    {{ ShowGlassIdList(8) }}</div>
                <div class="glass D05" style="top: 290px;left: 42px;position: absolute;"
                    @click="ClearGlassId('DB101.9.6', 9)">
                    {{ ShowGlassIdList(9) }}</div>
                <div class="glass D06" style="top: 367px;left: 42px;position: absolute;"
                    @click="ClearGlassId('DB101.9.5', 10)">
                    {{ ShowGlassIdList(10) }}</div>
                <div class="glass D03" style="top: 122px;left: 42px;position: absolute;"
                    >
                    {{ ShowGlassIdList(7) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.4', 7)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass D04" style="top: 198px;left: 42px;position: absolute;"
                    >
                    {{ ShowGlassIdList(8) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.5', 8)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass D05" style="top: 275px;left: 42px;position: absolute;"
                    >
                    {{ ShowGlassIdList(9) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.6', 9)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass D06" style="top: 352px;left: 42px;position: absolute;"
                    >
                    {{ ShowGlassIdList(10) }}
                    <br/>
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.5', 10)">
                        {{ $t('Clear') }}</el-button>
                </div>
            </div>
@@ -578,7 +622,7 @@
                            {{ this.isConfirm == true ? $t('Allow') : $t('Not Allow') }}</el-button>
                    </el-form-item>
                    <el-form-item>
                        {{ $t('Current State') }}:{{ this.Scanningmethod==true?$t('Automatic'):$t('Hand Movement')}}
                        {{ $t('Current State') }}:{{ this.Scanningmethod == true ? $t('Automatic') : $t('Hand Movement') }}
                        <el-button type="primary" @click="SwitchScanMethod()">{{ $t('Switch')
                        }}</el-button>
                    </el-form-item>
@@ -595,7 +639,7 @@
                </div>
                <div style="display: flex;justify-content: space-around;">
                    <label for="">{{ $t('Upper film position') }}</label>
                    <label for="">{{ $t('Scan Code Point') }}</label>
                </div>
                <div style="display: flex;justify-content: space-around;height: 40px;">
@@ -981,7 +1025,7 @@
            DeviceList: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
            GlassIdList: [],
            Scanningmethod: true,
            CurrrentGlassId:""
            CurrrentGlassId: ""
        };
    },
    created() {
@@ -1029,15 +1073,15 @@
                    this.alarm = obj.alarmmg[0];
                    //获取当前扫码方式
                    if (obj.Scanningmethod != null) {
                        this.Scanningmethod=obj.Scanningmethod[0];
                        this.Scanningmethod = obj.Scanningmethod[0];
                    }
                    //获取当前扫码枪玻璃id
                    if(obj.CurrrentGlassId!=null){
                    if (obj.CurrrentGlassId != null) {
                        const specialChars = /[^\w\s]/g;
                        this.CurrrentGlassId=obj.CurrrentGlassId[0].replace(specialChars, "");
                        this.CurrrentGlassId = obj.CurrrentGlassId[0].replace(specialChars, "");
                    }
                    //查询当前铝框信息
                    this.CurrentFrame = obj.CurrentFrame;
                    //获取设备状态
@@ -1122,10 +1166,10 @@
                    } else {
                        this.form3 = {};
                    }
                    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.showform3();
                        }
                        this.form5 = obj.form3[0];
@@ -1323,12 +1367,12 @@
        },
        //手动写入plc扫码位玻璃id
        WriteGlassID() {
            if (this.glassid1.length ==14) {
            if (this.glassid1.length == 14) {
                WriteGlassID(this.glassid1).then(res => {
                    console.log(res.data);
                    this.$message.success(this.$t('Successful operation'));
                });
            }else{
            } else {
                this.$message.error(this.$t('Please enter the correct glassID'));
            }
        },
@@ -2044,7 +2088,7 @@
        //清除玻璃id
        ClearGlassId(position, num) {
            if (this.ClearGlassID == false) {
                console.log(this.DeviceList,num);
                console.log(this.DeviceList, num);
                if (this.DeviceList[num] == 0) {
                    if (this.GlassIdList[num].length < 14) {
                        this.$confirm(this.$t('Are you sure to clear this barcode ?'), this.$t('confirm'), {
@@ -2104,9 +2148,9 @@
            });
        },
        //切换二维码获取方式
        SwitchScanMethod(){
        SwitchScanMethod() {
            SwitchScanMethod(!this.Scanningmethod).then(res => {
                if(res.data.message == 200) {
                if (res.data.message == 200) {
                    this.$message.success(this.$t('Operation successful'));
                }
            });
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -153,149 +153,148 @@
            // // TODO: handle exception
            // }
            // if (S7control.getinstance().CheckConnected() == true) {
            // 获取当前扫码方式
            if (S7control.getinstance().CheckConnected() == true) {
                // 获取当前扫码方式
            List<Boolean> Scanningmethods = S7control.getinstance().ReadBits("DB101.11.4", 1);
            if(Scanningmethods!=null){
                for (Boolean Scanningmethod : Scanningmethods) {
                    jsonObject.append("Scanningmethod", Scanningmethod);
                }
            }
            String CurrrentGlassId = spianService.queGlassid("DB103.256", 14).toString();
            jsonObject.append("CurrrentGlassId", CurrrentGlassId);
            // 获取D01-D06,A01,A02,B01,B02状态
            List<Short> DeviceList = S7control.getinstance().ReadWord("DB103.0", 10);
            jsonObject.append("DeviceList", DeviceList);
            // 获取D01-D06,A01,A02,B01,B02玻璃id
            List<String> GlassIdList = new ArrayList<String>();
            GlassIdList.add(spianService.queGlassid("DB103.40", 14).toString());
            GlassIdList.add(spianService.queGlassid("DB103.58", 14).toString());
            GlassIdList.add(spianService.queGlassid("DB103.184", 14).toString());
            GlassIdList.add(spianService.queGlassid("DB103.212", 14).toString());
            GlassIdList.add(spianService.queGlassid("DB103.128", 14).toString());
            GlassIdList.add(spianService.queGlassid("DB103.142", 14).toString());
            GlassIdList.add(spianService.queGlassid("DB103.156", 14).toString());
            GlassIdList.add(spianService.queGlassid("DB103.72", 14).toString());
            GlassIdList.add(spianService.queGlassid("DB103.86", 14).toString());
            GlassIdList.add(spianService.queGlassid("DB103.100", 14).toString());
            GlassIdList.add(spianService.queGlassid("DB103.114", 14).toString());
            jsonObject.append("GlassIdList", GlassIdList);
            // 读去Plc进片车与出片车位置W
            List<String> addressList = new ArrayList<String>();
            addressList.add("DB106.12");
            addressList.add("DB106.0");
            List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
            if (paramlist != null) {
                jsonObject.append("params", paramlist);
            }
            // 获取进片车状态
            List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
                    1);// 获取进片车状态
            if (datas1ListState != null) {
                boolean exist1 = datas1ListState.contains((short) 0);
                jsonObject.append("zhuangtai", exist1);
            }
            // 获取进片玻璃信息
            List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
            if (inglassInfo != null) {
                if (inglassInfo.size() > 0) {
                    jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
                List<Boolean> Scanningmethods = S7control.getinstance().ReadBits("DB101.11.4", 1);
                if (Scanningmethods != null) {
                    for (Boolean Scanningmethod : Scanningmethods) {
                        jsonObject.append("Scanningmethod", Scanningmethod);
                    }
                }
            }
            // // 获取铝框idDB106.DBW64,添加到出片队列
            // String frameno="X21763329601FB";
            String frameno = spianService.queGlassid("DB103.270", 14).toString();
            if (!frameno.equals(Plchome.FrameNo)) {
                Plchome.FrameNo = frameno;
                try {
                    Short num = 0;
                    List<north_glass_buffer1> north_glass_buffer1s = north_Glass_Buffer1Service
                            .SelectAluminumFrameInfoById(Plchome.FrameNo);
                    for (north_glass_buffer1 north_glass_buffer1 : north_glass_buffer1s) {
                        if (north_glass_buffer1.getstorageCage() == null) {
                            break;
                String CurrrentGlassId = spianService.queGlassid("DB103.256", 14).toString();
                jsonObject.append("CurrrentGlassId", CurrrentGlassId);
                // 获取D01-D06,A01,A02,B01,B02状态
                List<Short> DeviceList = S7control.getinstance().ReadWord("DB103.0", 10);
                jsonObject.append("DeviceList", DeviceList);
                // 获取D01-D06,A01,A02,B01,B02玻璃id
                List<String> GlassIdList = new ArrayList<String>();
                GlassIdList.add(spianService.queGlassid("DB103.40", 14).toString());
                GlassIdList.add(spianService.queGlassid("DB103.58", 14).toString());
                GlassIdList.add(spianService.queGlassid("DB103.184", 14).toString());
                GlassIdList.add(spianService.queGlassid("DB103.212", 14).toString());
                GlassIdList.add(spianService.queGlassid("DB103.128", 14).toString());
                GlassIdList.add(spianService.queGlassid("DB103.142", 14).toString());
                GlassIdList.add(spianService.queGlassid("DB103.156", 14).toString());
                GlassIdList.add(spianService.queGlassid("DB103.72", 14).toString());
                GlassIdList.add(spianService.queGlassid("DB103.86", 14).toString());
                GlassIdList.add(spianService.queGlassid("DB103.100", 14).toString());
                GlassIdList.add(spianService.queGlassid("DB103.114", 14).toString());
                jsonObject.append("GlassIdList", GlassIdList);
                // 读去Plc进片车与出片车位置W
                List<String> addressList = new ArrayList<String>();
                addressList.add("DB106.12");
                addressList.add("DB106.0");
                List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
                if (paramlist != null) {
                    jsonObject.append("params", paramlist);
                }
                // 获取进片车状态
                List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
                        1);// 获取进片车状态
                if (datas1ListState != null) {
                    boolean exist1 = datas1ListState.contains((short) 0);
                    jsonObject.append("zhuangtai", exist1);
                }
                // 获取进片玻璃信息
                List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
                if (inglassInfo != null) {
                    if (inglassInfo.size() > 0) {
                        jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
                    }
                }
                // // 获取铝框idDB106.DBW64,添加到出片队列
                // String frameno="X21763329601FB";
                String frameno = spianService.queGlassid("DB103.270", 14).toString();
                if (!frameno.equals(Plchome.FrameNo)) {
                    Plchome.FrameNo = frameno;
                    try {
                        Short num = 0;
                        List<north_glass_buffer1> north_glass_buffer1s = north_Glass_Buffer1Service
                                .SelectAluminumFrameInfoById(Plchome.FrameNo);
                        for (north_glass_buffer1 north_glass_buffer1 : north_glass_buffer1s) {
                            if (north_glass_buffer1.getstorageCage() == null) {
                                break;
                            }
                            num++;
                        }
                        num++;
                        if (num == north_glass_buffer1s.size()) {
                            north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
                        } else {
                            Plchome.AluminumFrame = north_glass_buffer1s;
                        }
                    } catch (SQLException e) {
                        // TODO Auto-generated catch block
                        e.printStackTrace();
                    }
                    if (num == north_glass_buffer1s.size()) {
                        north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
                    } else {
                        Plchome.AluminumFrame = north_glass_buffer1s;
                    }
                } catch (SQLException e) {
                    // TODO Auto-generated catch block
                    e.printStackTrace();
                }
                if (AluminumFrame != null) {
                    jsonObject.append("AluminumFrame", AluminumFrame);
                }
                // 获取进片请求状态
                List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
                boolean D01RequestState = D01Request.contains((short) 1);
                // boolean D01RequestState =true;
                jsonObject.append("D01RequestState", D01RequestState);
                // 复位倒计时
                // 地址104.9.6
                List<Boolean> countdown = S7control.getinstance().ReadBits("DB104.9.6", 1);
                for (Boolean countdowns : countdown) {
                    jsonObject.append("countdown", countdowns);
                }
                // jsonObject.append("countdown", true);
                // 复位完成信号ss
                List<Boolean> resetss = S7control.getinstance().ReadBits("DB103.284", 1);
                for (Boolean reset : resetss) {
                    jsonObject.append("reset", reset);
                }
                // 是否急停
                List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1", 1);
                for (Boolean emergencystop : emergencystops) {
                    jsonObject.append("emergencystop", emergencystop);
                }
                // // 终止继续按钮
                // List<String> niuanaddressList3 =
                // Arrays.asList(config.getProperty("Parameter2.stop").split(","));
                // List<Boolean> anniuread =
                // S7control.getinstance().readBits(niuanaddressList3);
                // // Boolean[] value4 = { false, false};
                // // List<Boolean> anniuread = new ArrayList<>(Arrays.asList(value4));
                // Boolean[] value5 = { true };
                // List<Boolean> resets = new ArrayList<>(Arrays.asList(value5));
                // short[] anniuparams = new short[anniuread.size()];
                // for (int i = 0; i < anniuread.size(); i++) {
                // boolean value = anniuread.get(i);
                // anniuparams[i] = value ? (short) 1 : (short) 0;
                // }
                // short[] resets2 = new short[resets.size()];
                // for (int i = 0; i < resets.size(); i++) {
                // boolean value = resets.get(i);
                // resets2[i] = value ? (short) 1 : (short) 0;
                // }
                // for (short number : resets2) {
                // if (number == 1) {
                // jsonObject.append("Abort", anniuparams);
                // }
                // }
            }
            if (AluminumFrame != null) {
                jsonObject.append("AluminumFrame", AluminumFrame);
            }
            // 获取进片请求状态
            List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
            boolean D01RequestState = D01Request.contains((short) 1);
            // boolean D01RequestState =true;
            jsonObject.append("D01RequestState", D01RequestState);
            // 复位倒计时
            // 地址104.9.6
            List<Boolean> countdown = S7control.getinstance().ReadBits("DB104.9.6", 1);
            for (Boolean countdowns : countdown) {
                jsonObject.append("countdown", countdowns);
            }
            // jsonObject.append("countdown", true);
            // 复位完成信号ss
            List<Boolean> resetss = S7control.getinstance().ReadBits("DB103.284", 1);
            for (Boolean reset : resetss) {
                jsonObject.append("reset", reset);
            }
            // 是否急停
            List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1", 1);
            for (Boolean emergencystop : emergencystops) {
                jsonObject.append("emergencystop", emergencystop);
            }
            // // 终止继续按钮
            // List<String> niuanaddressList3 =
            // Arrays.asList(config.getProperty("Parameter2.stop").split(","));
            // List<Boolean> anniuread =
            // S7control.getinstance().readBits(niuanaddressList3);
            // // Boolean[] value4 = { false, false};
            // // List<Boolean> anniuread = new ArrayList<>(Arrays.asList(value4));
            // Boolean[] value5 = { true };
            // List<Boolean> resets = new ArrayList<>(Arrays.asList(value5));
            // short[] anniuparams = new short[anniuread.size()];
            // for (int i = 0; i < anniuread.size(); i++) {
            // boolean value = anniuread.get(i);
            // anniuparams[i] = value ? (short) 1 : (short) 0;
            // }
            // short[] resets2 = new short[resets.size()];
            // for (int i = 0; i < resets.size(); i++) {
            // boolean value = resets.get(i);
            // resets2[i] = value ? (short) 1 : (short) 0;
            // }
            // for (short number : resets2) {
            // if (number == 1) {
            // jsonObject.append("Abort", anniuparams);
            // }
            // }
            // }
            storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
            dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -17,28 +17,28 @@
        //
        System.out.println("启动完成");
       new PlcHold().start();
        // new PlcHold().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 PlcParameter2().start();
        new PLCAutomaticParameterSetting().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 PLCAutomaticParameterSettingReview().start();
    }