#

tqs

2023-04-14 96fc6c344e23e0180881b87aa2291a2fc19e4ab8

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

@@ -380,14 +380,17 @@
                            success = false; break;
                        }
                    }
                    // 深库位
                    // 深库位判断
                    List<String> insideLocList = Utils.getGroupInsideLoc(loc.getLocNo());
                    for (String insideLocNo : insideLocList) {
                        LocMast insideLoc = locMastService.selectById(insideLocNo);
                        if (Cools.isEmpty(insideLoc)) {
                            continue;
                        }
                        if (insideLoc.getLocSts().equals("R") || insideLoc.getLocSts().equals("P")) {
                        if (insideLoc.getLocSts().equals("R")
                                || insideLoc.getLocSts().equals("P")
                                || insideLoc.getLocSts().equals("Q")
                                || insideLoc.getLocSts().equals("S")) {
                            success = false; break;
                        }
                    }
@@ -430,7 +433,10 @@
                        if (Cools.isEmpty(insideLoc)) {
                            continue;
                        }
                        if (insideLoc.getLocSts().equals("R") || insideLoc.getLocSts().equals("P")) {
                        if (insideLoc.getLocSts().equals("R")
                                || insideLoc.getLocSts().equals("P")
                                || insideLoc.getLocSts().equals("Q")
                                || insideLoc.getLocSts().equals("S")) {
                            success = false; break;
                        }
                    }
@@ -447,6 +453,23 @@
            }
        }

        //2023-4-13 ADD， 找到的库位、以及其浅库位，如果在工作档有移库任务，则跳过
        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                .eq("io_type", 11));
        for (WrkMast wrkMast : wrkMasts){
            if (wrkMast.getSourceLocNo().equals(locMast.getLocNo())){
                locMast = null;
                break;
            }
            List<String> outerLocList = Utils.getGroupOuterLoc(locMast.getLocNo());
            for (String outerLocNo : outerLocList) {
                if (locMast.getLocNo().equals(outerLocNo)){
                    locMast = null;
                    break;
                }
            }
        }

        // 3.库位当前所属尺寸无空库位时，调整尺寸参数，向上兼容检索库位
        if (Cools.isEmpty(locMast)) {
            // 当前巷道无空库位时，递归调整至下一巷道，检索全部巷道无果后，跳出递归