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

whycq

2024-09-10 bfeba8a69c0234a88eb71a1d2a7bf4b2aa0cd67a

 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()) > 1;
        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 0;
    }

    @Override
@@ -48,4 +48,8 @@
        return null;
    }

    @Override
    public List<LocMast> queryShallowLocFMast(Integer crnNo) {
        return this.baseMapper.queryShallowLocFMast(crnNo);
    }
}