From 6bf45be8d0eb31df142d5e5048bde025964351c5 Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Fri, 11 Oct 2024 20:25:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A7=A3=E5=86=B3=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=85=88=E4=B8=8A=E6=9E=B6=E5=9C=A8=E4=B8=8B=E6=9E=B6=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=95=86=E5=93=81=E6=97=A0=E6=B3=95=E7=9C=9F=E6=AD=A3?=
 =?UTF-8?q?=E4=B8=8B=E6=9E=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shopmaterial/service/impl/ShopMaterialServiceImpl.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/skyeye-erp/erp-pro/src/main/java/com/skyeye/shopmaterial/service/impl/ShopMaterialServiceImpl.java b/skyeye-erp/erp-pro/src/main/java/com/skyeye/shopmaterial/service/impl/ShopMaterialServiceImpl.java
index 6bfcc734..8d86991e 100644
--- a/skyeye-erp/erp-pro/src/main/java/com/skyeye/shopmaterial/service/impl/ShopMaterialServiceImpl.java
+++ b/skyeye-erp/erp-pro/src/main/java/com/skyeye/shopmaterial/service/impl/ShopMaterialServiceImpl.java
@@ -211,7 +211,8 @@ public class ShopMaterialServiceImpl extends SkyeyeBusinessServiceImpl<ShopMater
         MPJLambdaWrapper<ShopMaterial> wrapper = new MPJLambdaWrapper<ShopMaterial>()
             .innerJoin(Material.class, Material::getId, ShopMaterial::getMaterialId)
             .innerJoin(Brand.class, Brand::getId, Material::getBrandId)
-            .eq(Brand::getEnabled, EnableEnum.ENABLE_USING.getKey());
+            .eq(Brand::getEnabled, EnableEnum.ENABLE_USING.getKey())
+            .in(Material::getShelvesState, Arrays.asList(MaterialShelvesState.ON_SHELVE.getKey(), MaterialShelvesState.PART_ON_SHELVE.getKey()));
         List<ShopMaterial> shopMaterialList = skyeyeBaseMapper.selectJoinList(ShopMaterial.class, wrapper);
         // 根据id批量查询详细的商品信息
         List<String> idList = shopMaterialList.stream().map(ShopMaterial::getId).collect(Collectors.toList());