#1

czkh

10 小时以前 93d09c258adfed3ccef1f332ec4297e898306858

#1

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

@@ -40,7 +40,7 @@
        if (locMast == null) {
            return false;
        }
        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 5;
        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 7;
    }

    /*

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

@@ -569,6 +569,7 @@
            wrkMast.setExitMk("N"); // 退出
            wrkMast.setEmptyMk("Y"); // 空板
            wrkMast.setLinkMis("N");
            wrkMast.setBarcode(locMast.getBarcode());//托盘条码
            wrkMast.setAppeUser(userId);
            wrkMast.setAppeTime(now);
            wrkMast.setModiUser(userId);

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

@@ -664,6 +664,9 @@
//                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
//                    continue;
//                }
                if (Utils.isDeepLoc(slaveProperties,locMast1.getLocNo())){
                    continue;
                }
                String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
                LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
                if (Cools.isEmpty(locMast2)){