1

zhang

2025-09-26 f513af7c0a8c334ca73c540afd443c821bbc6a54

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

@@ -2661,13 +2661,14 @@
            LocMast loc = null;
            for (Integer row : rows) {
                if (Utils.isDeepLoc(slaveProperties, row)) {
                    if (shallowLoc.getRow1() == 1 && row == 1) {
                        loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1());
                    } else if (shallowLoc.getRow1() == 29 && row == 29) {
                        loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1());
                    if (shallowLoc.getBay1() == 1) {
                        loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 1);
                    } else if (shallowLoc.getRow1() == 29) {
                        loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 29);
                    } else {
                        loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
                    }


                    if (loc != null) {
                        if (Utils.isDeepLoc(slaveProperties, loc.getLocNo())) {
@@ -2686,10 +2687,10 @@
            if (null == loc) {
                for (Integer row : rows) {
                    if (Utils.isShallowLoc(slaveProperties, row)) {
                        if (shallowLoc.getRow1() == 1 && row == 1) {
                            loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1());
                        } else if (shallowLoc.getRow1() == 29 && row == 29) {
                            loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1());
                        if (shallowLoc.getBay1() == 1) {
                            loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 1);
                        } else if (shallowLoc.getRow1() == 29) {
                            loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 29);
                        } else {
                            loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
                        }