#

qlsxk

2025-09-26 32e151c9022eb8b00a76bfff8ac66bbccee9b6b9

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

@@ -175,6 +175,10 @@
            for (Integer row : locRowGroupDesc) {
                String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
                LocMast deepLoc = locMastService.selectById(deepLocNo);
                if (deepLoc == null) {
                    continue;
                }

                if (deepLoc.getLocSts().equals("F")) {
                    continue;
                } else if (deepLoc.getLocSts().equals("O")) {
@@ -208,6 +212,10 @@
                    for (Integer row : locRowGroupDesc) {
                        String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
                        LocMast deepLoc = locMastService.selectById(deepLocNo);
                        if (deepLoc == null) {
                            continue;
                        }

                        if (!deepLoc.getLocSts().equals("O")) {
                            flag = false;
                            break;
@@ -215,10 +223,16 @@
                    }

                    if (flag) {
                        Integer firstRow = locRowGroupDesc.get(0);
                        String deepLocNo = Utils.getLocNo(firstRow, Utils.getBay(locNo), Utils.getLev(locNo));
                        LocMast deepLoc = locMastService.selectById(deepLocNo);
                        targetLocMast = deepLoc;
                        for (Integer row : locRowGroupDesc) {
                            String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
                            LocMast deepLoc = locMastService.selectById(deepLocNo);
                            if (deepLoc == null) {
                                continue;
                            }

                            targetLocMast = deepLoc;
                            break;
                        }
                        break;
                    }
                }
@@ -245,6 +259,10 @@
            for (Integer row : locRowGroupDesc) {
                String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
                LocMast deepLoc = locMastService.selectById(deepLocNo);
                if (deepLoc == null) {
                    continue;
                }

                if (deepLoc.getLocSts().equals("F")) {
                    continue;
                } else if (deepLoc.getLocSts().equals("O")) {
@@ -278,6 +296,10 @@
                    for (Integer row : locRowGroupDesc) {
                        String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
                        LocMast deepLoc = locMastService.selectById(deepLocNo);
                        if (deepLoc == null) {
                            continue;
                        }

                        if (!deepLoc.getLocSts().equals("O")) {
                            flag = false;
                            break;
@@ -285,7 +307,16 @@
                    }

                    if (flag) {
                        targetLocMast = locMast;
                        for (Integer row : locRowGroupDesc) {
                            String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
                            LocMast deepLoc = locMastService.selectById(deepLocNo);
                            if (deepLoc == null) {
                                continue;
                            }

                            targetLocMast = deepLoc;
                            break;
                        }
                        break;
                    }
                }