From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index 671fcf5..3109bce 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -31,7 +31,7 @@
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.sale_ledger_product_id = slp.id
+ left join sales_ledger_product slp on po.sale_ledger_product_id = slp.id and slp.type = 1
where qi.product_main_id = #{productMainId}
@@ -128,7 +128,7 @@
AND slp.product_category = #{req.productCategory}
</if>
<!-- 鎸変骇鍝佸ぇ绫诲垎缁勮仛鍚� -->
- GROUP BY slp.product_category
+ GROUP BY slp.product_category,slp.specification_model,sl.supplier_name
<!-- 鎸変骇鍝佸ぇ绫绘帓搴� -->
ORDER BY slp.product_category
</select>
@@ -144,7 +144,7 @@
p.product_name,
ps.unit_quantity * slp.quantity AS single_quantity
FROM sales_ledger sl
- LEFT JOIN sales_ledger_product slp ON slp.sales_ledger_id = sl.id
+ LEFT JOIN sales_ledger_product slp ON slp.sales_ledger_id = sl.id and slp.type = 1
LEFT JOIN product_model pm ON pm.id = slp.product_model_id
LEFT JOIN product_bom pb ON pb.product_model_id = pm.id
LEFT JOIN product_structure ps ON pb.id = ps.bom_id
@@ -153,11 +153,14 @@
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 id="selectProduct" resultType="com.ruoyi.sales.dto.SimpleProductDto">
select
+ pm.id,
p.product_name as product_category,
pm.model as specification_model,
- pm.id as product_model_id
+ pm.id as product_model_id,
+ pm.unit,
+ pm.sub_unit
from product_model pm
left join product p on pm.product_id = p.id
</select>
--
Gitblit v1.9.3