From 5323d2e4d07d5ceaaae6a5bf12254641a2d77174 Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期二, 08 七月 2025 11:09:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/resources/mapper/purchase/ProductRecordMapper.xml | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/src/main/resources/mapper/purchase/ProductRecordMapper.xml b/src/main/resources/mapper/purchase/ProductRecordMapper.xml index 35f08ac..dd5aac6 100644 --- a/src/main/resources/mapper/purchase/ProductRecordMapper.xml +++ b/src/main/resources/mapper/purchase/ProductRecordMapper.xml @@ -35,5 +35,28 @@ <if test="c.createdAtEnd != null and c.createdAtEnd != ''"> and pr.created_at <= date_format(#{c.createdAtEnd},'%Y-%m-%d hh:mm:ss') </if> + <if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''"> + and tr.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%') + </if> + </select> + <select id="getProductRecordById" resultType="com.ruoyi.purchase.dto.ProductRecordDto"> + SELECT + sl.sales_contract_no, + sl.customer_contract_no, + sl.customer_name, + pm.model AS product_model, + pl.purchase_contract_number, + pl.supplier_name, + pr.*, + tr.invoice_number, + ROUND(pr.tickets_amount/(1+pr.tax_rate/100),2 ) as un_tickets_price, + ROUND(pr.tickets_amount-pr.tickets_amount/(1+pr.tax_rate/100),2 )as invoice_amount + FROM product_record pr + left join purchase_ledger pl on pl.id = pr.purchase_ledger_id + left join sales_ledger sl on sl.id = pl.sales_ledger_id + left join ticket_registration tr on tr.id = pr.ticket_registration_id + left join product_model pm on pm.id = pr.product_model_id + + WHERE type = 2 and pr.id = #{id} </select> </mapper> \ No newline at end of file -- Gitblit v1.9.3