|
@@ -442,6 +442,11 @@ public class WarehouseOutManagerImpl extends BaseServiceImpl<WarehouseOutMapper,
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ if (StrUtil.isNotBlank(keyWord)) {
|
|
|
+ wrapper.apply("UPPER(REPLACE(name, ' ', '')) LIKE CONCAT('%', UPPER(REPLACE({0}, ' ', '')), '%')", keyWord);
|
|
|
+ }
|
|
|
+
|
|
|
List<GoodsDO> list = goodsMapper.selectList(wrapper);
|
|
|
List<Long> goodsId = list.stream().map(GoodsDO::getId).collect(Collectors.toList());
|
|
|
if (CollUtil.isEmpty(list)) {
|
|
@@ -452,12 +457,12 @@ public class WarehouseOutManagerImpl extends BaseServiceImpl<WarehouseOutMapper,
|
|
|
.eq(ObjectUtil.isNotNull(warehouseId), ProductStockDO::getWarehouseId, warehouseId)
|
|
|
.in(CollUtil.isNotEmpty(warehouseIds), ProductStockDO::getWarehouseId, warehouseIds)
|
|
|
.in(ProductStockDO::getGoodsId, goodsId)
|
|
|
- .and(StrUtil.isNotBlank(keyWord), wa -> wa
|
|
|
- .like(ProductStockDO::getGoodsName, keyWord)
|
|
|
- .or()
|
|
|
- .like(ProductStockDO::getGoodsBarCode, keyWord)
|
|
|
- .or()
|
|
|
- .like(ProductStockDO::getGoodsSnCode, keyWord))
|
|
|
+// .or(StrUtil.isNotBlank(keyWord), wa -> wa
|
|
|
+//// .like(ProductStockDO::getGoodsName, keyWord)
|
|
|
+//// .or()
|
|
|
+// .like(ProductStockDO::getGoodsBarCode, keyWord)
|
|
|
+// .or()
|
|
|
+// .like(ProductStockDO::getGoodsSnCode, keyWord))
|
|
|
.gt(ProductStockDO::getUsableStock, 0));
|
|
|
Page<ProductStockVO> convert = productStockConverter.convert(page1);
|
|
|
for (ProductStockVO record : convert.getRecords()) {
|