#

Junjie

8 小时以前 0f8a49f29b270d4f6b756ecd8c0ed5a22c711181

#

 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;
                }
            }
        }