Merge branch 'refs/heads/rcs_master' into jdxaj

zhang

18 小时以前 70930071a49190f414c8d8bc9c9e9795a4096739

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

@@ -28,7 +28,7 @@
     * 阻塞任务 不管
     * 避让任务 未 完成
     */
    List<Jam> getUnfinishedAvoSegByAvo(String avoAgvNo, Segment currSeg);
    List<Jam> getUnfinishedAvoSegByAvo(Long avoAgvId, Segment currSeg);

    List<Jam> queryByAvoid(Long avoAgv, JamStateType jamState);