Merge branch 'phyzasrs-erp' into phyzasrs-erp-4

zhangc

2024-12-20 38806c4ea2b4ad403d0b95addcdd73a61f530999

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

@@ -25,7 +25,8 @@

    @Override
    public List<ManPakOut> selectByLocType(String locType) {
        return this.selectList(new EntityWrapper<ManPakOut>().like("loc_no",locType).eq("status",1));
        return this.selectList(new EntityWrapper<ManPakOut>().like("loc_no",locType+"-")
                .andNew().eq("status",0).or().eq("status",8));
    }

    @Override