对照协议调整

zhangchao

2024-08-31 d8d90a246ce19dc9249ea7f0ffe1b8caf0462cc2

对照协议调整

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -725,7 +725,9 @@
                flag = true;
            }
            if (!flag) {
                News.errorNoLog("" + mark + " - 1" + " - 3" + " - 堆垛机入库站信息(以下需要全true):"
                System.out.println(staProtocol);
                //TODO
                News.error("" + mark + " - 1" + " - 3" + " - 堆垛机入库站信息(以下需要全true):"
                        + "自动信号" + staProtocol.isAutoing() + "有物信号" + staProtocol.isLoading()
                        + "工作号>0" + staProtocol.getWorkNo() + "可入信号" + staProtocol.isInEnable()
                        + "能入信号（wms设置）.equals(\"Y\")" + staDetl.getCanining());

 src/main/java/com/zy/core/model/protocol/CrnProtocol.java

@@ -65,6 +65,11 @@
    public CrnStatusType statusType;

    /**
     * 状态枚举
     */
    public CrnStatusType statusTypeTwo;

    /**
     * 堆垛机当前列号
     */
    public Short bay;
@@ -259,6 +264,16 @@
        this.status = CrnStatusType.get(type).id.shortValue();
    }

    public void setStatusTwo(Short status) {
        this.statusTwo = status;
        this.statusTypeTwo = CrnStatusType.get(status);
    }

    public void setStatusTwo(CrnStatusType type) {
        this.statusTypeTwo = type;
        this.statusTwo = CrnStatusType.get(type).id.shortValue();
    }

    public Short getTemp1() {
        return temp1;
    }
@@ -294,6 +309,7 @@
    public void setzSpeed(Short zSpeed) {
        this.zSpeed = Float.valueOf(zSpeed);
    }

    public void setzSpeedTwo(Short zSpeedTwo) {
        this.zSpeedTwo = Float.valueOf(zSpeedTwo);
    }

 src/main/java/com/zy/core/thread/SiemensCrnThread.java

@@ -187,8 +187,10 @@

                OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功", DateUtils.convert(new Date()), slave.getId()));

                if (crnProtocol.getMode() == 1) {
                // 复位信号
                if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
                        System.out.println(crnProtocol);
                    if (resetFlag) {
                        if (crnProtocol.getTaskNo() == 9999) {
                            backHpFlag = false;
@@ -200,6 +202,38 @@
                        }
                    }
                }
                } else if (crnProtocol.getMode() == 2) {
                    // 复位信号
                    if (!Cools.isEmpty(crnProtocol.getStatusTypeTwo()) && crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING)) {

                        if (resetFlag) {
                            if (crnProtocol.getTaskNo() == 9999) {
                                backHpFlag = false;
                            }
                            CrnCommand crnCommand = new CrnCommand();
                            crnCommand.setAckFinish((short) 1);
                            if (write(crnCommand)) {
                                resetFlag = false;
                            }
                        }
                    }
                } else if (crnProtocol.getMode() == 3) {
                    // 复位信号
                    if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING) && !Cools.isEmpty(crnProtocol.getStatusTypeTwo()) && crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING)) {
                        System.out.println(crnProtocol);
                        if (resetFlag) {
                            if (crnProtocol.getTaskNo() == 9999) {
                                backHpFlag = false;
                            }
                            CrnCommand crnCommand = new CrnCommand();
                            crnCommand.setAckFinish((short) 1);
                            if (write(crnCommand)) {
                                resetFlag = false;
                            }
                        }
                    }
                }


                try {
                    // 根据实时信息更新数据库
@@ -243,9 +277,6 @@
            News.error("SiemensCrn" + " - 6" + " - 堆垛机写入命令为空");
            return false;
        }
        command.setCommand((short) 1);
        System.out.println("------------------");
        System.out.println(command);
//        convertRow(command);
        command.setCrnNo(slave.getId());
        short[] array = new short[16];
@@ -289,21 +320,20 @@
                OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 32);
                if (resultRead.IsSuccess) {
                    CrnCommand one = new CrnCommand();
                    one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
                    one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
                    one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
                    one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
                    one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
                    one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
                    one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
                    one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
                    one.setSourcePosXTwo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 18));
                    one.setSourcePosYTwo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 20));
                    one.setSourcePosZTwo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 22));
                    one.setDestinationPosXTwo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 24));
                    one.setDestinationPosYTwo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 26));
                    one.setDestinationPosZTwo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 28));
                    one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 30));
                    one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 0));
                    one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
                    one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
                    one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
                    one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
                    one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
                    one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
                    one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
                    one.setSourcePosXTwo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
                    one.setSourcePosYTwo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 18));
                    one.setSourcePosZTwo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 20));
                    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())
@@ -312,6 +342,8 @@
                            || !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) {