From fc830b7f62af651acedb8c11f1e2634fe2a3e497 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 14 一月 2026 14:20:46 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New
---
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 76 +++++++++++++++++++++++++++++++++++++
1 files changed, 75 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index ec8d8d4..b2a18d8 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -11,7 +11,7 @@
t3.shipping_date
FROM
sales_ledger_product T1
- left join shipping_info t3 on T1.id = t3.sales_ledger_id
+ left join shipping_info t3 on T1.id = t3.sales_ledger_product_id
<where>
1=1
<if test="salesLedgerProduct.salesLedgerId != null and salesLedgerProduct.salesLedgerId != '' ">
@@ -22,4 +22,78 @@
</if>
</where>
</select>
+ <select id="selectSalesLedgerProductByMainId" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
+ select slp.*
+ from quality_inspect qi
+ left join production_product_main ppm on qi.product_main_id = ppm.id
+ left join product_work_order pwo on ppm.work_order_id = pwo.id
+ left join product_order po on pwo.product_order_id = po.id
+ left join sales_ledger_product slp on po.product_model_id = slp.id
+ where qi.product_main_id = #{productMainId}
+
+
+ </select>
+ <select id="listPage" resultType="com.ruoyi.sales.dto.SalesLedgerProductDto">
+ select slp.*,
+ sl.project_name,
+ sl.customer_name,
+ sl.sales_contract_no,
+ sl.customer_contract_no
+ from sales_ledger_product slp
+ left join sales_ledger sl on slp.sales_ledger_id = sl.id
+ <where>
+ slp.type = 1
+ <if test="req.salesContractNo != null and req.salesContractNo != '' ">
+ AND sl.sales_contract_no like concat('%',#{req.salesContractNo},'%')
+ </if>
+ <if test="req.customerContractNo != null and req.customerContractNo != '' ">
+ AND sl.customer_contract_no like concat('%',#{req.customerContractNo},'%')
+ </if>
+ <if test="req.projectName != null and req.projectName != '' ">
+ AND sl.project_name like concat('%',#{req.projectName},'%')
+ </if>
+ <if test="req.customerName != null and req.customerName != '' ">
+ AND sl.customer_name like concat('%',#{req.customerName},'%')
+ </if>
+ <if test="req.productCategory != null and req.productCategory != '' ">
+ AND slp.product_category like concat('%',#{req.productCategory},'%')
+ </if>
+ <if test="req.status != null and req.status ">
+ AND slp.pending_invoice_total > 0
+ </if>
+ </where>
+ order by slp.register_date desc
+ </select>
+ <select id="listPagePurchaseLedger" resultType="com.ruoyi.sales.dto.SalesLedgerProductDto">
+ select slp.*,
+ sl.project_name,
+ sl.supplier_name,
+ sl.supplier_id,
+ sl.sales_contract_no,
+ sl.purchase_contract_number
+ from sales_ledger_product slp
+ left join purchase_ledger sl on slp.sales_ledger_id = sl.id
+ <where>
+ slp.type = 2
+ <if test="req.purchaseContractNumber != null and req.purchaseContractNumber != '' ">
+ AND sl.purchase_contract_number like concat('%',#{req.purchaseContractNumber},'%')
+ </if>
+ <if test="req.customerContractNo != null and req.customerContractNo != '' ">
+ AND sl.customer_contract_no like concat('%',#{req.customerContractNo},'%')
+ </if>
+ <if test="req.projectName != null and req.projectName != '' ">
+ AND sl.project_name like concat('%',#{req.projectName},'%')
+ </if>
+ <if test="req.customerName != null and req.customerName != '' ">
+ AND sl.customer_name like concat('%',#{req.customerName},'%')
+ </if>
+ <if test="req.productCategory != null and req.productCategory != '' ">
+ AND slp.product_category like concat('%',#{req.productCategory},'%')
+ </if>
+ <if test="req.status != null and req.status ">
+ AND slp.pending_invoice_total > 0
+ </if>
+ </where>
+ order by slp.register_date desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3