Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-05-21 d75541110d428f61a9fe3378110248b7dd78e240

 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialProductGroupManagementMapper.java

@@ -2,8 +2,11 @@

import com.aps.core.domain.ApsMaterialProductGroupManagement;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Select;
import org.jetbrains.annotations.NotNull;

import java.util.List;
import java.util.Set;

/**
 * 物料产品组数据管理Mapper接口
@@ -62,4 +65,18 @@
    public int deleteApsMaterialProductGroupManagementByIds(Long[] ids);

    void deleteAll();


    @Select("""
        <script>
            select distinct factory || '##' || material_code from aps_material_product_group_management
            where 1 = 0
            <if test="!keys.isEmpty()">or factory || '##' || material_code in
                <foreach collection="keys" item="item" open="(" separator="," close=")">
                    #{item}
                </foreach>
            </if>
        </script>
    """)
    Set<String> selectByFacOrMaterial(@NotNull Set<String> keys);
}