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

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

@@ -121,42 +121,52 @@ public class StockDescController extends BladeController {
 		}
 		lambdaQueryWrapper.eq(ObjectUtil.isNotEmpty(stockDesc.getStorageId()), PjStockDesc::getStorageId, stockDesc.getStorageId());
 		lambdaQueryWrapper.eq(ObjectUtil.isNotEmpty(stockDesc.getStorageName()), PjStockDesc::getStorageName, stockDesc.getStorageName());
+		String inventoryInquiry = iSysClient.getParamServiceDWT("Inventory.Inquiry", AuthUtil.getTenantId());
 		List<PjProductLaunch> pjProductLaunchList = new ArrayList<>();
 		if (ObjectUtil.isNotEmpty(stockDesc.getCname())) {
 			List<PjGoodsDesc> pjGoodsDescs = new ArrayList<>();
-			if (stockDesc.getCname().contains(",")) {
-				String brandName = stockDesc.getCname().substring(0, stockDesc.getCname().indexOf(","));
-				String cname = stockDesc.getCname().substring(stockDesc.getCname().indexOf(",") + 1);
-				pjGoodsDescs = goodsDescService.list(new LambdaQueryWrapper<PjGoodsDesc>()
-					.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
-					.eq(PjGoodsDesc::getIsDeleted, 0)
-					.like(PjGoodsDesc::getBrandName, brandName)
-					.and(i -> i.like(PjGoodsDesc::getCname, cname)
-						.or().like(PjGoodsDesc::getCnameInt, cname))
-					.or().like(PjGoodsDesc::getCname, stockDesc.getCname())
-					.or().like(PjGoodsDesc::getCnameInt, stockDesc.getCname())
-				);
-				lambdaQueryWrapper.like(PjStockDesc::getBrandName, brandName);
-			} else {
-				String[] chineseWords = stockDesc.getCname().split("[^一-龥]");
-				if (chineseWords.length > 0) {
-					String cname = stockDesc.getCname().substring(chineseWords[0].length());
+			if ("1".equals(inventoryInquiry)) {
+				if (stockDesc.getCname().contains(",")) {
+					String brandName = stockDesc.getCname().substring(0, stockDesc.getCname().indexOf(","));
+					String cname = stockDesc.getCname().substring(stockDesc.getCname().indexOf(",") + 1);
 					pjGoodsDescs = goodsDescService.list(new LambdaQueryWrapper<PjGoodsDesc>()
 						.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
 						.eq(PjGoodsDesc::getIsDeleted, 0)
-						.like(PjGoodsDesc::getBrandName, chineseWords[0])
+						.like(PjGoodsDesc::getBrandName, brandName)
 						.and(i -> i.like(PjGoodsDesc::getCname, cname)
-							.or().like(PjGoodsDesc::getCnameInt, cname)
-							.or().like(PjGoodsDesc::getCname, stockDesc.getCname())
-							.or().like(PjGoodsDesc::getCnameInt, stockDesc.getCname())
-						));
-//					lambdaQueryWrapper.like(PjStockDesc::getBrandName, chineseWords[0]);
+							.or().like(PjGoodsDesc::getCnameInt, cname))
+						.or().like(PjGoodsDesc::getCname, stockDesc.getCname())
+						.or().like(PjGoodsDesc::getCnameInt, stockDesc.getCname())
+					);
+					lambdaQueryWrapper.like(PjStockDesc::getBrandName, brandName);
 				} else {
-					pjGoodsDescs = goodsDescService.list(new LambdaQueryWrapper<PjGoodsDesc>()
-						.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
-						.eq(PjGoodsDesc::getIsDeleted, 0)
-						.and(i -> i.like(PjGoodsDesc::getCname, stockDesc.getCname()).or().like(PjGoodsDesc::getCnameInt, stockDesc.getCname())));
+					String[] chineseWords = stockDesc.getCname().split("[^一-龥]");
+					if (chineseWords.length > 0) {
+						String cname = stockDesc.getCname().substring(chineseWords[0].length());
+						pjGoodsDescs = goodsDescService.list(new LambdaQueryWrapper<PjGoodsDesc>()
+							.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
+							.eq(PjGoodsDesc::getIsDeleted, 0)
+							.like(PjGoodsDesc::getBrandName, chineseWords[0])
+							.and(i -> i.like(PjGoodsDesc::getCname, cname)
+								.or().like(PjGoodsDesc::getCnameInt, cname)
+								.or().like(PjGoodsDesc::getCname, stockDesc.getCname())
+								.or().like(PjGoodsDesc::getCnameInt, stockDesc.getCname())
+							));
+//					lambdaQueryWrapper.like(PjStockDesc::getBrandName, chineseWords[0]);
+					} else {
+						pjGoodsDescs = goodsDescService.list(new LambdaQueryWrapper<PjGoodsDesc>()
+							.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
+							.eq(PjGoodsDesc::getIsDeleted, 0)
+							.and(i -> i.like(PjGoodsDesc::getCname, stockDesc.getCname()).or().like(PjGoodsDesc::getCnameInt, stockDesc.getCname())));
+					}
 				}
+			} else {
+				pjGoodsDescs = goodsDescService.list(new LambdaQueryWrapper<PjGoodsDesc>()
+					.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
+					.eq(PjGoodsDesc::getIsDeleted, 0)
+					.and(i -> i.like(PjGoodsDesc::getCname, stockDesc.getCname())
+						.or().like(PjGoodsDesc::getCnameInt, stockDesc.getCname())
+					));
 			}
 			if (!pjGoodsDescs.isEmpty()) {
 				List<Long> ids = pjGoodsDescs.stream().map(PjGoodsDesc::getId).collect(Collectors.toList());
@@ -184,7 +194,7 @@ public class StockDescController extends BladeController {
 						.or().in(PjStockDesc::getGoodsId, ids));
 				}
 			} else {
-				lambdaQueryWrapper.like(PjStockDesc::getCname, stockDesc.getCname());
+				return R.data(new Page<>());
 			}
 		} else {
 			pjProductLaunchList = productLaunchService.list(new LambdaQueryWrapper<PjProductLaunch>()