Merge remote-tracking branch 'origin/master'

maven

2025-09-28 54aff4794f199c40323e8704f660819b73fea768

 basic-server/src/main/resources/mapper/StandardTreeMapper.xml

@@ -90,7 +90,7 @@
    </sql>

    <select id="selectStandardTreeList" resultMap="FactoryDto">
        select '中天科技检测中心'        factory,
        select '工厂'        factory,
               l.laboratory_name laboratory,
               sto.specimen_name sample_type,
               p.name            sample,
@@ -156,7 +156,7 @@
    </select>

    <select id="selectStandardTreeList2" resultType="com.ruoyi.basic.pojo.StandardTree">
        select '中天科技检测中心'        factory,
        select '工厂'        factory,
               l.laboratory_name laboratory,
               sto.specimen_name sample_type,
               p.name            sample
@@ -237,7 +237,7 @@
        where name = #{name}
    </select>
    <select id="selectStandardTreeListByPartNo" resultMap="FactoryDto">
        select '中天科技检测中心' factory,
        select '工厂' factory,
               l.laboratory_name  laboratory,
               sto.specimen_name  sample_type,
               p.name             sample,
@@ -389,4 +389,13 @@
        where sample_type = #{sampleType}
          and sample is null
    </select>

    <!-- 根据原材料id列表查询原材料信息 -->
    <select id="getIfsByIds" resultType="com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto">
        <include refid="getIfsOrder"/>
        where id in
        <foreach item="id" collection="ifsIds" open="(" separator="," close=")">
            #{id}
        </foreach>
    </select>
</mapper>