pjb
2024-06-30 cd81647ca01d3afedabe40ccc2ba02c3f5be821a
src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -431,12 +431,12 @@
                    Thread.sleep(200);
                    OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index*6, (short)4);
                    Thread.sleep(200);
                    OperateResultExOne<byte[]> readResult1 = siemensS7Net.Read("DB100." + index*6+4, (short)2);
                    OperateResultExOne<byte[]> readResult1 = siemensS7Net.Read("DB100." + (index*6+4), (short)2);
                    //OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB1000." + index*4, (short)4);
                    if(readResult.IsSuccess && readResult1.IsSuccess){
                        short workNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 0);
                        short staNo = siemensS7Net.getByteTransform().TransInt16(readResult1.Content, 2);
                        if(staProtocol.getWorkNo().equals(workNo) && staProtocol.getStaNo().equals(staNo)){
                        int workNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
                        short staNo = siemensS7Net.getByteTransform().TransInt16(readResult1.Content, 0);
                        if(staProtocol.getWorkNo().equals((short)workNo) && staProtocol.getStaNo().equals(staNo)){
                            //任务命令写入成功
                            writeFlag = true;
                            log.info("写入输送线命令后返回成功,并且回读成功。输送线plc编号={},{},写入次数={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
@@ -472,7 +472,7 @@
                log.error("写入输送线命令尝试5次失败。输送线plc编号={},站点数据={}", slave.getId(), JSON.toJSON(staProtocol));
                //重新添加数据到任务队列
                boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(2, staProtocol));
//                boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(2, staProtocol));
                read();//读取1次设备状态
                return;
            } else {