Merge branch 'xgmwcs' of http://47.97.1.152:5880/r/zy-wcs into xgmwcs

18516761980

2022-03-10 f2962927f6b02ba1daebf27787b768f0da95c390

Merge branch 'xgmwcs' of http://47.97.1.152:5880/r/zy-wcs into xgmwcs

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

@@ -1367,6 +1367,15 @@
        for (Integer row : rows) {
            if (Utils.isDeepLoc(slaveProperties, row)) {
                loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());

                if (Utils.isDeepLoc(slaveProperties, loc.getLocNo())){
                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
                    LocMast shallowLoc1 = locMastService.selectById(shallowLocNo);
                    if(!shallowLoc1.getLocSts().equals("O")){
                        loc = null;
                    }
                }

                if (null != loc) { break; }
            }
        }