|
|
@@ -200,7 +200,9 @@ public class StockDescController extends BladeController {
|
|
|
}
|
|
|
}
|
|
|
lambdaQueryWrapper.orderByDesc(PjStockDesc::getBalanceQuantity);
|
|
|
- IPage<PjStockDesc> pages = stockDescService.page(Condition.getPage(query), lambdaQueryWrapper);
|
|
|
+ IPage<PjStockDesc> iPage = Condition.getPage(query);
|
|
|
+ iPage.setSize(-1L);
|
|
|
+ IPage<PjStockDesc> pages = stockDescService.page(iPage, lambdaQueryWrapper);
|
|
|
if (!pages.getRecords().isEmpty()) {
|
|
|
|
|
|
List<PjGoodsFiles> goodsFilesList = new ArrayList<>();
|
|
|
@@ -519,6 +521,7 @@ public class StockDescController extends BladeController {
|
|
|
lambdaQueryWrapper.eq(ObjectUtils.isNotNull(ParameterUtils.getStorageId()), PjStockDesc::getStorageId, ParameterUtils.getStorageId());
|
|
|
}else{
|
|
|
lambdaQueryWrapper.eq(ObjectUtil.isNotEmpty(stockDesc.getStorageId()), PjStockDesc::getStorageId, stockDesc.getStorageId());
|
|
|
+ lambdaQueryWrapper.eq(ObjectUtil.isNotEmpty(stockDesc.getStorageName()), PjStockDesc::getStorageName, stockDesc.getStorageName());
|
|
|
}
|
|
|
List<PjProductLaunch> pjProductLaunchList = new ArrayList<>();
|
|
|
if (ObjectUtil.isNotEmpty(stockDesc.getCname())) {
|