From 47b42159fbe69fb2b4dbc13c75dd45abd00a55ae Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 13 二月 2026 11:10:34 +0800
Subject: [PATCH] fix: 查询日期缺少时分秒
---
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 90 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 76 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index e27d27e..671fcf5 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -7,35 +7,31 @@
<select id="selectSalesLedgerProductList" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
SELECT
T1.*,
- t3.shipping_car_number,
- t3.shipping_date,
- t3.status as shippingStatus
- t3.shipping_date,
CASE
- WHEN t2.qualitity > T1.quantity THEN 1
+ WHEN (IFNULL(t2.qualitity, 0) - IFNULL(t2.locked_quantity, 0)) >= IFNULL(T1.quantity, 0) THEN 1
ELSE 0
END as has_sufficient_stock
FROM
sales_ledger_product T1
LEFT JOIN stock_inventory t2 ON T1.product_model_id = t2.product_model_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 != '' ">
+ <if test="salesLedgerProduct.salesLedgerId != null">
AND T1.sales_ledger_id = #{salesLedgerProduct.salesLedgerId}
</if>
- <if test="salesLedgerProduct.type != null and salesLedgerProduct.type != '' ">
+ <if test="salesLedgerProduct.type != null">
AND T1.type = #{salesLedgerProduct.type}
</if>
</where>
+ ORDER BY T1.register_date DESC
</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
+ left join sales_ledger_product slp on po.sale_ledger_product_id = slp.id
where qi.product_main_id = #{productMainId}
@@ -85,6 +81,9 @@
<if test="req.purchaseContractNumber != null and req.purchaseContractNumber != '' ">
AND sl.purchase_contract_number like concat('%',#{req.purchaseContractNumber},'%')
</if>
+ <if test="req.approvalStatus != null and req.approvalStatus != ''">
+ and sl.approval_status = #{req.approvalStatus}
+ </if>
<if test="req.customerContractNo != null and req.customerContractNo != '' ">
AND sl.customer_contract_no like concat('%',#{req.customerContractNo},'%')
</if>
@@ -98,7 +97,7 @@
AND slp.product_category like concat('%',#{req.productCategory},'%')
</if>
<if test="req.status != null and req.status ">
- AND slp.pending_invoice_total > 0
+ AND slp.pending_tickets_total > 0
</if>
</where>
order by slp.register_date desc
@@ -151,15 +150,78 @@
LEFT JOIN product_structure ps ON pb.id = ps.bom_id
LEFT JOIN product_model pm1 ON pm1.id = ps.product_model_id
LEFT JOIN product p ON p.id = pm1.product_id
- WHERE sl.id = #{salesLedegerId}) A
+ WHERE sl.id = #{salesLedegerId}) A
group by a.model, a.product_name, a.unit
</select>
<select id="selectProduct" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
select
p.product_name as product_category,
pm.model as specification_model,
- pm.id
+ pm.id as product_model_id
from product_model pm
left join product p on pm.product_id = p.id
</select>
-</mapper>
\ No newline at end of file
+
+ <select id="selectProductSalesAnalysis" resultType="java.util.Map">
+ SELECT
+ product_category as name,
+ SUM( tax_inclusive_total_price ) AS value
+ FROM
+ sales_ledger_product
+ WHERE
+ type = 1
+ GROUP BY
+ product_category
+ ORDER BY
+ value DESC
+ LIMIT 5
+ </select>
+
+ <select id="selectRawMaterialPurchaseAnalysis" resultType="java.util.Map">
+ SELECT
+ pr.product_name AS name,
+ SUM( slp.tax_inclusive_total_price ) AS value
+ FROM
+ sales_ledger_product slp
+ JOIN product pr ON slp.product_id = pr.id
+ WHERE
+ slp.type = 2
+ AND pr.parent_id = ( SELECT id FROM product WHERE product_name = '鍘熸潗鏂�' )
+ GROUP BY
+ pr.id,
+ pr.product_name
+ ORDER BY
+ value DESC
+ LIMIT 5
+ </select>
+
+ <select id="selectProductCountByTypeAndDate" resultType="int">
+ SELECT IFNULL(COUNT(*), 0)
+ FROM sales_ledger_product
+ WHERE type = #{type}
+ <if test="startDate != null">
+ AND register_date >= #{startDate}
+ </if>
+ <if test="endDate != null">
+ AND register_date <= #{endDate}
+ </if>
+ </select>
+
+ <select id="selectRawMaterialExpense" resultType="java.math.BigDecimal">
+ WITH RECURSIVE product_tree AS (SELECT id
+ FROM product
+ WHERE product_name = '鍘熸潗鏂�'
+
+ UNION ALL
+
+ SELECT p.id
+ FROM product p
+ INNER JOIN product_tree pt ON p.parent_id = pt.id)
+ SELECT IFNULL(SUM(slp.tax_inclusive_total_price), 0)
+ FROM sales_ledger_product slp
+ WHERE slp.type = 2
+ AND slp.product_id IN (SELECT id
+ FROM product_tree);
+
+ </select>
+</mapper>
--
Gitblit v1.9.3