Merge remote-tracking branch 'origin/master'

xuhy

2025-10-14 14f55cd77189bae10627277a2a3dab9cec5fcada

 ruoyi-system/src/main/resources/mapper/system/TErpProcurementMapper.xml

@@ -61,6 +61,7 @@
            and t1.create_time between #{sTime} and #{eTime}
        </if>
        group by t1.id
        order by t1.create_time desc

    </select>
    <select id="inventoryNotEnoughList" resultType="com.ruoyi.system.vo.TErpGoodsVO">
@@ -89,7 +90,10 @@
               t1.status
               from t_erp_procurement t1
               left JOIN t_crm_clinic t2 on t1.clinic_id = t2.id
        where t1.disabled = 0 and t1.status in(3,4,5) and t1.supplier_id =#{supplierClinicId}
        where t1.disabled = 0 and t1.status in(3,4,5) and t1.supplier_id in
        <foreach collection="supplierClinicId" close=")" item="id" separator="," open="(" >
            #{id}
        </foreach>
        <if test="query.procurementCode != null and query.procurementCode != ''">
            and t1.procurement_code = #{query.procurementCode}
        </if>