fix: 产品入库的库存返回产品大类、规则型号、单位

gongchunyi

2 天以前 593379b64d440c06887e8fbfa2803c70463dba19

 src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml

@@ -2,46 +2,60 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper">


    <select id="listPage" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
        select
        t3.supplier_name,
        t2.product_category,
        t3.supplier_name as supplierName,
        COALESCE(t2.product_category, t6.product_name) as productCategory,
        t1.id,
        t2.specification_model,
        t2.unit,
        t2.tax_rate,
        t2.tax_inclusive_unit_price,
        t2.tax_inclusive_total_price,
        t2.tax_exclusive_total_price,
        t1.inbound_num,
        t1.create_date,
        t1.create_by
        from  procurement_record_out t1
        t1.code,
        COALESCE(t2.specification_model, t5.model) as specificationModel,
        COALESCE(t2.unit, t5.unit) as unit,
        t2.tax_rate as taxRate,
        t2.tax_inclusive_unit_price as taxInclusiveUnitPrice,
        t2.tax_inclusive_total_price as taxInclusiveTotalPrice,
        t2.tax_exclusive_total_price as taxExclusiveTotalPrice,
        t1.inbound_num as inboundNum,
        t1.create_time as createTime,
        t1.create_by as createBy,
        COALESCE(t2.warn_num, t4.warn_num) as warnNum
        from procurement_record_out t1
        left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
        left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
        left join procurement_record_storage t4 on t4.id = t1.procurement_record_storage_id
        left join product_model t5 on t5.id = t4.product_model_id
        left join product t6 on t6.id = t5.product_id
        <where>
            1 = 1
            <if test="req.supplierName != null and req.supplierName != ''">
                and t3.supplier_name like  concat('%',#{req.supplierName},'%')
                and t3.supplier_name like concat('%',#{req.supplierName},'%')
            </if>
            <if test="req.timeStr != null and req.timeStr != ''">
                and t1.create_time like concat('%',#{req.timeStr},'%')
            </if>
        </where>
    </select>

    <select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
        select
            t3.supplier_name,
            t2.product_category,
            t1.id,
            t2.specification_model,
            t2.unit,
            t2.tax_rate,
            t2.tax_inclusive_unit_price,
            t2.tax_inclusive_total_price,
            t2.tax_exclusive_total_price,
            t1.inbound_num,
            t1.create_date,
            t1.create_by
        from  procurement_record_out t1
                  left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
                  left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
        select t3.supplier_name as supplierName,
               COALESCE(t2.product_category, t6.product_name) as productCategory,
               t1.id,
               COALESCE(t2.specification_model, t5.model)     as specificationModel,
               COALESCE(t2.unit, t5.unit)                     as unit,
               t2.tax_rate                                    as taxRate,
               t2.tax_inclusive_unit_price                    as taxInclusiveUnitPrice,
               t2.tax_inclusive_total_price                    as taxInclusiveTotalPrice,
               t2.tax_exclusive_total_price                    as taxExclusiveTotalPrice,
               t1.inbound_num                                 as inboundNum,
               t1.create_time                                 as createTime,
               t1.create_time                                 as time,
               t1.create_by                                   as createBy
        from procurement_record_out t1
                 left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
                 left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
                 left join procurement_record_storage t4 on t4.id = t1.procurement_record_storage_id
                 left join product_model t5 on t5.id = t4.product_model_id
                 left join product t6 on t6.id = t5.product_id
    </select>

</mapper>