Merge remote-tracking branch 'refs/remotes/origin/jtwy' into sqd-hb

liyong

2026-01-20 ca0565e53494417b3779759f8d3898e07bfd5929

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

@@ -42,8 +42,7 @@
        order by t1.create_time desc
    </select>
    <select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
        select
            t3.supplier_name,
        select t3.supplier_name,
            t2.product_category,
            t1.id,
            t2.specification_model,
@@ -55,20 +54,15 @@
            t1.inbound_num,
            t1.create_time,
            t1.create_time as time,
            t1.create_by,
            t4.box_num,
            t4.carton_specifications,
            t4.dollar_price
               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
            left join procurement_record_storage t4 on t4.id = t1.procurement_record_storage_id
        where t1.type = 1
    </select>

    <select id="listOne" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
        select
            t3.customer_contract_no,
        select t3.customer_contract_no,
            t3.sales_contract_no,
            t3.customer_name,
            t2.product_category,
@@ -90,24 +84,20 @@
    </select>

    <select id="listTwo" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
        select
        select t1.supplier_name,
               t1.product_category,
            t1.id,
            t1.`code`,
            t3.supplier_name,
            t2.product_category,
            t2.specification_model,
            t2.unit,
            t2.tax_rate,
            t2.tax_inclusive_unit_price,
            t2.tax_inclusive_total_price,
            t2.tax_exclusive_total_price,
               t1.specification_model,
               t1.unit,
               t1.tax_rate,
               t1.tax_inclusive_unit_price,
               t1.tax_inclusive_total_price,
               t1.tax_exclusive_total_price,
            t1.inbound_num,
            t1.create_time,
            t1.create_time as time,
            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
        where t1.type = 3
    </select>
    <select id="listPageByProduct" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
@@ -152,7 +142,6 @@
        t2.supplier_name,
        t2.product_category,
        t1.id,
        t1.code,
        t2.specification_model,
        t2.unit,
        t2.tax_rate,
@@ -163,10 +152,7 @@
        t1.create_time,
        t1.create_by,
        t2.item_type,
        t2.box_num,
        t2.carton_specifications,
        t2.dollar_price,
        t2.url
        t2.code
        from  procurement_record_out t1
        left join custom_storage t2 on t2.id = t1.procurement_record_storage_id
        <where>
@@ -183,4 +169,44 @@
        </where>
        order by t1.create_time desc
    </select>

    <select id="getSumQuantity" resultType="BigDecimal">
        select COALESCE(sum(inbound_num), 0)
        from procurement_record_out
        where
           product_model_id = #{productModelId}
    </select>
    <select id="selectCode" resultType="com.ruoyi.procurementrecord.pojo.ProcurementRecordOut">
        select *
        from procurement_record_out
        where code like concat('%', #{format})
        order by id desc
        limit 1
    </select>
    <select id="listPageBySemiProduct" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
        select
        t1.id,
        t1.code,
        t2.unit,
        t1.inbound_num,
        t1.create_time,
        t1.create_by,
        t2.model as specification_model,
        t2.product_code,
        t3.product_name as product_category
        from procurement_record_out t1
        left join product_model t2 on t2.id = t1.product_model_id
        left join product t3 on t3.id = t2.product_id
        <where>
            and t1.type = 4
            <if test="req.productCategory !=null and req.productCategory !=''">
                t3.product_name like concat('%',#{req.productCategory},'%')
            </if>
            <if test="req.timeStr != null and req.timeStr != ''">
                and t1.create_time like concat('%',#{req.timeStr},'%')
            </if>
        </where>
        order by t1.create_time desc
    </select>

</mapper>