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 wrapper = new MPJLambdaWrapper() .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 shopMaterialList = skyeyeBaseMapper.selectJoinList(ShopMaterial.class, wrapper); // 根据id批量查询详细的商品信息 List idList = shopMaterialList.stream().map(ShopMaterial::getId).collect(Collectors.toList());