Merge remote-tracking branch 'origin/nbjfwcs' into nbjfwcs

whycq

2023-03-15 f0d2defd354a3d6fbaf77338f0c42fe133f019fd

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

@@ -44,4 +44,17 @@
        return this.baseMapper.queryDemoLoc(crn);
    }

    @Override
    public LocMast queryDemoLoc0(Integer crn, short locType1) {
        return this.baseMapper.queryDemoLoc0(crn,locType1);
    }

    @Override
    public Boolean checkEmptyCount(LocMast locMast) {
        if (locMast == null) {
            return false;
        }
        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
    }

}