*

lsh

2024-10-20 8a0aa8fe9830606ce4daca939f597886b14b9a9b

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

@@ -11,6 +11,7 @@
import com.zy.asrs.entity.BasRgvOpt;
import com.zy.asrs.service.BasRgvOptService;
import com.zy.asrs.service.BasRgvService;
import com.zy.asrs.utils.NumUtils;
import com.zy.asrs.utils.RouteUtils;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
@@ -159,19 +160,8 @@
                rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 12));
                rgvProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 14));
                rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransUInt32(result.Content, 16));
                rgvProtocol.setRgvPos(slave.getId().longValue()*100000);
//                rgvProtocol.setRgvPos((long)NumUtils.GetRandomIntInRange(1737000));
                OutputQueue.RGV.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), slave.getId()));

//                // 工位1复位信号
//                if (rgvProtocol.getStatusType1().equals(RgvStatusType.WAITING)) {
//                    if (resetFlag1) {
//                        RgvCommand rgvCommand = new RgvCommand();
//                        rgvCommand.setAckFinish1((short)1);
//                        if (write(rgvCommand)) {
//                            resetFlag1 = false;
//                        }
//                    }
//                }

                try {
                    // 根据实时信息更新数据库
@@ -218,14 +208,12 @@
        array[1] = command.getDestinationStaNo1();
        array[2] = command.getTaskMode1();//任务模式
        array[3] = command.getTaskNo1();
//        siemensNet.Write("DB100.20", 0);

        OperateResult result = siemensNet.Write("DB24.2", array);

        if (command.getAckFinish1().equals((short)0)) {
            boolean commandFinish = true;  //工位1任务写入
            Thread.sleep(100L);
            result = siemensNet.Write("DB24.10.0", commandFinish);
            result = siemensNet.Write("DB24.10.0", true);
        } else {
            siemensNet.Write("DB24.10.1", true);
        }