zhangchao
2024-09-01 86cb750364e49debb8586a29f0469ba37ce0f85c
对照协议调整
2个文件已修改
99 ■■■■ 已修改文件
src/main/java/com/zy/core/thread/SiemensCrnThread.java 93 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensDevpThread.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -331,37 +331,78 @@
                    one.setDestinationPosXTwo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 22));
                    one.setDestinationPosYTwo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 24));
                    one.setDestinationPosZTwo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 26));
                    if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
                            || !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
                            || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
                            || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
                            || !command.getSourcePosXTwo().equals(one.getSourcePosXTwo()) || !command.getSourcePosYTwo().equals(one.getSourcePosYTwo())
                            || !command.getSourcePosZTwo().equals(one.getSourcePosZTwo()) || !command.getDestinationPosXTwo().equals(one.getDestinationPosXTwo())
                            || !command.getDestinationPosYTwo().equals(one.getDestinationPosYTwo()) || !command.getDestinationPosZTwo().equals(one.getDestinationPosZTwo())
                    ) {
                        System.out.println(command.getTaskNo().equals(one.getTaskNo()));
                        System.out.println(one);
                        try {
                            log.error("堆垛机命令地址写入后回读失败==>不一致[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSONString(command), JSON.toJSONString(one));
                        } catch (Exception e) {
                    if (command.getTaskMode() != 2) {
                        if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
                                || !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
                                || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
                                || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
                        ) {
                            System.out.println(command.getTaskNo().equals(one.getTaskNo()));
                            System.out.println(command.getTaskMode().equals(one.getTaskMode()));
                            System.out.println(command.getDestinationPosX().equals(one.getDestinationPosX()));
                            System.out.println(command.getDestinationPosY().equals(one.getDestinationPosY()));
                            System.out.println(command.getDestinationPosZ().equals(one.getDestinationPosZ()));
                            System.out.println(command.getSourcePosZ().equals(one.getSourcePosZ()));
                            System.out.println(command.getSourcePosY().equals(one.getSourcePosY()));
                            System.out.println(command.getSourcePosX().equals(one.getSourcePosX()));
                            try {
                                log.error("日志打印失败:===>>参数one报错 [id:{}],{}", slave.getId(), JSON.toJSONString(command), JSON.toJSONString(resultRead));
                            } catch (Exception e1) {
                                log.error("日志打印失败:===>> [id:{}],{}", slave.getId(), JSON.toJSONString(command));
                                log.error("堆垛机命令地址写入后回读失败==>不一致[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSONString(command), JSON.toJSONString(one));
                            } catch (Exception e) {
                                try {
                                    log.error("日志打印失败:===>>参数one报错 [id:{}],{}", slave.getId(), JSON.toJSONString(command), JSON.toJSONString(resultRead));
                                } catch (Exception e1) {
                                    log.error("日志打印失败:===>> [id:{}],{}", slave.getId(), JSON.toJSONString(command));
                                }
                            }
                        }
                        try {
                            Thread.sleep(100);
                        } catch (Exception e) {
                            try {
                                Thread.sleep(100);
                            } catch (Exception e) {
                            }
                            log.error("写入堆垛机plc数据失败,重新下发任务  回读不一致 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(command), writeCount);
                            result = siemensNet.Write("DB100.0", array);
                            writeCount++;
                            continue;
                        } else {
                            log.info("堆垛机命令地址写入后回读成功[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSONString(command), JSON.toJSONString(one));
                            break;
                        }
                        log.error("写入堆垛机plc数据失败,重新下发任务  回读不一致 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(command), writeCount);
                        result = siemensNet.Write("DB100.0", array);
                        writeCount++;
                        continue;
                    } else {
                        log.info("堆垛机命令地址写入后回读成功[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSONString(command), JSON.toJSONString(one));
                        break;
                        if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
                                || !command.getSourcePosXTwo().equals(one.getSourcePosXTwo()) || !command.getSourcePosYTwo().equals(one.getSourcePosYTwo())
                                || !command.getSourcePosZTwo().equals(one.getSourcePosZTwo()) || !command.getDestinationPosXTwo().equals(one.getDestinationPosXTwo())
                                || !command.getDestinationPosYTwo().equals(one.getDestinationPosYTwo()) || !command.getDestinationPosZTwo().equals(one.getDestinationPosZTwo())
                        ) {
                            System.out.println(command.getTaskNo().equals(one.getTaskNo()));
                            System.out.println(command.getTaskMode().equals(one.getTaskMode()));
                            System.out.println(command.getSourcePosXTwo().equals(one.getSourcePosXTwo()));
                            System.out.println(command.getDestinationPosYTwo().equals(one.getDestinationPosYTwo()));
                            System.out.println(command.getDestinationPosZTwo().equals(one.getDestinationPosZTwo()));
                            System.out.println(command.getSourcePosZTwo().equals(one.getSourcePosZTwo()));
                            System.out.println(command.getSourcePosYTwo().equals(one.getSourcePosYTwo()));
                            System.out.println(command.getDestinationPosXTwo().equals(one.getDestinationPosXTwo()));
                            try {
                                log.error("堆垛机命令地址写入后回读失败==>不一致[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSONString(command), JSON.toJSONString(one));
                            } catch (Exception e) {
                                try {
                                    log.error("日志打印失败:===>>参数one报错 [id:{}],{}", slave.getId(), JSON.toJSONString(command), JSON.toJSONString(resultRead));
                                } catch (Exception e1) {
                                    log.error("日志打印失败:===>> [id:{}],{}", slave.getId(), JSON.toJSONString(command));
                                }
                            }
                            try {
                                Thread.sleep(100);
                            } catch (Exception e) {
                            }
                            log.error("写入堆垛机plc数据失败,重新下发任务  回读不一致 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(command), writeCount);
                            result = siemensNet.Write("DB100.0", array);
                            writeCount++;
                            continue;
                        } else {
                            log.info("堆垛机命令地址写入后回读成功[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSONString(command), JSON.toJSONString(one));
                            break;
                        }
                    }
                }
            } catch (Exception e) {
src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -263,7 +263,7 @@
        //条码扫描器
        Thread.sleep(200);
        //ArrayList<Integer> barcodeList = BarcodeList;
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.200", (short) (3 * 8));
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.200", (short) (24));
        if (result2.IsSuccess) {
            for (int i = 0; i < 3; i++) {
                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
@@ -388,8 +388,8 @@
                OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index * 6, (short) 4);
                OperateResultExOne<byte[]> readResult1 = siemensS7Net.Read("DB100." + (index * 6 + 4), (short) 2);
                if (readResult.IsSuccess && readResult1.IsSuccess) {
                    short workNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 0);
                    short staNo = siemensS7Net.getByteTransform().TransInt16(readResult1.Content, 0);
                    short workNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4);
                    short staNo = siemensS7Net.getByteTransform().TransInt16(readResult1.Content, 2);
                    if (staProtocol.getWorkNo().equals(workNo) && staProtocol.getStaNo().equals(staNo)) {
                        //任务命令写入成功
                        log.info("写入堆垛机命令后返回成功,并且回读成功。堆垛机plc编号={},{},写入次数={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);