*

lsh

昨天 794ed17c6f37a6deacb6ef37349dceb03eae3395

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

@@ -263,6 +263,8 @@
    //获取小车取放任务列表失败
    public synchronized List<List<List<WrkMast>>> getWrkMastListAll(List<List<Integer>> siteListAll ,BasDevpPosition[] basDevpPositionsListUN) {
        List<List<List<WrkMast>>> wrkMastListAll = new ArrayList<>();
        List<Integer> sourceStaNoList = new ArrayList<>();

        for (List<Integer> siteList : siteListAll){
            List<List<WrkMast>> wrkMastLists = new ArrayList<>();
            try {
@@ -273,9 +275,19 @@
                    for (WrkMast wrkMast : wrkMastList) {
                        if (!Cools.isEmpty(wrkMast)) {
                            if (siteList.contains(wrkMast.getSourceStaNo())){
                                if (!sourceStaNoList.contains(wrkMast.getSourceStaNo())){
                                    List<WrkMast> wrkMastListS = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("source_sta_no", wrkMast.getSourceStaNo()).eq("wrk_sts", 1L).orderBy("modi_time", true));
                                    if (wrkMastListS.isEmpty()){
                                        continue;
                                    }
                                } else {
                                    continue;
                                }
                                if (SortTheExecutionOfTheCarUtil.devpNoSortbj(basDevpPositionsListUN, wrkMast.getSourceStaNo(), wrkMast.getStaNo())) {
                                    sourceStaNoList.add(wrkMast.getSourceStaNo());
                                    wrkMastlistA.add(wrkMast);
                                } else {
                                    sourceStaNoList.add(wrkMast.getSourceStaNo());
                                    wrkMastlistB.add(wrkMast);
                                }
                            }