#

Junjie

20 小时以前 eab71c86022c1b3bb3ac334e0c57ad61ba7854a4

#

 src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java

@@ -13,6 +13,7 @@
import com.zy.asrs.utils.Utils;
import com.zy.core.News;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.CrnTaskModeType;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.CrnCommand;
import com.zy.core.network.api.ZyCrnConnectApi;
@@ -127,10 +128,17 @@
                return response;
            }

            Integer commandTaskNo = command.getTaskNo();
            Integer commandTaskMode = command.getTaskMode();
            if (commandTaskMode.equals(CrnTaskModeType.RESET.id)) {
                commandTaskNo = 0;
                commandTaskMode = 0;
            }

            short[] array = new short[9];
            array[0] = command.getAckFinish().shortValue();
            array[1] = command.getTaskNo().shortValue();
            array[2] = command.getTaskMode().shortValue();
            array[1] = commandTaskNo.shortValue();
            array[2] = commandTaskMode.shortValue();
            array[3] = command.getSourcePosX().shortValue();
            array[4] = command.getSourcePosY().shortValue();
            array[5] = command.getSourcePosZ().shortValue();

 src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java

@@ -11,6 +11,7 @@
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.CrnTaskModeType;
import com.zy.core.enums.RedisKeyType;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.CrnCommand;
@@ -165,10 +166,17 @@
                return response;
            }

            Integer commandTaskNo = command.getTaskNo();
            Integer commandTaskMode = command.getTaskMode();
            if (commandTaskMode.equals(CrnTaskModeType.RESET.id)) {
                commandTaskNo = 0;
                commandTaskMode = 0;
            }

            short[] array = new short[9];
            array[0] = command.getAckFinish().shortValue();
            array[1] = command.getTaskNo().shortValue();
            array[2] = command.getTaskMode().shortValue();
            array[1] = commandTaskNo.shortValue();
            array[2] = commandTaskMode.shortValue();
            array[3] = command.getSourcePosX().shortValue();
            array[4] = command.getSourcePosY().shortValue();
            array[5] = command.getSourcePosZ().shortValue();

 src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java

@@ -288,7 +288,7 @@
        crnCommand.setCrnNo(crnNo); // 堆垛机编号
        crnCommand.setTaskNo(taskNo); // 工作号
        crnCommand.setAckFinish(1);  // 任务完成确认位
        crnCommand.setTaskMode(CrnTaskModeType.NONE.id); // 任务模式
        crnCommand.setTaskMode(CrnTaskModeType.RESET.id); // 任务模式
        crnCommand.setSourcePosX(0);     // 源库位排
        crnCommand.setSourcePosY(0);     // 源库位列
        crnCommand.setSourcePosZ(0);     // 源库位层