Junjie
2026-04-13 b8640dc78123f4be2483feed2f48b9183983f51f
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -26,6 +26,7 @@
import com.zy.core.network.entity.ZyCrnStatusEntity;
import com.zy.core.service.WrkCommandRollbackService;
import com.zy.core.thread.CrnThread;
import com.zy.core.task.DeviceAsyncLogPublisher;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -46,10 +47,12 @@
    private ZyCrnConnectDriver zyCrnConnectDriver;
    private CrnProtocol crnProtocol;
    private int deviceLogCollectTime = 200;
    private final DeviceAsyncLogPublisher deviceAsyncLogPublisher;
    public ZySiemensCrnThread(DeviceConfig deviceConfig, RedisUtil redisUtil) {
        this.deviceConfig = deviceConfig;
        this.redisUtil = redisUtil;
        this.deviceAsyncLogPublisher = SpringUtils.getBean(DeviceAsyncLogPublisher.class);
    }
    @Override
@@ -199,7 +202,7 @@
            deviceDataLog.setDeviceNo(crnProtocol.getCrnNo());
            deviceDataLog.setCreateTime(new Date());
            redisUtil.set(RedisKeyType.DEVICE_LOG_KEY.key + System.currentTimeMillis(), deviceDataLog, 60 * 60 * 24);
            deviceAsyncLogPublisher.publishLatest(deviceDataLog);
            //更新采集时间
            crnProtocol.setDeviceDataLog(System.currentTimeMillis());
        }
@@ -276,6 +279,9 @@
        crnCommand.setTaskNo(taskNo); // 工作号
        crnCommand.setAckFinish(0);  // 任务完成确认位
        crnCommand.setTaskMode(CrnTaskModeType.CRN_MOVE.id); // 任务模式:  堆垛机移动
        crnCommand.setSourcePosX(Utils.getRow(targetLocNo));     // 目标库位排
        crnCommand.setSourcePosY(Utils.getBay(targetLocNo));     // 目标库位列
        crnCommand.setSourcePosZ(Utils.getLev(targetLocNo));     // 目标库位层
        crnCommand.setDestinationPosX(Utils.getRow(targetLocNo));     // 目标库位排
        crnCommand.setDestinationPosY(Utils.getBay(targetLocNo));     // 目标库位列
        crnCommand.setDestinationPosZ(Utils.getLev(targetLocNo));     // 目标库位层