Merge remote-tracking branch 'origin/master'

无关风月

2026-01-14 2526190b209e74f3f882eaf19cc95d333589d7b8

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

@@ -444,8 +444,9 @@

    </select>
    <select id="pageShopList" resultType="com.ruoyi.system.vo.TErpGoodsVO">
        select t1.id,t1.cover,t1.low_purchase_quantity,t1.packing_unit_id,t1.sales_amount,t1.supplier_clinic_id,t2.supplier_name as supplier
        ,t3.unit_name as packingUnitName
        select t1.id,t1.cover,t1.goods_name,t1.low_purchase_quantity,t1.low_unit_id,t1.packing_unit_id,
               t1.manufacturer,t1.sales_amount,t1.supplier_clinic_id,t2.supplier_name as supplier,
                t3.unit_name as packingUnitName
        from t_erp_goods t1
        left join t_crm_supplier t2 on t1.supplier_clinic_id = t2.id
        left join t_erp_goods_unit t3 on t1.packing_unit_id = t3.id
@@ -476,8 +477,9 @@

    </select>
    <select id="pageShopListAll" resultType="com.ruoyi.system.vo.TErpGoodsVO">
        select t1.id,t1.cover,t1.low_purchase_quantity,t1.packing_unit_id,t1.sales_amount,t1.supplier_clinic_id,t2.supplier_name as supplier
        ,t3.unit_name as packingUnitName
        select t1.id,t1.cover,t1.goods_name,t1.low_purchase_quantity,t1.low_unit_id,t1.packing_unit_id,
        t1.manufacturer,t1.sales_amount,t1.supplier_clinic_id,t2.supplier_name as supplier,
        t3.unit_name as packingUnitName
        from t_erp_goods t1
        left join t_crm_supplier t2 on t1.supplier_clinic_id = t2.id
        left join t_erp_goods_unit t3 on t1.packing_unit_id = t3.id