1

zhang

6 天以前 d63adcb214c6bc2a72c5b5bb7bd30abc391138dd

1

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

@@ -88,7 +88,6 @@
     * 1 = 上定位
     */
    public Short liftPos;
    public Short liftPosTwo;

    public CrnLiftPosType liftPosType;
    public CrnLiftPosType liftPosTypeTwo;
@@ -240,15 +239,7 @@
        this.liftPos = CrnLiftPosType.get(type).id.shortValue();
    }

    public void setLiftPosTwo(Short liftPosTwo) {
        this.liftPosTwo = liftPosTwo;
        this.liftPosTypeTwo = CrnLiftPosType.get(liftPosTwo);
    }

    public void setLiftPosTwo(CrnLiftPosType typeTwo) {
        this.liftPosTypeTwo = typeTwo;
        this.liftPosTwo = CrnLiftPosType.get(typeTwo).id.shortValue();
    }

    public void setStatus(Short status){
        this.status = status;

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

@@ -193,27 +193,34 @@
                crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 6));
                crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 8));
                crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
                crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
                crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
                crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 16));
                crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 18));
                crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
                crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
                crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
                crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
                crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
                crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
                crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 36));
                crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
                crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 44));
                crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
                crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52));
                crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 26));
                crnProtocol.setWalkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 28));
                crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 30));

                crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 12));
                crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 32));



                //crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
                //crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
                //crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
                //crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
                crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 34));
                crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 38));
                crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 42));
                crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 46));
                crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 50));
                crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 54));
                crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 58));

                //2工位
                crnProtocol.setTaskNoTwo(siemensNet.getByteTransform().TransInt16(result.Content, 56));
                crnProtocol.setForkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 58));
                crnProtocol.setLiftPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 60));
                crnProtocol.setLoadedTwo(siemensNet.getByteTransform().TransInt16(result.Content, 64));
                crnProtocol.setTaskNoTwo(siemensNet.getByteTransform().TransInt16(result.Content, 14));
                crnProtocol.setStatusTwo(siemensNet.getByteTransform().TransInt16(result.Content, 16));
                crnProtocol.setBayTwo(siemensNet.getByteTransform().TransInt16(result.Content, 18));
                crnProtocol.setLevelTwo(siemensNet.getByteTransform().TransInt16(result.Content, 20));
                crnProtocol.setForkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 22));
                crnProtocol.setLoadedTwo(siemensNet.getByteTransform().TransInt16(result.Content, 24));


                OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功", DateUtils.convert(new Date()), slave.getId()));
@@ -327,7 +334,7 @@
//        convertRow(command);
        command.setCrnNo(slave.getId());
//        short[] array = new short[10];
        short[] array = new short[10];
        short[] array = new short[9];
        array[0] = command.getAckFinish(); // 任务完成确认位
        array[1] = command.getTaskNo();  // 任务号
        array[2] = command.getTaskMode();  // 模式
@@ -337,7 +344,6 @@
        array[6] = command.getDestinationPosX();  // 目标位置排号
        array[7] = command.getDestinationPosY(); // 目标位置列号
        array[8] = command.getDestinationPosZ(); // 目标位置层号
        array[9] = command.getCommand();
//        array[10] = 0;   //备用1


@@ -354,6 +360,7 @@
//                    if (!resetFlag){
                    News.error("写入堆垛机plc数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(command), writeCount1);
                    result = siemensNet.Write("DB100.0", array);

//                    }
                    Thread.sleep(100);
                    writeCount1++;
@@ -491,7 +498,7 @@
        }
        // 向堆垛机发任务前的堆垛机状态
        try {
            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 18);
            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.20", (short) 18);
            if (resultRead.IsSuccess) {
                CrnCommand one = new CrnCommand();
                one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
@@ -549,7 +556,7 @@
                    writeCount1++;
                    continue;
                }
                OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 18);
                OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.20", (short) 18);
                if (resultRead.IsSuccess) {
                    CrnCommand one = new CrnCommand();
                    one.setAckFinish(siemensNet.getByteTransform().TransInt16(resultRead.Content, 0));