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

lsh

2022-10-08 f19dd00c0a302f2e2a13e793e6df407ab1f9820b

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

@@ -13,6 +13,11 @@
public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {

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

    @Override
    public LocMast queryFreeLocMast(Integer row, Short locType1) {
        return this.baseMapper.queryFreeLocMast(row, locType1);
    }
@@ -39,4 +44,12 @@
        return this.baseMapper.queryDemoLoc(crn);
    }

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

}