修改

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -147,7 +147,7 @@ public class GoodsDescController extends BladeController {
 				if(CollectionUtils.isNotEmpty(types))
 				{
 					List<String> typeStr = types.stream().map(GoodsType::getCname).collect(Collectors.toList());
-					e.setGoodsTypeName(typeStr.toString());
+					e.setGoodsTypeName(typeStr.toString().replace("[","").replace("]",""));
 				}
 			});
 		}
@@ -386,9 +386,10 @@ public class GoodsDescController extends BladeController {
 				stockGoods.setGoodsId(e.getId());
 				stockGoods.setTradeType("GN");
 				stockGoods.setItemType(e.getTypeno());
-				R<?> stock = stockGoodsClient.getStock(stockGoods);
-				if (stock.isSuccess()){
-					goodsOutExcel.setStorageQuantity((BigDecimal) stock.getData());
+				stockGoods.setTenantId(SecureUtil.getTenantId());
+				List<StockGoods> stockGoodsList = stockGoodsClient.postListStockByCondition(stockGoods);
+				if (CollectionUtils.isNotEmpty(stockGoodsList)){
+					goodsOutExcel.setStorageQuantity(stockGoodsList.stream().filter(ei->ei.getSurplusRouteQuantity()!=null).map(StockGoods::getSurplusRouteQuantity).reduce(BigDecimal.ZERO,BigDecimal::add));
 				}else {
 					goodsOutExcel.setStorageQuantity(BigDecimal.ZERO);
 				}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -636,7 +636,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				StockGoods stockGoods=new StockGoods();
 				stockGoods.setCorpId(e.getCorpId());
 				stockGoods.setGoodsId(e.getItemId());
-				stockGoods.setTenantId(AuthUtil.getTenantId());
+				stockGoods.setTenantId(SecureUtil.getTenantId());
 				List<StockGoods> listStockGoods= stockGoodsClient.postListStockByCondition(stockGoods);
 				if(listStockGoods.size()>1||CollectionUtils.isEmpty(listStockGoods))
 				{

blade-service/blade-stock/src/main/java/org/springblade/stock/feign/StockGoodsClient.java

@@ -141,11 +141,13 @@ public class StockGoodsClient implements IStockGoodsClient{
 			.eq(stockGoods.getStorageId()!=null,StockGoods::getStorageId,stockGoods.getStorageId())
 			.eq(stockGoods.getCorpId()!=null,StockGoods::getCorpId,stockGoods.getCorpId())
 			.eq(stockGoods.getGoodsId()!=null,StockGoods::getGoodsId,stockGoods.getGoodsId())
+			.eq(StringUtils.isNotBlank(stockGoods.getTradeType()),StockGoods::getTradeType,stockGoods.getTradeType())
+			.eq(StringUtils.isNotBlank(stockGoods.getItemType()),StockGoods::getItemType,stockGoods.getItemType())
 			.eq(StringUtils.isNotBlank(stockGoods.getContractNumber()),StockGoods::getContractNumber,stockGoods.getContractNumber())
 			.eq(StringUtils.isNotBlank(stockGoods.getBillNo()),StockGoods::getBillNo,stockGoods.getBillNo())
 			.eq(StringUtils.isNotBlank(stockGoods.getCntrNo()),StockGoods::getCntrNo,stockGoods.getCntrNo())
 			.eq(StockGoods::getIsDeleted,0)
-			.eq(StockGoods::getTenantId,AuthUtil.getTenantId());
+			.eq(StockGoods::getTenantId,SecureUtil.getTenantId());
 		List<StockGoods> goodsList = stockGoodsService.list(stockGoodsLambdaQueryWrapper);
 		if(CollectionUtils.isNotEmpty(goodsList))
 		{
@@ -180,11 +182,13 @@ public class StockGoodsClient implements IStockGoodsClient{
 			.eq(stockGoods.getStorageId()!=null,StockGoods::getStorageId,stockGoods.getStorageId())
 			.eq(stockGoods.getCorpId()!=null,StockGoods::getCorpId,stockGoods.getCorpId())
 			.eq(stockGoods.getGoodsId()!=null,StockGoods::getGoodsId,stockGoods.getGoodsId())
+			.eq(StringUtils.isNotBlank(stockGoods.getTradeType()),StockGoods::getTradeType,stockGoods.getTradeType())
+			.eq(StringUtils.isNotBlank(stockGoods.getItemType()),StockGoods::getItemType,stockGoods.getItemType())
 			.eq(StringUtils.isNotBlank(stockGoods.getContractNumber()),StockGoods::getContractNumber,stockGoods.getContractNumber())
 			.eq(StringUtils.isNotBlank(stockGoods.getBillNo()),StockGoods::getBillNo,stockGoods.getBillNo())
 			.eq(StringUtils.isNotBlank(stockGoods.getCntrNo()),StockGoods::getCntrNo,stockGoods.getCntrNo())
 			.eq(StockGoods::getIsDeleted,0)
-			.eq(StockGoods::getTenantId,AuthUtil.getTenantId());
+			.eq(StockGoods::getTenantId,stockGoods.getTenantId());
 		List<StockGoods> goodsList = stockGoodsService.list(stockGoodsLambdaQueryWrapper);
 		if(CollectionUtils.isNotEmpty(goodsList))
 		{