#

18516761980

2022-07-29 165f912f7923fc27508b107873afa02140dc3eb9

#

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

@@ -561,7 +561,7 @@
            }
            // 库位移转
            this.locToLoc(crn, crnProtocol);
            this.crnRebackHp(crnProtocol, crnThread);
//            this.crnRebackHp(crnProtocol, crnThread);

        }
    }

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

@@ -8,10 +8,10 @@

    void setResetFlag(boolean flag);

//    void setBackHpFlag(boolean flag);
    void setBackHpFlag(boolean flag);

    /**
     * 堆垛机是否在回原点运动中标记
     */
//    boolean isBackHpFlag();
    boolean isBackHpFlag();
}

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

@@ -24,7 +24,6 @@
import com.zy.core.model.protocol.CrnProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

import java.text.MessageFormat;
import java.util.Date;
@@ -125,13 +124,13 @@
        crnProtocol.setWalkPos((short)0);
        crnProtocol.setLoaded((short)0);
        crnProtocol.setAlarm((short)0);
        crnProtocol.setXSpeed(0F);
        crnProtocol.setYSpeed(0F);
        crnProtocol.setZSpeed(0F);
        crnProtocol.setXDistance(0F);
        crnProtocol.setYDistance(0F);
        crnProtocol.setXDuration(0F);
        crnProtocol.setYDuration(0F);
        crnProtocol.setxSpeed((short)0);
        crnProtocol.setySpeed((short)0);
        crnProtocol.setzSpeed((short)0);
        crnProtocol.setxDistance((short)0);
        crnProtocol.setyDistance((short)0);
        crnProtocol.setxDuration((short)0);
        crnProtocol.setyDuration((short)0);
    }

    @Override
@@ -182,13 +181,13 @@
                crnProtocol.setTemp2(melsecMcNet.getByteTransform().TransInt16(result.Content, 22));
                crnProtocol.setTemp3(melsecMcNet.getByteTransform().TransInt16(result.Content, 24));
                crnProtocol.setTemp4(melsecMcNet.getByteTransform().TransInt16(result.Content, 26));
                crnProtocol.setXSpeed(melsecMcNet.getByteTransform().TransSingle(result.Content, 28));
                crnProtocol.setYSpeed(melsecMcNet.getByteTransform().TransSingle(result.Content, 32));
                crnProtocol.setZSpeed(melsecMcNet.getByteTransform().TransSingle(result.Content, 36));
                crnProtocol.setXDistance(melsecMcNet.getByteTransform().TransSingle(result.Content, 40));
                crnProtocol.setYDistance(melsecMcNet.getByteTransform().TransSingle(result.Content, 44));
                crnProtocol.setXDuration(melsecMcNet.getByteTransform().TransSingle(result.Content, 48));
                crnProtocol.setYDuration(melsecMcNet.getByteTransform().TransSingle(result.Content, 52));
                crnProtocol.setxSpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 28));
                crnProtocol.setySpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 32));
                crnProtocol.setzSpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 36));
                crnProtocol.setxDistance(melsecMcNet.getByteTransform().TransInt16(result.Content, 40));
                crnProtocol.setyDistance(melsecMcNet.getByteTransform().TransInt16(result.Content, 44));
                crnProtocol.setxDuration(melsecMcNet.getByteTransform().TransInt16(result.Content, 48));
                crnProtocol.setyDuration(melsecMcNet.getByteTransform().TransInt16(result.Content, 52));

                OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), slave.getId()));


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

@@ -38,6 +38,11 @@
    private CrnProtocol crnProtocol;
    private boolean resetFlag = false;

    /**
     * 堆垛机是否在回原点运动中标记
     */
    private boolean backHpFlag = false;

    public SiemensCrnThread(CrnSlave slave) {
        this.slave = slave;
    }
@@ -174,6 +179,9 @@
                // 复位信号
                if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
                    if (resetFlag) {
                        if(crnProtocol.getTaskNo()==9999){
                            backHpFlag = false;
                        }
                        CrnCommand crnCommand = new CrnCommand();
                        crnCommand.setAckFinish((short)1);
                        if (write(crnCommand)) {

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

@@ -8,13 +8,9 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.google.common.base.Utf8;
import com.sun.xml.internal.bind.v2.runtime.output.Encoded;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.core.DevpThread;
import com.zy.core.Slave;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -25,7 +21,6 @@
import com.zy.core.model.protocol.StaProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

import java.text.MessageFormat;
import java.util.ArrayList;