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

whycq

2023-08-28 d3f11759e6b32d7e9e63e0f7b0cc4b6874aea020

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

@@ -18,7 +18,7 @@

    @Override
    public int getWorkingMast(Integer devpNo) {
        return selectCount(new EntityWrapper<WrkMast>().eq("source_sta_no", devpNo).in("wrk_sts", 1, 6));
        return selectCount(new EntityWrapper<WrkMast>().eq("source_sta_no", devpNo).in("wrk_sts", 1, 2));
    }

    @Override
@@ -116,4 +116,8 @@
        return this.baseMapper.selectPakoutOfStaNo(staNo);
    }

    @Override
    public List<WrkMast> selectSameWrkMast(String matnr) {
        return this.baseMapper.selectSameWrkMast(matnr);
    }
}