Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-15 edd30bf5081f3e267a8d21c1e60ee102a1a1acec

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

@@ -39,4 +39,10 @@
        return wrkMasts.get(0);
    }

    @Override
    public int getStoreCount(Integer crnNo) {
        return selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo)
                .last(" and (wrk_sts in (1,2) or (wrk_sts=3 and wrk_no in (select wrk_no from asr_bas_devp)))"));
    }

}