#

LSH

2024-01-08 66d09542f6aeb589c526acb9a9625261cf9327f7

#

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

@@ -2491,7 +2491,7 @@
                // 只有当RGV空闲、自动,工位一无物//rgv可用
                if (rgvProtocol.getStatusType() == RgvStatusType.IDLE
                        && rgvProtocol.getModeType() == RgvModeType.AUTO
                        && rgvProtocol.getLoaded1()==0  //现场修改：叠盘机，不满都算无物，怎么判断需要跟电控对接
//                        && rgvProtocol.getLoaded1()==0  //现场修改：叠盘机，不满都算无物，怎么判断需要跟电控对接
                        && rgvProtocol.getTaskNo1()==0
                        && rgvProtocol.getTaskNo2()==0
                ) {

 src/main/java/com/zy/asrs/utils/RouteUtils.java

@@ -12,6 +12,7 @@
 */
public class RouteUtils {

    //问题2  周俊杰
    public static final List<Integer> MERGE_STA_NO_One = new ArrayList<Integer>() {{
//        add(116);add(117);
    }};

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

@@ -191,9 +191,9 @@
                rgvProtocol.setLoaded1(siemensNet.getByteTransform().TransInt16(result.Content, 8));
                rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
                rgvProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
                rgvProtocol.setTaskNo2(siemensNet.getByteTransform().TransInt16(result.Content, 14));
                rgvProtocol.setStatus2(siemensNet.getByteTransform().TransInt16(result.Content, 16));
                rgvProtocol.setLoaded2(siemensNet.getByteTransform().TransInt16(result.Content, 18));
//                rgvProtocol.setTaskNo2(siemensNet.getByteTransform().TransInt16(result.Content, 14));
//                rgvProtocol.setStatus2(siemensNet.getByteTransform().TransInt16(result.Content, 16));
//                rgvProtocol.setLoaded2(siemensNet.getByteTransform().TransInt16(result.Content, 18));
                rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 20));
                rgvProtocol.setHeart(siemensNet.getByteTransform().TransInt16(result.Content, 22));
                rgvProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 24));