diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 6e65fb85..dbfed26e 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -180,21 +180,11 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { */ @Override public List queryList(WmsMaterialCoilBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(WmsMaterialCoilBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getEnterCoilNo()), WmsMaterialCoil::getEnterCoilNo, bo.getEnterCoilNo()); - lqw.like(StringUtils.isNotBlank(bo.getCurrentCoilNo()), WmsMaterialCoil::getCurrentCoilNo, bo.getCurrentCoilNo()); - lqw.like(StringUtils.isNotBlank(bo.getSupplierCoilNo()), WmsMaterialCoil::getSupplierCoilNo, bo.getSupplierCoilNo()); - lqw.eq(bo.getDataType() != null, WmsMaterialCoil::getDataType, bo.getDataType()); - lqw.eq(bo.getWarehouseId() != null, WmsMaterialCoil::getWarehouseId, bo.getWarehouseId()); - lqw.eq(bo.getHasMergeSplit() != null, WmsMaterialCoil::getHasMergeSplit, bo.getHasMergeSplit()); - lqw.eq(bo.getStatus() != null, WmsMaterialCoil::getStatus, bo.getStatus()); - lqw.eq(StringUtils.isNotBlank(bo.getItemType()), WmsMaterialCoil::getItemType, bo.getItemType()); - return lqw; + QueryWrapper lqw = buildQueryWrapperPlus(bo); + Page build = new PageQuery().build(); + build.setSize(Long.MAX_VALUE); + Page wmsMaterialCoilVoPage = baseMapper.selectVoPagePlus(build, lqw); + return wmsMaterialCoilVoPage.getRecords(); } /**