From 6416b165e4a3c8ecc2d547ceef0fb3962d3c7b56 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 12 一月 2026 14:58:45 +0800
Subject: [PATCH] 1.查询产品信息列表接口，销售台账查询其产品的状态 2.增添不合格现象字段，取消生产状态字段 3.修改发货审批接口,发货审批通过，生产该订单出库记录 4.存在质检记录并已提交的销售台账删除时做出限制 5.生产报工投入，产出2:1调整
---
src/main/resources/mapper/purchase/ProductRecordMapper.xml | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 56 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/purchase/ProductRecordMapper.xml b/src/main/resources/mapper/purchase/ProductRecordMapper.xml
index c135606..2c0cba4 100644
--- a/src/main/resources/mapper/purchase/ProductRecordMapper.xml
+++ b/src/main/resources/mapper/purchase/ProductRecordMapper.xml
@@ -5,7 +5,62 @@
<mapper namespace="com.ruoyi.purchase.mapper.ProductRecordMapper">
- <select id="productRecordPage" resultType="com.ruoyi.purchase.pojo.ProductRecord">
+ <select id="productRecordPage" 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,
+ pl.project_name,
+ pr.*,
+ tr.invoice_number,
+ tr.iss_uer_id,
+ tr.iss_uer,
+ tr.id as ticketRegistrationId,
+ 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
+ <if test="c.salesContractNo != null and c.salesContractNo != ''">
+ and sl.sales_contract_no like concat('%',#{c.salesContractNo},'%')
+ </if>
+ <if test="c.supplierName != null and c.supplierName != ''">
+ and pl.supplier_name like concat('%',#{c.supplierName},'%')
+ </if>
+ <if test="c.createdAtStart != null and c.createdAtStart != ''">
+ and pr.created_at >= date_format(#{c.createdAtStart},'%Y-%m-%d hh:mm:ss')
+ </if>
+ <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