#

pang.jiabao

2024-10-10 f2223c21f5fb6413e01dad87730c6a0a5fdcbb96

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

@@ -7,13 +7,12 @@
import com.alibaba.fastjson.JSON;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasRgv;
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.entity.BasRgv;
import com.zy.entity.BasRgvOpt;
import com.zy.service.BasRgvOptService;
import com.zy.service.BasRgvService;
import com.zy.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;
@@ -21,7 +20,6 @@
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;
@@ -335,6 +333,26 @@
            return false;
        }

        OperateResultExOne<byte[]> result3 = siemensNet.Read("DB100.0", (short) 12);
        OperateResultExOne<byte[]> result4 = siemensNet.Read("DB100.10", (short) 2);
        if (result3.IsSuccess){
            RgvCommand one = new RgvCommand();
//                one.setAckFinish1(siemensNet.getByteTransform().TransInt16(resultRead.Content, 0));
            one.setTaskNo1(siemensNet.getByteTransform().TransInt16(result3.Content, 2));
            one.setTaskMode1(siemensNet.getByteTransform().TransInt16(result3.Content, 4));
            one.setSourceStaNo1(siemensNet.getByteTransform().TransInt16(result3.Content, 6));
            one.setDestinationStaNo1(siemensNet.getByteTransform().TransInt16(result3.Content, 8));
            one.setCommand(siemensNet.getByteTransform().TransInt16(result4.Content, 0));

            News.error("RGV命令下发前读取状态[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
        }


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

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

        command.setRgvNo(slave.getId());