1.库存列表查询接口增加参数判断

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/stock/controller/StockDescController.java

@@ -179,22 +179,25 @@ public class StockDescController extends BladeController {
 					if (!pjProductLaunchList.isEmpty()) {
 						List<Long> goodIds = pjProductLaunchList.stream().map(PjProductLaunch::getGoodsId).collect(Collectors.toList());
 						if ("0".equals(stockDesc.getIfGrounding())) {
-//							lambdaQueryWrapper.notIn(PjStockDesc::getGoodsId, goodIds);
 							lambdaQueryWrapper.like(PjStockDesc::getCname, stockDesc.getCname())
 								.notIn(PjStockDesc::getGoodsId, goodIds);
 						} else {
-//							lambdaQueryWrapper.in(PjStockDesc::getGoodsId, goodIds);
 							lambdaQueryWrapper.and(i -> i.like(PjStockDesc::getCname, stockDesc.getCname())
 								.or().in(PjStockDesc::getGoodsId, goodIds));
 						}
-//						lambdaQueryWrapper.like(PjStockDesc::getCname, stockDesc.getCname());
+					}else{
+						lambdaQueryWrapper.and(i -> i.like(PjStockDesc::getCname, stockDesc.getCname())
+							.or().like(PjStockDesc::getCnameInt, stockDesc.getCname())
+						);
 					}
 				} else {
 					lambdaQueryWrapper.and(i -> i.like(PjStockDesc::getCname, stockDesc.getCname())
 						.or().in(PjStockDesc::getGoodsId, ids));
 				}
 			} else {
-				return R.data(new Page<>());
+				lambdaQueryWrapper.and(i -> i.like(PjStockDesc::getCname, stockDesc.getCname())
+					.or().like(PjStockDesc::getCnameInt, stockDesc.getCname())
+				);
 			}
 		} else {
 			pjProductLaunchList = productLaunchService.list(new LambdaQueryWrapper<PjProductLaunch>()