#

Junjie

2023-09-01 fa305af5d4ebfba47301fec3097296c14e32e1df

#

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

@@ -410,6 +410,20 @@
            }
        }

        //剔除当前随机堆垛机元素尝试重新查找
        if (locMast == null) {
            ArrayList<Integer> crns = new ArrayList<>();
            for (int crnNo : crnNos) {
                if (randomCrnNo == crnNo) {
                    continue;
                }
                crns.add(crnNo);
            }
            if (!crns.isEmpty()) {
                return getLocNoStep3(locTypeDto, crns);
            }
        }

        return locMast;
    }

@@ -464,6 +478,20 @@
            }
        }

        //剔除当前随机堆垛机元素尝试重新查找
        if (locMast == null) {
            ArrayList<Integer> crns = new ArrayList<>();
            for (int crnNo : crnNos) {
                if (randomCrnNo == crnNo) {
                    continue;
                }
                crns.add(crnNo);
            }
            if (!crns.isEmpty()) {
                return getLocNoStep4(locTypeDto, crns);
            }
        }

        return locMast;
    }