#

Junjie

9 天以前 eca10caf69de695c0ab3f3cf9c04103118f5c8d4

#

 src/main/java/com/zy/common/service/CommonService.java

@@ -231,7 +231,7 @@
                //尝试找1号弯轨堆垛机库位
                crnNo = 1;
                if (basCrnpService.checkSiteError(crnNo, true)) {
                    List<Integer> nearRowList = new ArrayList<Integer>(){{add(3);add(4);add(1);add(6);}};
                    List<Integer> nearRowList = new ArrayList<Integer>(){{add(4);add(6);add(3);add(1);}};
                    for (Integer near : nearRowList) {
                        List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                                .eq("row1", near)
@@ -298,7 +298,7 @@
                                .eq("crn_no", locMast1.getCrnNo())
                                .eq("bay1", locMast1.getBay1())
                                .notIn("loc_sts", "O")
                                .orderBy("row1", true)
                                .orderBy("row1", false)
                        );
                        if (locMastList.isEmpty()) {
                            locMast = locMast1;