#

Junjie

16 小时以前 c1f7adc8ff0f533c161c4a374d64282b250e72b8

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

@@ -154,16 +154,24 @@

        boolean send = false;
        if (station == 1) {
            if (crnProtocol.getStatus().equals(DualCrnStatusType.FETCH_COMPLETE.id)
                    || crnProtocol.getStatus().equals(DualCrnStatusType.IDLE.id)
            ) {
                send = true;
            if (dualCommand.getTaskMode().intValue() == DualCrnTaskModeType.PICK.id) {
                if (crnProtocol.getStatus().equals(DualCrnStatusType.IDLE.id)) {
                    send = true;
                }
            } else if (dualCommand.getTaskMode().intValue() == DualCrnTaskModeType.PUT.id) {
                if (crnProtocol.getStatus().equals(DualCrnStatusType.FETCH_COMPLETE.id)) {
                    send = true;
                }
            }
        }else {
            if (crnProtocol.getStatusTwo().equals(DualCrnStatusType.FETCH_COMPLETE.id)
                    || crnProtocol.getStatusTwo().equals(DualCrnStatusType.IDLE.id)
            ) {
                send = true;
            if (dualCommand.getTaskMode().intValue() == DualCrnTaskModeType.PICK.id) {
                if (crnProtocol.getStatusTwo().equals(DualCrnStatusType.IDLE.id)) {
                    send = true;
                }
            } else if (dualCommand.getTaskMode().intValue() == DualCrnTaskModeType.PUT.id) {
                if (crnProtocol.getStatusTwo().equals(DualCrnStatusType.FETCH_COMPLETE.id)) {
                    send = true;
                }
            }
        }

@@ -308,6 +316,7 @@
        crnProtocol.setForkPos(crnStatus.getForkPos());
        crnProtocol.setLoaded(crnStatus.getLoaded());
        crnProtocol.setTaskReceive(crnStatus.getTaskReceive());
        crnProtocol.setTaskSend(crnStatus.getTaskSend());

        //工位2
        crnProtocol.setTaskNoTwo(crnStatus.getTaskNoTwo());
@@ -315,6 +324,7 @@
        crnProtocol.setForkPosTwo(crnStatus.getForkPosTwo());
        crnProtocol.setLoadedTwo(crnStatus.getLoadedTwo());
        crnProtocol.setTaskReceiveTwo(crnStatus.getTaskReceiveTwo());
        crnProtocol.setTaskSendTwo(crnStatus.getTaskSendTwo());

        crnProtocol.setBay(crnStatus.getBay());
        crnProtocol.setLevel(crnStatus.getLevel());