#

whycq

2024-07-05 3e91bc283088a25b878f942c62847771f23e4f6f

#

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

@@ -148,7 +148,7 @@
                if (row == 1) {
                    shallowLocNo = locNo;
                } else {
                    shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
                    shallowLocNo = zerofill(String.valueOf(2), 2) + locNo.substring(2);
                }
                // 检测目标库位是否为空库位
                LocMast shallowLoc = locMastService.selectById(shallowLocNo);
@@ -169,32 +169,15 @@
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
            if (locMasts.size() > 0) {
                for (LocMast loc : locMasts) {
                    //if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
                    //    continue;
                    //}

                    int row = Integer.parseInt(loc.getLocNo().substring(0, 2));
                    //如果为浅库位则判断深库位是否使用


                    String shallowLocNo = "";
                    if (row == 1) {
                        shallowLocNo = loc.getLocNo();
                    } else if (row == 2){
                        LocMast deepLoc = locMastService.selectById(zerofill(String.valueOf(3), 2) + locMast.getLocNo().substring(2));
                        if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
                    if (row == 1 || row == 2) continue;
                    LocMast trgerLoc = locMastService.selectById(zerofill(String.valueOf(2), 2) + loc.getLocNo().substring(2));
                    if (!trgerLoc.getLocSts().equals("O")) {
                            continue;
                        }
                        shallowLocNo = loc.getLocNo();
                    } else {
                        LocMast deepLoc = locMastService.selectById(zerofill(String.valueOf(2), 2) + locMast.getLocNo().substring(2));
                        if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
                            continue;
                        }
                        shallowLocNo = loc.getLocNo();
                    }


                    shallowLocNo = trgerLoc.getLocNo();

                    // 检测目标库位是否为空库位
                    LocMast shallowLoc = locMastService.selectById(shallowLocNo);