Merge branch 'refs/heads/rcs_master' into ctu_conveyor

zhang

2 天以前 af5081bc0d0668d526a204076557a171097ddb8d

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java

@@ -26,6 +26,12 @@

    Boolean cancel(Long segmentId, Long userId);

    Segment getCurrRunningSeg(Long agvId, String qrCode);
    Segment getCurrWaitingSeg(Long travelId, Long agvId);

    Segment getCurrRunningSeg(Long travelId, Long agvId, Long codeId);

    List<Integer> selectUsedBackpacks(Long travelId, Long agvId);

    Boolean isRollerWaiting(Long agvId);

}