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

zjj

2024-06-19 c14104f7371b3f52ccb1db0cc316a703a0e8cf4d

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

@@ -29,6 +29,11 @@

    @Override
    public int getOutToStn182(Integer devpNo) {
        return selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devpNo).eq("wrk_sts",12));
        return selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devpNo).in("wrk_sts",11,12));
    }

    @Override
    public WrkMast selectByWrkNo(int wrkNo) {
        return this.baseMapper.selectByWrkNo(wrkNo);
    }
}