|
@@ -50,11 +50,11 @@ public class StockWaitDetailsServiceImpl extends ServiceImpl<StockWaitDetailsMap
|
|
if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
|
|
if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
|
|
List<Long> pIds = productInfoService.listObject(ProductInfo::getId, q -> q
|
|
List<Long> pIds = productInfoService.listObject(ProductInfo::getId, q -> q
|
|
.like(ProductInfo::getCode, dto.getKeyword())
|
|
.like(ProductInfo::getCode, dto.getKeyword())
|
|
- .like(ProductInfo::getName, dto.getKeyword())
|
|
|
|
|
|
+ .or().like(ProductInfo::getName, dto.getKeyword())
|
|
);
|
|
);
|
|
wrapper.and(q -> q
|
|
wrapper.and(q -> q
|
|
.in("swd.product_id", pIds)
|
|
.in("swd.product_id", pIds)
|
|
- .like(StockWaitDetails::getQuantity, dto.getKeyword())
|
|
|
|
|
|
+ .or().like(StockWaitDetails::getQuantity, dto.getKeyword())
|
|
.or().like(StockWaitDetailsVo::getBusinessCode, dto.getKeyword())
|
|
.or().like(StockWaitDetailsVo::getBusinessCode, dto.getKeyword())
|
|
);
|
|
);
|
|
}
|
|
}
|