#

luxiaotao1123

2021-08-03 45b5d11a25ad9ec1ee506a36fa5458786b38eace

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

@@ -131,6 +131,10 @@
            crnProtocol.setLane(siemensNet.getByteTransform().TransInt16(result.Content, 20));  // 22

            // 异常
            crnProtocol.setAlarm1(0);
            crnProtocol.setAlarm2(0);
            crnProtocol.setAlarm3(0);
            crnProtocol.setAlarm4(0);
            boolean[] err1 = siemensNet.getByteTransform().TransBool(result.Content, 28, 1);    // 30
            if (err1[0]) { crnProtocol.setAlarm1(1); }
            if (err1[1]) { crnProtocol.setAlarm1(2); }
@@ -219,11 +223,6 @@
            if (err15[4]) { crnProtocol.setAlarm4(71); }
            if (err15[5]) { crnProtocol.setAlarm4(72); }
            if (err15[6]) { crnProtocol.setAlarm4(73); }

//            crnProtocol.setAlarm1(siemensNet.getByteTransform().TransInt32(result.Content, 28));    // 30
//            crnProtocol.setAlarm2(siemensNet.getByteTransform().TransInt32(result.Content, 32));    // 34
//            crnProtocol.setAlarm3(siemensNet.getByteTransform().TransInt32(result.Content, 36));    // 38
//            crnProtocol.setAlarm4(siemensNet.getByteTransform().TransInt32(result.Content, 40));    // 42

            boolean[] bool1 = siemensNet.getByteTransform().TransBool(result.Content, 60, 1);    // 62
            crnProtocol.setConnStatus(bool1[0]);
@@ -390,8 +389,7 @@
        } catch (Exception ignore) {}

        if (result.IsSuccess && result1.IsSuccess) {

            log.info("堆垛机命令下发[id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
            log.warn("堆垛机命令下发[id:{},时间：{}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), JSON.toJSON(command));
            OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 命令下发： {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
            return true;
        } else {