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

pjb

2024-12-31 c4e8e814d2c9e0d03f6449860b70e58657fd7dc2

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

@@ -17,12 +17,12 @@


    @Override
    public List<PakOutDTO> selectPakOut(String docnum, Date stime, Date etime, Integer curr, Integer limit, Long userId) {
        return this.baseMapper.selectPakOut(docnum,stime,etime,curr,limit,userId);
    public List<PakOutDTO> selectPakOut(String docnum, Date stime, Date etime, Integer curr, Integer limit, Long userId,String custName) {
        return this.baseMapper.selectPakOut(docnum,stime,etime,curr,limit,userId,custName);
    }

    @Override
    public int selectPakOutCount(String docnum, Date stime, Date etime,Integer curr, Integer limit, Long userId) {
        return this.baseMapper.selectPakOutCount(docnum,stime, etime,curr,limit,userId);
    public int selectPakOutCount(String docnum, Date stime, Date etime,Integer curr, Integer limit, Long userId,String custName) {
        return this.baseMapper.selectPakOutCount(docnum,stime, etime,curr,limit,userId,custName);
    }
}