#

luxiaotao1123

2020-08-11 101daeec4a9ab95caf959c97595247c69ec3e03b

#

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -12,6 +12,8 @@
import com.zy.common.model.StartupDto;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnForkPosType;
import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.CrnStatusType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
@@ -261,9 +263,9 @@
                        continue;
                    }
                    // 更新工作档状态为14失败 todo:luxiaotao
                    if (crnProtocol.mode == 3 && crnProtocol.getTaskNo() == wrkMast.getWrkNo()
                    if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast.getWrkNo().shortValue())
                            && crnProtocol.statusType == CrnStatusType.IDLE
                            && crnProtocol.forkPos==0) {
                            && crnProtocol.forkPosType == CrnForkPosType.HOME) {
                        wrkMast.setWrkSts(14L);
                        wrkMast.setCrnEndTime(new Date());
                        if (wrkMastMapper.updateById(wrkMast) == 0) {

 src/main/java/com/zy/core/model/protocol/CrnProtocol.java

@@ -74,7 +74,7 @@
     */
    public Short forkPos;

    private CrnForkPosType forkPosType;
    public CrnForkPosType forkPosType;

    /**
     * 当前载货台位置

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

@@ -28,6 +28,7 @@

    public CrnThread(CrnSlave slave) {
        this.slave = slave;
        this.connect();
    }

    @Override
@@ -118,7 +119,7 @@
    /**
     * 写入数据
     */
    private void write(){
    private void write(CrnCommand command){

    }