Merge remote-tracking branch 'origin/jshdwcs' into jshdwcs

L

2025-09-25 3cf23392ce90c0a99835afe2db3a81206e093819

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

@@ -11,14 +11,18 @@
import com.zy.asrs.entity.BasRgvOpt;
import com.zy.asrs.service.BasRgvOptService;
import com.zy.asrs.service.BasRgvService;
import com.zy.common.utils.News;
import com.zy.core.RgvThread2;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.RgvStatusType;
import com.zy.core.enums.RgvTaskModeType;
import com.zy.core.enums.RgvTaskStatusType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.RgvSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.command.RgvCommand;
import com.zy.core.model.protocol.RgvProtocol;
import lombok.Data;
@@ -33,7 +37,7 @@
 */
@Data
@Slf4j
public class RgvThread implements Runnable, ThreadHandler {
public class RgvThread implements Runnable, RgvThread2 {

    private SiemensS7Net siemensNet;
    private RgvSlave slave;
@@ -46,6 +50,15 @@
     * 工位2复位信号
     */
    private boolean resetFlag2 = false;

    //锁定标记
    private boolean PakMk = true;
    //入库标记
    private boolean PakIn = true;
    //出库标记
    private boolean PakOut = true;
    //根据距离跳过取货
    private boolean PakRgv = true;

    public RgvThread(RgvSlave slave) {
        this.slave = slave;
@@ -69,13 +82,13 @@
                        break;
                    // 工位1、2写入数据
                    case 2:
                        write((RgvCommand) task.getData());
                        write12((RgvCommand) task.getData());
                        break;
                    //工位1写入数据
                    case 4:
                        write1((RgvCommand) task.getData());
                        break;
                    //工位2写入数据
//                    //工位2写入数据
                    case 5:
                        write2((RgvCommand) task.getData());
                        break;
@@ -86,38 +99,81 @@
                            command = new RgvCommand();
                        }
                        command.setRgvNo(slave.getId()); // RGV编号
                        command.setTaskNo1((short) 0); // 工作号
                        command.setAckFinish1((short) 1);  // 任务完成确认位
                        command.setTaskMode1(RgvTaskModeType.NONE); // 任务模式
                        command.setSourceStaNo1((short)0);     // 源站
                        command.setDestinationStaNo1((short)0);     // 目标站
                        command.setTaskNo2((short) 0); // 工作号
                        command.setAckFinish2((short) 1);  // 任务完成确认位
                        command.setTaskMode2(RgvTaskModeType.NONE); // 任务模式
                        command.setSourceStaNo2((short)0);     // 源站
                        command.setDestinationStaNo2((short)0);     // 目标站
                        command.setCommand((short)0);
                        write(command);
                        command.setTaskNo1(0); // 工作号
                        command.setAckFinish1(false);  // 任务完成确认位
                        command.setTaskStatus1(RgvTaskStatusType.NONE); // 任务模式
                        command.setTargetPosition1( 0);     // 源站
                        command.setEndStaNo1(0);     // 目标站
                        command.setWrkTaskMove1((short) 0);
                        command.setWrkTaskPri((short)0);
                        command.setCommand(false);
                        write1(command);
                        break;
                    case 6:
                        RgvCommand command2 = (RgvCommand) task.getData();
                        if (null == command2) {
                            command2 = new RgvCommand();
                        }
                        command2.setRgvNo(slave.getId()); // RGV编号
                        command2.setTaskNo2(0); // 工作号
                        command2.setAckFinish2(false);  // 任务完成确认位
                        command2.setTaskStatus2(RgvTaskStatusType.NONE); // 任务模式
                        command2.setTargetPosition2(0);     // 源站
                        command2.setEndStaNo2(0);     // 目标站
                        command2.setWrkTaskPri((short)0);
                        command2.setWrkTaskMove2((short)0);
                        command2.setCommand(false);
                        write2(command2);
                        break;
                    case 7: //工位1取货确认
                        RgvCommand command3 = (RgvCommand) task.getData();
                        if (null == command3) {
                            command3 = new RgvCommand();
                        }
                        command3.setRgvNo(slave.getId()); // RGV编号
                        command3.setAckFinish1(false);  // 任务完成确认位
                        command3.setTaskStatus1(RgvTaskStatusType.NONE); // 任务模式
                        command3.setTargetPosition1( 0);     // 源站
                        command3.setWrkTaskMove1(task.getMoveSta() !=null ? task.getMoveSta() : 0);
                        command3.setCommand(false);
                        command3.setWrkTaskPri((short)0);
                        command3.setTaskNo1(Math.toIntExact(task.getWorkNo()));
                        write1(command3);
                        break;
                    case 8 :
                        RgvCommand command4 = (RgvCommand) task.getData();
                        if (null == command4) {
                            command4 = new RgvCommand();
                        }
                        command4.setRgvNo(slave.getId()); // RGV编号
                        command4.setAckFinish2(false);  // 任务完成确认位
                        command4.setTaskStatus2(RgvTaskStatusType.NONE); // 任务模式
                        command4.setTargetPosition2(0);     // 小车目标站清零
                        command4.setWrkTaskMove2(task.getMoveSta() !=null ? task.getMoveSta() : 0);
                        command4.setCommand(false);
                        command4.setWrkTaskPri((short)0);
                        command4.setTaskNo2(Math.toIntExact(task.getWorkNo()));
                        write2(command4);
                        break;
                    // 回原点  避让
                    case 9:
                        RgvCommand commandAvoidanceXY = (RgvCommand) task.getData();
                        if (null == commandAvoidanceXY) {
                            commandAvoidanceXY = new RgvCommand();
                        }
                        commandAvoidanceXY.setRgvNo(slave.getId()); // RGV编号
                        commandAvoidanceXY.setTaskNo1((short) 9999); // 工作号
                        commandAvoidanceXY.setAckFinish1((short) 1);  // 任务完成确认位
                        commandAvoidanceXY.setTaskMode1(RgvTaskModeType.GO_ORIGIN); // 任务模式
                        commandAvoidanceXY.setSourceStaNo1((short)0);     // 源站
                        commandAvoidanceXY.setDestinationStaNo1((short)0);     // 目标站
                        commandAvoidanceXY.setTaskNo2((short) 0); // 工作号
                        commandAvoidanceXY.setAckFinish2((short) 1);  // 任务完成确认位
                        commandAvoidanceXY.setTaskMode2(RgvTaskModeType.GO_ORIGIN); // 任务模式
                        commandAvoidanceXY.setSourceStaNo2((short)0);     // 源站
                        commandAvoidanceXY.setDestinationStaNo2((short)0);     // 目标站
                        commandAvoidanceXY.setCommand((short)0);
                        write(commandAvoidanceXY);
//                        RgvCommand commandAvoidanceXY = (RgvCommand) task.getData();
//                        if (null == commandAvoidanceXY) {
//                            commandAvoidanceXY = new RgvCommand();
//                        }
//                        commandAvoidanceXY.setRgvNo(slave.getId()); // RGV编号
//                        commandAvoidanceXY.setTaskNo1((short) 9999); // 工作号
//                        commandAvoidanceXY.setAckFinish1((short) 1);  // 任务完成确认位
//                        commandAvoidanceXY.setTaskMode1(RgvTaskModeType.GO_ORIGIN); // 任务模式
//                        commandAvoidanceXY.setSourceStaNo1((short)0);     // 源站
//                        commandAvoidanceXY.setDestinationStaNo1((short)0);     // 目标站
////                        commandAvoidanceXY.setTaskNo2((short) 0); // 工作号
////                        commandAvoidanceXY.setAckFinish2((short) 1);  // 任务完成确认位
////                        commandAvoidanceXY.setTaskMode2(RgvTaskModeType.GO_ORIGIN); // 任务模式
////                        commandAvoidanceXY.setSourceStaNo2((short)0);     // 源站
////                        commandAvoidanceXY.setDestinationStaNo2((short)0);     // 目标站
//                        commandAvoidanceXY.setCommand((short)0);
//                        write(commandAvoidanceXY);
                        break;
                    default:
                        break;
@@ -137,20 +193,33 @@
        if (null == rgvProtocol) {
            rgvProtocol = new RgvProtocol();
        }
        rgvProtocol.setMode((short) -1);
        //小车状态
        rgvProtocol.setStatus((short)-1);
        rgvProtocol.setTaskNo1((short)0);
        rgvProtocol.setRgvPosDestination(0);
        rgvProtocol.setMode((short) -1);
        rgvProtocol.setRgvPos(0);
        rgvProtocol.setErr1(false);
        rgvProtocol.setErr2(false);
        rgvProtocol.setErr3(false);
        rgvProtocol.setErr4(false);
        rgvProtocol.setErr5(false);
        rgvProtocol.setErr6(false);
        rgvProtocol.setErr7(false);
        rgvProtocol.setWrkTaskPri((short)0);
        //工位1状态
        rgvProtocol.setTaskNo1(0);
        rgvProtocol.setStatus1((short)-1);
        rgvProtocol.setLoaded1((short)0);
        rgvProtocol.setWalkPos((short)0);
        rgvProtocol.setRgvPos((short)0);
        rgvProtocol.setTaskNo2((short)0);
        rgvProtocol.setLoaded1(false);
        rgvProtocol.setWrkTaskMove1((short)0);
        //工位2状态
        rgvProtocol.setTaskNo2(0);
        rgvProtocol.setStatus2((short)-1);
        rgvProtocol.setLoaded2((short)0);
        rgvProtocol.setAlarm((short)0);
        rgvProtocol.setxSpeed((short) 0);
        rgvProtocol.setxDistance((short) 0);
        rgvProtocol.setxDuration((short) 0);
        rgvProtocol.setLoaded2(false);
        rgvProtocol.setWrkTaskMove2((short)0);
//        rgvProtocol.setAlarm((short)0);
//        rgvProtocol.setxSpeed((short) 0);
//        rgvProtocol.setxDistance((short) 0);
//        rgvProtocol.setxDuration((short) 0);
    }

    @Override
@@ -173,34 +242,68 @@
        return result;
    }

    private void setBool(byte[] buffer, int byteIndex, int bitIndex, boolean value) {
        if (value) {
            buffer[byteIndex] |= (1 << bitIndex); // 置位
        } else {
            buffer[byteIndex] &= ~(1 << bitIndex); // 清零
        }
    }

    /**
     * 读取状态
     */
    private void readStatus(){
        try {
            OperateResultExOne<byte[]> result = siemensNet.Read("DB1.0", (short) 34);
            OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 27);
            if (result.IsSuccess) {
                if (null == rgvProtocol) {
                    rgvProtocol = new RgvProtocol();
                    rgvProtocol.setRgvNo(slave.getId());
                    rgvProtocol.setRgvNo(siemensNet.getByteTransform().TransInt16(result.Content, 0));

                }
                rgvProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
                rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 2));
                rgvProtocol.setTaskNo1(siemensNet.getByteTransform().TransInt16(result.Content, 4));
                rgvProtocol.setStatus1(siemensNet.getByteTransform().TransInt16(result.Content, 6));
                rgvProtocol.setLoaded1(siemensNet.getByteTransform().TransInt16(result.Content, 8));
                rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
                rgvProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
//                rgvProtocol.setTaskNo2(siemensNet.getByteTransform().TransInt16(result.Content, 14));
                rgvProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 2));
                rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransInt32(result.Content, 4));
                rgvProtocol.setRgvPosDestination( siemensNet.getByteTransform().TransInt32(result.Content, 8));
                rgvProtocol.setStatus1(siemensNet.getByteTransform().TransInt16(result.Content, 12));
                rgvProtocol.setStatus2(siemensNet.getByteTransform().TransInt16(result.Content, 14));
                rgvProtocol.setTaskNo1(siemensNet.getByteTransform().TransInt32(result.Content, 16));
                rgvProtocol.setTaskNo2(siemensNet.getByteTransform().TransInt32(result.Content, 20));

                boolean[] status1 = siemensNet.getByteTransform().TransBool(result.Content, 24, 2);
                rgvProtocol.setLoaded1(status1[0]);
                rgvProtocol.setLoaded2(status1[1]);
                boolean[] status2 = siemensNet.getByteTransform().TransBool(result.Content, 26, 1);
                rgvProtocol.setErr1(status2[0]);
                rgvProtocol.setErr2(status2[1]);
                rgvProtocol.setErr3(status2[2]);
                rgvProtocol.setErr4(status2[3]);
                rgvProtocol.setErr5(status2[4]);
                rgvProtocol.setErr6(status2[5]);
                rgvProtocol.setErr7(status2[6]);
//                boolean[] status3 = siemensNet.getByteTransform().TransBool(result.Content, 27, 1);
//                rgvProtocol.setErr1(status3[0]);
//                rgvProtocol.setErr2(status3[1]);
//                rgvProtocol.setErr3(status3[2]);
//                rgvProtocol.setErr4(status3[3]);
//                rgvProtocol.setErr5(status3[4]);
//                rgvProtocol.setErr6(status3[5]);
//                rgvProtocol.setErr7(status3[6]);


//                rgvProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
//                rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 14));
//                rgvProtocol.setTaskNo2(siemensNet.getByteTransform().TransInt16(result.Content, 4));
//                rgvProtocol.setLoaded2(siemensNet.getByteTransform().TransInt16(result.Content, 8));
//                rgvProtocol.setStatus2(siemensNet.getByteTransform().TransInt16(result.Content, 16));
//                rgvProtocol.setLoaded2(siemensNet.getByteTransform().TransInt16(result.Content, 18));
                rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 20));
                rgvProtocol.setHeart(siemensNet.getByteTransform().TransInt16(result.Content, 22));
                rgvProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 24));
                rgvProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 26));
                rgvProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 28));
                rgvProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 30));
                rgvProtocol.setTemp5(siemensNet.getByteTransform().TransInt16(result.Content, 32));
//                rgvProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 18));
//                rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 20));
//                rgvProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 22));
//                rgvProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 24));
//                rgvProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 26));
//                rgvProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 28));
//                rgvProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 30));
//                rgvProtocol.setTemp5(siemensNet.getByteTransform().TransInt16(result.Content, 32));
//                rgvProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
//                rgvProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
//                rgvProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
@@ -212,20 +315,20 @@
                        || rgvProtocol.getStatusType1().equals(RgvStatusType.FETCHWAITING)) {
                    if (resetFlag1) {
                        RgvCommand rgvCommand = new RgvCommand();
                        rgvCommand.setAckFinish1((short)1);
                        if (write(rgvCommand)) {
                        rgvCommand.setAckFinish1(true);
                        if (write1(rgvCommand)) {
                            resetFlag1 = false;
                        }
                    }
                }

                // 工位2复位信号
//                 工位2复位信号
                if (rgvProtocol.getStatusType2().equals(RgvStatusType.WAITING)
                        || rgvProtocol.getStatusType2().equals(RgvStatusType.FETCHWAITING)) {
                    if (resetFlag2) {
                        RgvCommand rgvCommand = new RgvCommand();
                        rgvCommand.setAckFinish2((short)1);
                        if (write(rgvCommand)) {
                        rgvCommand.setAckFinish2(true);
                        if (write2(rgvCommand)) {
                            resetFlag2 = false;
                        }
                    }
@@ -247,12 +350,12 @@
            } else {
                initRgv();
                OutputQueue.RGV.offer(MessageFormat.format("【{0}】读取RGV plc状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
                log.error("读取RGV plc状态信息失败 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
//                log.error("读取RGV plc状态信息失败 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
            }
        } catch (Exception e) {
            e.printStackTrace();
            OutputQueue.RGV.offer(MessageFormat.format("【{0}】读取RGV plc状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
            log.error("读取RGV plc状态信息失败 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
//            log.error("读取RGV plc状态信息失败 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
            initRgv();
        }
    }
@@ -260,62 +363,173 @@
    /**
     * 工位1、2同时写入数据
     */
    private boolean write(RgvCommand command) throws InterruptedException {
    private boolean write12(RgvCommand command) throws InterruptedException {
        if (null == command) {
            log.error("RGV写入命令为空");
            return false;
        }
//        convertRow(command);
        command.setRgvNo(slave.getId());
        short[] array = new short[11];
        array[0] = command.getAckFinish1();
        array[1] = command.getTaskNo1();
        array[2] = command.getTaskMode1();
        array[3] = command.getSourceStaNo1();
        array[4] = command.getDestinationStaNo1();
        array[5] = command.getAckFinish2();
        array[6] = command.getTaskNo2();
        array[7] = command.getTaskMode2();
        array[8] = command.getSourceStaNo2();
        array[9] = command.getDestinationStaNo2();
        array[10] = command.getCommand();
        OperateResult result = siemensNet.Write("DB100.0", array);

        if (command.getAckFinish1() == 0 && command.getAckFinish2() == 0) {
            short commandFinish = 3;  //工位1、2任务同时写入
            Thread.sleep(100L);
            result = siemensNet.Write("DB100.20", commandFinish);
        OperateResultExOne<byte[]> result1 = siemensNet.Read("DB100.0", (short) 34);
//        OperateResultExOne<byte[]> result4 = siemensNet.Read("DB100.10", (short) 2);
        if (result1.IsSuccess){
            RgvCommand one = new RgvCommand();
            one.setTargetPosition1(siemensNet.getByteTransform().TransInt32(result1.Content, 0));
            one.setEndStaNo1(siemensNet.getByteTransform().TransInt32(result1.Content, 4));
            one.setTaskStatus1(siemensNet.getByteTransform().TransInt16(result1.Content, 8));
            one.setTaskNo1(siemensNet.getByteTransform().TransInt32(result1.Content, 10));
            one.setDirection1(siemensNet.getByteTransform().TransInt16(result1.Content, 14));
            one.setTargetPosition2(siemensNet.getByteTransform().TransInt32(result1.Content, 16));
            one.setEndStaNo2(siemensNet.getByteTransform().TransInt32(result1.Content, 20));
            one.setTaskStatus2(siemensNet.getByteTransform().TransInt16(result1.Content, 24));
            one.setTaskNo2(siemensNet.getByteTransform().TransInt32(result1.Content, 26));
            one.setDirection2(siemensNet.getByteTransform().TransInt16(result1.Content, 30));

            News.error("RGV命令下发前读取状态[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
        }
        OperateResult result2 = siemensNet.Write("DB100.34", false);
        if (result2.IsSuccess){
            News.error("下发前把车子确认位置为false");
        }
        byte[] writeBytes = new byte[36];
        command.setRgvNo(slave.getId());
        siemensNet.getByteTransform().TransInt32(writeBytes, 0, command.getTargetPosition1());
        siemensNet.getByteTransform().TransInt32(writeBytes, 4, command.getEndStaNo1());
        siemensNet.getByteTransform().TransInt16(writeBytes, 8, command.getTaskStatus1());
        siemensNet.getByteTransform().TransInt32(writeBytes, 10, command.getTaskNo1());
        siemensNet.getByteTransform().TransInt16(writeBytes, 14, command.getDirection1());
        setBool(writeBytes, 32, 0, command.getAckFinish1());
        siemensNet.getByteTransform().TransInt32(writeBytes, 16, command.getTargetPosition2());
        siemensNet.getByteTransform().TransInt32(writeBytes, 20, command.getEndStaNo2());
        siemensNet.getByteTransform().TransInt16(writeBytes, 24, command.getTaskStatus2());
        siemensNet.getByteTransform().TransInt32(writeBytes, 26, command.getTaskNo2());
        siemensNet.getByteTransform().TransInt16(writeBytes, 30, command.getDirection2());
        setBool(writeBytes, 32, 1, command.getAckFinish2());
        siemensNet.getByteTransform().TransInt16(writeBytes, 36, command.getWrkTaskPri());

        OperateResult result = siemensNet.Write("DB100.0", writeBytes);

        if (!result.IsSuccess){
            News.error("写入RGVplc数据失败，重新添加任务到队列 ===> [id:{}],{}",slave.getId(),JSON.toJSON(command));
            MessageQueue.offer(SlaveType.Rgv,slave.getId(),new Task(2,command));
            Thread.sleep(100);
            readStatus();
            return false;
        }

        //RGV任务写入后，回读一次，看是否成功
        Thread.sleep(400);
        try {
            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 36);
            if (resultRead.IsSuccess){
                RgvCommand one = new RgvCommand();
                one.setDirection1(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
                one.setTaskNo1(siemensNet.getByteTransform().TransInt32(resultRead.Content, 10));
                one.setTaskStatus1(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
                one.setEndStaNo1(siemensNet.getByteTransform().TransInt32(resultRead.Content, 4));
                one.setTargetPosition1(siemensNet.getByteTransform().TransInt32(resultRead.Content, 0));
                one.setWrkTaskPri(siemensNet.getByteTransform().TransInt16(resultRead.Content, 36));
                one.setDirection2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 30));
                one.setTaskNo2(siemensNet.getByteTransform().TransInt32(resultRead.Content, 26));
                one.setTaskStatus2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 24));
                one.setEndStaNo2(siemensNet.getByteTransform().TransInt32(resultRead.Content, 20));
                one.setTargetPosition2(siemensNet.getByteTransform().TransInt32(resultRead.Content, 16));
                if (
                        !command.getDirection1().equals(one.getDirection1()) ||
                                !command.getTaskNo1().equals(one.getTaskNo1()) ||
                                !command.getTaskStatus1().equals(one.getTaskStatus1()) ||
                                !command.getEndStaNo1().equals(one.getEndStaNo1()) ||
                                !command.getTargetPosition1().equals(one.getTargetPosition1()) ||
                                !command.getDirection2().equals(one.getDirection2()) ||
                                !command.getTaskNo2().equals(one.getTaskNo2()) ||
                                !command.getTaskStatus2().equals(one.getTaskStatus2()) ||
                                !command.getEndStaNo2().equals(one.getEndStaNo2()) ||
                                !command.getTargetPosition2().equals(one.getTargetPosition2())
                ) {
                    try{
                        News.error("RGV命令地址写入后回读失败[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
                    }catch (Exception e){
                        try{
                            News.error("日志打印失败：===>>参数one报错 [id:{}],{}", slave.getId(), JSON.toJSON(command),JSON.toJSON(resultRead));
                        }catch (Exception e1){
                            News.error("日志打印失败：===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
                        }
                    }
                    News.error("Rgv命令回读失败后，重新添加任务到队列 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
                    MessageQueue.offer(SlaveType.Rgv, slave.getId(), new Task(4, command));
                    Thread.sleep(100);
                    readStatus();
                    return false;
                }else {
                    News.info("RGV命令地址写入后回读成功[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
                }
            }
        }catch (Exception e){
            News.error("RGV命令地址写入后回读出错");
        }

        if (command.getAckFinish1() || command.getAckFinish2()) {
            if (result.IsSuccess) {
                Thread.sleep(300);
                //任务下发次数
                int writeCount2 = 0;

                do {
                    writeCount2++;
                    boolean commandFinish = false;
                    boolean commandFinish2 = false;
                    result = siemensNet.Write("DB100.DBX32.0", commandFinish);
                    OperateResult result3 = siemensNet.Write("DB100.DBX32.1", commandFinish);

                    if(result.IsSuccess && result3.IsSuccess){
                        //RGV任务写入后，回读一次，看是否成功
                        Thread.sleep(200);
                        OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.32", (short) 2);
                        if (resultRead.IsSuccess) {
                            commandFinish=siemensNet.getByteTransform().TransBool(resultRead.Content, 0);
                            commandFinish2=siemensNet.getByteTransform().TransBool(resultRead.Content, 1);

                            if (!commandFinish && !commandFinish2) {
                                News.error("RGV任务确认位"+commandFinish+"写入数据与回读数据不一致！"+"循环执行次数:"+writeCount2+"次");
                            }else{
                                //任务命令写入成功
                                News.info("RGV任务确认位"+commandFinish+"回读成功！"+"循环执行次数:"+writeCount2+"次");
                                break;
                            }
                        }else {
                            News.error("RGV任务确认位"+commandFinish+"回读失败！"+"循环执行次数:"+writeCount2+"次");
                        }
                    } else {
                        News.error("RGV任务确认位"+commandFinish+"写入失败！"+"循环执行次数:"+writeCount2+"次");
                    }
                }while (writeCount2<5);
            }
        }


        try {
            // 日志记录
            BasRgvOptService bean = SpringUtils.getBean(BasRgvOptService.class);
            BasRgvOpt basRgvOpt = new BasRgvOpt(
                    command.getTaskNo1().intValue(),
                    command.getTaskNo2().intValue(),
                    command.getTaskNo1(),
                    command.getTaskNo2(),
                    command.getRgvNo(),
                    new Date(),
                    command.getTaskModeType1().toString(),
                    command.getSourceStaNo1().intValue(),
                    command.getDestinationStaNo1().intValue(),
                    command.getSourceStaNo2().intValue(),
                    command.getDestinationStaNo2().intValue(),
                    null,
                    new Date(),
                    null
                    command.getTargetPosition1()
            );
            bean.insert(basRgvOpt);
        } catch (Exception ignore) {}
        } catch (Exception ignore) {
            log.error(ignore.getMessage());
        }

        if (result != null && result.IsSuccess) {
            Thread.sleep(200);
            this.readStatus();
            log.info("RGV 命令下发[id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
            OutputQueue.RGV.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 命令下发： {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
            log.info("RGV 工位1命令下发[id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
            OutputQueue.RGV.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 工位12命令下发： {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
            return true;
        } else {
            OutputQueue.RGV.offer(MessageFormat.format("【{0}】写入RGV plc数据失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
            log.error("写入RGV plc数据失败 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
            OutputQueue.RGV.offer(MessageFormat.format("【{0}】写入RGV plc工位12数据失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
            log.error("写入RGV plc工位1数据失败 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
            return false;
        }
    }
@@ -329,44 +543,148 @@
            return false;
        }

        siemensNet.Write("DB100.20", command.getCommand());

        command.setRgvNo(slave.getId());
        short[] array = new short[5];
        array[0] = command.getAckFinish1();
        array[1] = command.getTaskNo1();
        array[2] = command.getTaskMode1();
        array[3] = command.getSourceStaNo1();
        array[4] = command.getDestinationStaNo1();
        siemensNet.Write("DB100.20", command.getCommand());

        OperateResult result = siemensNet.Write("DB100.0", array);

        if (command.getAckFinish1() == 0) {
            short commandFinish = 1;  //工位1任务写入
            Thread.sleep(100L);
            result = siemensNet.Write("DB100.20", commandFinish);
        OperateResultExOne<byte[]> result1 = siemensNet.Read("DB100.0", (short) 39);
//        OperateResultExOne<byte[]> result4 = siemensNet.Read("DB100.10", (short) 2);
        if (result1.IsSuccess){
            RgvCommand one = new RgvCommand();
            one.setTargetPosition1(siemensNet.getByteTransform().TransInt32(result1.Content, 0));
            one.setEndStaNo1(siemensNet.getByteTransform().TransInt32(result1.Content, 4));
            one.setTaskStatus1(siemensNet.getByteTransform().TransInt16(result1.Content, 8));
            one.setTaskNo1(siemensNet.getByteTransform().TransInt32(result1.Content, 10));
            one.setDirection1(siemensNet.getByteTransform().TransInt16(result1.Content, 14));
            one.setWrkTaskMove1(siemensNet.getByteTransform().TransInt16(result1.Content, 36));
            News.error("RGV命令下发前读取状态[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
        }


        OperateResult result2 = siemensNet.Write("DB100.34", false);
        if (result2.IsSuccess){
            News.error("下发前把车子确认位置为false");
        }
        byte[] writeBytes = new byte[40];
        command.setRgvNo(slave.getId());

        writeInt32(writeBytes, 0, command.getTargetPosition1());
        writeInt32(writeBytes, 4, command.getEndStaNo1());
        writeInt16(writeBytes, 8, (short)command.getTaskStatus1());
        writeInt32(writeBytes, 10, command.getTaskNo1());
        writeInt16(writeBytes, 14, (short)command.getDirection1());
        writeBool(writeBytes, 32, 0, command.getAckFinish1());
        writeInt16(writeBytes, 38, (short)command.getWrkTaskMove1());

        OperateResult result = siemensNet.Write("DB100.0", writeBytes);


        if (!result.IsSuccess){
            News.error("写入RGVplc数据失败，重新添加任务到队列 ===> [id:{}],{}",slave.getId(),JSON.toJSON(command));
            MessageQueue.offer(SlaveType.Rgv,slave.getId(),new Task(4,command));
            Thread.sleep(100);
            readStatus();
            return false;
        }

        //RGV任务写入后，回读一次，看是否成功
        Thread.sleep(400);
        try {
            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 39);
            if (resultRead.IsSuccess){
                RgvCommand one = new RgvCommand();
                one.setWrkTaskMove1(siemensNet.getByteTransform().TransInt16(resultRead.Content, 38));
                one.setDirection1(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
                one.setTaskNo1(siemensNet.getByteTransform().TransInt32(resultRead.Content, 10));
                one.setTaskStatus1(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
                one.setEndStaNo1(siemensNet.getByteTransform().TransInt32(resultRead.Content, 4));
                one.setTargetPosition1(siemensNet.getByteTransform().TransInt32(resultRead.Content, 0));
                if (
                        !command.getDirection1().equals(one.getDirection1()) ||
                                !command.getTaskNo1().equals(one.getTaskNo1()) ||
                                !command.getTaskStatus1().equals(one.getTaskStatus1()) ||
                                !command.getEndStaNo1().equals(one.getEndStaNo1()) ||
                                !command.getTargetPosition1().equals(one.getTargetPosition1()) ||
                                !command.getWrkTaskMove1().equals(one.getWrkTaskMove1())
                ) {
                    try{
                        News.error("RGV命令地址写入后回读失败[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
                    }catch (Exception e){
                        try{
                            News.error("日志打印失败：===>>参数one报错 [id:{}],{}", slave.getId(), JSON.toJSON(command),JSON.toJSON(resultRead));
                        }catch (Exception e1){
                            News.error("日志打印失败：===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
                        }
                    }
                    News.error("Rgv命令回读失败后，重新添加任务到队列 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
                    MessageQueue.offer(SlaveType.Rgv, slave.getId(), new Task(4, command));
                    Thread.sleep(100);
                    readStatus();
                    return false;
                }else {
                    News.info("RGV命令地址写入后回读成功[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
                }
            }
        }catch (Exception e){
            News.error("RGV命令地址写入后回读出错");
        }

        if (!command.getAckFinish1()) {
            if (result.IsSuccess) {
                Thread.sleep(300);
                //任务下发次数
                int writeCount2 = 0;

                do {
                    writeCount2++;
                    boolean commandFinish = true;
                    if(command.getCommand()){
                        commandFinish = false;
                    }
                    result = siemensNet.Write("DB100.32.0", commandFinish);
                    if(result.IsSuccess){
                        //RGV任务写入后，回读一次，看是否成功
                        Thread.sleep(200);
                        OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.32", (short) 2);
                        if (resultRead.IsSuccess) {
                            commandFinish=siemensNet.getByteTransform().TransBool(resultRead.Content, 0);
                            if (commandFinish){
                                News.error("RGV任务确认位"+commandFinish+"写入数据与回读数据不一致！"+"循环执行次数:"+writeCount2+"次");
                            }else{
                                //任务命令写入成功
                                News.info("RGV任务确认位"+commandFinish+"回读成功！"+"循环执行次数:"+writeCount2+"次");
                                break;
                            }
                        }else {
                            News.error("RGV任务确认位"+commandFinish+"回读失败！"+"循环执行次数:"+writeCount2+"次");
                        }
                    } else {
                        News.error("RGV任务确认位"+commandFinish+"写入失败！"+"循环执行次数:"+writeCount2+"次");
                    }
                }while (writeCount2<5);
            }
        }

//        if (command.getAckFinish1() == 0) {
//            short commandFinish = 1;  //工位1任务写入
//            Thread.sleep(200);
//            result = siemensNet.Write("DB100.10", commandFinish);
//        }

        try {
            // 日志记录
            BasRgvOptService bean = SpringUtils.getBean(BasRgvOptService.class);
            BasRgvOpt basRgvOpt = new BasRgvOpt(
                    command.getTaskNo1().intValue(),
                    command.getTaskNo2().intValue(),
                    command.getTaskNo1(),
                    command.getRgvNo(),
                    new Date(),
                    command.getTaskModeType1().toString(),
                    command.getSourceStaNo1().intValue(),
                    command.getDestinationStaNo1().intValue(),
                    command.getSourceStaNo2().intValue(),
                    command.getDestinationStaNo2().intValue(),
                    command.getTaskStatus1().toString(),
                    command.getTargetPosition1(),
                    command.getEndStaNo1(),
                    null,
                    new Date(),
                    null
            );
            bean.insert(basRgvOpt);
        } catch (Exception ignore) {}
        } catch (Exception ignore) {
            log.error(ignore.getMessage());
        }

        if (result != null && result.IsSuccess) {
            Thread.sleep(200);
@@ -390,36 +708,137 @@
            return false;
        }

        OperateResultExOne<byte[]> result1 = siemensNet.Read("DB100.0", (short) 40);
        if (result1.IsSuccess){
            RgvCommand one = new RgvCommand();
            one.setTargetPosition1(siemensNet.getByteTransform().TransInt32(result1.Content, 0));
            one.setEndStaNo2(siemensNet.getByteTransform().TransInt32(result1.Content, 20));
            one.setTaskStatus2(siemensNet.getByteTransform().TransInt16(result1.Content, 24));
            one.setTaskNo2(siemensNet.getByteTransform().TransInt32(result1.Content, 26));
            one.setDirection2(siemensNet.getByteTransform().TransInt16(result1.Content, 30));
            one.setWrkTaskMove2(siemensNet.getByteTransform().TransInt16(result1.Content, 38));
            News.error("RGV命令下发前读取状态[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
        }


        OperateResult result2 = siemensNet.Write("DB100.34", false);
        if (result2.IsSuccess){
            News.error("下发前把车子确认位置为0");
        }


        byte[] writeBytes = new byte[42];
        command.setRgvNo(slave.getId());
        short[] array = new short[6];
        array[0] = command.getAckFinish2();
        array[1] = command.getTaskNo2();
        array[2] = command.getTaskMode2();
        array[3] = command.getSourceStaNo2();
        array[4] = command.getDestinationStaNo2();
        array[5] = command.getCommand();

        OperateResult result = siemensNet.Write("DB100.10", array);
        writeInt32(writeBytes, 0, command.getTargetPosition1());
        writeInt32(writeBytes, 20, command.getEndStaNo2());
        writeInt16(writeBytes, 24, (short)command.getTaskStatus2());
        writeInt32(writeBytes, 26, command.getTaskNo2());
        writeInt16(writeBytes, 30, (short)command.getDirection2());
        writeBool(writeBytes, 32, 0, command.getAckFinish2());
        writeInt16(writeBytes, 38, (short)command.getWrkTaskMove2());

        if (command.getAckFinish2() == 0) {
            short commandFinish = 2;  //工位2任务写入
            Thread.sleep(100L);
            result = siemensNet.Write("DB100.20", commandFinish);

        OperateResult result = siemensNet.Write("DB100.0", writeBytes);



        if (!result.IsSuccess){
            News.error("写入RGVplc数据失败，重新添加任务到队列 ===> [id:{}],{}",slave.getId(),JSON.toJSON(command));
            MessageQueue.offer(SlaveType.Rgv,slave.getId(),new Task(5,command));
            Thread.sleep(100);
            readStatus();
            return false;
        }

        //RGV任务写入后，回读一次，看是否成功
        Thread.sleep(400);
        try {
            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 42);
            if (resultRead.IsSuccess){
                RgvCommand one = new RgvCommand();
                one.setWrkTaskMove2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 38));
                one.setDirection2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 30));
                one.setTaskNo2(siemensNet.getByteTransform().TransInt32(resultRead.Content, 26));
                one.setTaskStatus2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 24));
                one.setEndStaNo2(siemensNet.getByteTransform().TransInt32(resultRead.Content, 20));
                one.setTargetPosition1(siemensNet.getByteTransform().TransInt32(resultRead.Content, 0));
                if (
                        !command.getDirection2().equals(one.getDirection2()) ||
                                !command.getTaskNo2().equals(one.getTaskNo2()) ||
                                !command.getTaskStatus2().equals(one.getTaskStatus2()) ||
                                !command.getEndStaNo2().equals(one.getEndStaNo2()) ||
                                !command.getTargetPosition1().equals(one.getTargetPosition1()) ||
                                !command.getWrkTaskMove2().equals(one.getWrkTaskMove2())
                ) {
                    try{
                        News.error("RGV命令地址写入后回读失败[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
                    }catch (Exception e){
                        try{
                            News.error("日志打印失败：===>>参数one报错 [id:{}],{}", slave.getId(), JSON.toJSON(command),JSON.toJSON(resultRead));
                        }catch (Exception e1){
                            News.error("日志打印失败：===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
                        }
                    }
                    News.error("Rgv命令回读失败后，重新添加任务到队列 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
                    MessageQueue.offer(SlaveType.Rgv, slave.getId(), new Task(5, command));
                    Thread.sleep(100);
                    readStatus();
                    return false;
                }else {
                    News.info("RGV命令地址写入后回读成功[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
                }
            }
        }catch (Exception e){
            News.error("RGV命令地址写入后回读出错");
        }

        if (!command.getAckFinish2()) {
            if (result.IsSuccess) {
                Thread.sleep(300);
                //任务下发次数
                int writeCount2 = 0;

                do {
                    writeCount2++;
                    boolean commandFinish = true;
                    if(command.getCommand()){
                        commandFinish = false;
                    }
                    result = siemensNet.Write("DB100.32.1", commandFinish);
                    if(result.IsSuccess){
                        //RGV任务写入后，回读一次，看是否成功
                        Thread.sleep(200);
                        OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.32", (short) 2);
                        if (resultRead.IsSuccess) {
                            commandFinish=siemensNet.getByteTransform().TransBool(resultRead.Content, 1);
                            if (commandFinish){
                                News.error("RGV任务确认位"+commandFinish+"写入数据与回读数据不一致！"+"循环执行次数:"+writeCount2+"次");
                            }else{
                                //任务命令写入成功
                                News.info("RGV任务确认位"+commandFinish+"回读成功！"+"循环执行次数:"+writeCount2+"次");
                                break;
                            }
                        }else {
                            News.error("RGV任务确认位"+commandFinish+"回读失败！"+"循环执行次数:"+writeCount2+"次");
                        }
                    } else {
                        News.error("RGV任务确认位"+commandFinish+"写入失败！"+"循环执行次数:"+writeCount2+"次");
                    }
                }while (writeCount2<5);
            }
        }

        try {
            // 日志记录
            BasRgvOptService bean = SpringUtils.getBean(BasRgvOptService.class);
            BasRgvOpt basRgvOpt = new BasRgvOpt(
                    command.getTaskNo1().intValue(),
                    command.getTaskNo2().intValue(),
                    command.getTaskNo2(),
                    command.getRgvNo(),
                    new Date(),
                    command.getTaskModeType1().toString(),
                    command.getSourceStaNo1().intValue(),
                    command.getDestinationStaNo1().intValue(),
                    command.getSourceStaNo2().intValue(),
                    command.getDestinationStaNo2().intValue(),
                    command.getTaskStatus2().toString(),
                    command.getTargetPosition2(),
                    command.getEndStaNo2(),
                    null,
                    new Date(),
                    null
@@ -439,6 +858,28 @@
            return false;
        }
    }
    public static void writeInt32(byte[] buffer, int index, int value) {
        buffer[index]     = (byte)((value >> 24) & 0xFF);
        buffer[index + 1] = (byte)((value >> 16) & 0xFF);
        buffer[index + 2] = (byte)((value >> 8) & 0xFF);
        buffer[index + 3] = (byte)(value & 0xFF);
    }


    public static void writeInt16(byte[] buffer, int index, short value) {
        buffer[index]     = (byte)((value >> 8) & 0xFF); // 高字节
        buffer[index + 1] = (byte)(value & 0xFF);        // 低字节
    }

    public static void writeBool(byte[] buffer, int byteIndex, int bitIndex, boolean value) {
        if (value) {
            buffer[byteIndex] |= (1 << bitIndex);
        } else {
            buffer[byteIndex] &= ~(1 << bitIndex);
        }
    }



    @Override
    public void close() {