Junjie
2023-07-21 211d896fdaec687976851c7d7e6a1b60701b450f
src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -489,7 +489,7 @@
                OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100.310", (short)2);
                if(readResult.IsSuccess){
                    short rollback = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 0);
                    if (staProtocol.getRollback102().equals(rollback)) {
                    if (staProtocol.getRollback102() == (int) rollback) {
                        //任务命令写入成功
                        writeFlag = true;
                        log.info("写入输送线命令后返回成功,并且回读成功。输送线plc编号={},{},写入次数={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
@@ -528,15 +528,6 @@
            boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(5, staProtocol));
            read();//读取1次设备状态
            return;
        } else {
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】 输送线命令下发成功 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
            log.info("输送线命令下发 [id:{}] >>>>> 命令下发成功: {}",  slave.getId(), JSON.toJSON(staProtocol));
            Integer siteId = staProtocol.getSiteId();
            staProtocol = station.get(siteId);
            if ((siteId == 101 || siteId == 201)&&(staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0)) {
                staProtocol.setPakMk(true);
            }
        }
    }