From da0033b9cff199a86442e2dcf31003d2a46ae754 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 20 六月 2026 16:23:11 +0800
Subject: [PATCH] fix: 工序产出分析传参字段名错误
---
src/main/resources/mapper/basic/SupplierManageMapper.xml | 75 ++-----------------------------------
1 files changed, 4 insertions(+), 71 deletions(-)
diff --git a/src/main/resources/mapper/basic/SupplierManageMapper.xml b/src/main/resources/mapper/basic/SupplierManageMapper.xml
index 67e5a92..93bd608 100644
--- a/src/main/resources/mapper/basic/SupplierManageMapper.xml
+++ b/src/main/resources/mapper/basic/SupplierManageMapper.xml
@@ -35,6 +35,7 @@
AND T1.is_white = #{supplierManageDto.isWhite}
</if>
</where>
+ order by T1.maintain_time desc
</select>
<select id="supplierExportList" resultType="com.ruoyi.basic.excel.SupplierManageExcelDto">
@@ -72,43 +73,8 @@
<select id="supplierTransactions" resultType="com.ruoyi.purchase.vo.SupplierTransactionsVo">
SELECT T1.supplier_id,
sm.supplier_name,
- T1.contractAmounts,
- IFNULL(T3.InboundAmount, 0) AS shippedAmount,
- T1.contractAmounts - IFNULL(T3.InboundAmount, 0) AS unshippedAmount
+ T1.contractAmounts
FROM (SELECT supplier_id, SUM(contract_amount) AS contractAmounts FROM purchase_ledger GROUP BY supplier_id) T1
- LEFT JOIN (
- SELECT t.supplier_id,
- SUM(t.inbound_amount) AS InboundAmount
- FROM (
- SELECT sir.stock_in_num * slp.tax_inclusive_unit_price AS inbound_amount, pl.supplier_id
- FROM stock_in_record sir
- INNER JOIN sales_ledger_product slp ON slp.sales_ledger_id = sir.record_id
- INNER JOIN purchase_ledger pl ON pl.id = slp.sales_ledger_id
- WHERE sir.approval_status = 1 AND sir.record_type = 7 AND slp.type = 2
- UNION ALL
- SELECT
- sir.stock_in_num * slp_agg.tax_inclusive_unit_price AS inbound_amount,
- pl2.supplier_id
- FROM stock_in_record sir
- INNER JOIN quality_inspect qi
- ON qi.id = sir.record_id
- INNER JOIN purchase_ledger pl2
- ON pl2.id = qi.purchase_ledger_id
- INNER JOIN (
- SELECT
- sales_ledger_id,
- product_model_id,
- MIN(tax_inclusive_unit_price) AS tax_inclusive_unit_price
- FROM sales_ledger_product
- WHERE type = 2
- GROUP BY sales_ledger_id, product_model_id
- ) slp_agg
- ON slp_agg.sales_ledger_id = pl2.id
- AND slp_agg.product_model_id = sir.product_model_id
- WHERE sir.approval_status = 1 AND sir.record_type = 10
- ) t
- GROUP BY t.supplier_id
- ) T3 ON T3.supplier_id = T1.supplier_id
LEFT JOIN supplier_manage sm ON T1.supplier_id = sm.id
<where>
<if test="supplierName!=null and supplierName!=''">
@@ -122,43 +88,10 @@
SELECT pl.id purchaseLedgerId,
pl.purchase_contract_number,
pl.execution_date,
- pl.contract_amount,
- IFNULL(T2.InboundAmount, 0) AS shippedAmount,
- pl.contract_amount - IFNULL(T2.InboundAmount, 0) AS unshippedAmount
+ pl.contract_amount
FROM purchase_ledger pl
- LEFT JOIN (
- SELECT t.sales_ledger_id,
- SUM(t.inbound_amount) AS InboundAmount
- FROM (
- SELECT sir.stock_in_num * slp.tax_inclusive_unit_price AS inbound_amount, slp.sales_ledger_id
- FROM stock_in_record sir
- INNER JOIN sales_ledger_product slp ON slp.sales_ledger_id = sir.record_id
- WHERE sir.approval_status = 1 AND sir.record_type = 7 AND slp.type = 2
- UNION ALL
- SELECT
- sir.stock_in_num * slp_agg.tax_inclusive_unit_price AS inbound_amount,
- slp_agg.sales_ledger_id
- FROM stock_in_record sir
- INNER JOIN quality_inspect qi
- ON qi.id = sir.record_id
- INNER JOIN purchase_ledger pl2
- ON pl2.id = qi.purchase_ledger_id
- INNER JOIN (
- SELECT
- sales_ledger_id,
- product_model_id,
- MIN(tax_inclusive_unit_price) AS tax_inclusive_unit_price
- FROM sales_ledger_product
- WHERE type = 2
- GROUP BY sales_ledger_id, product_model_id
- ) slp_agg
- ON slp_agg.sales_ledger_id = pl2.id
- AND slp_agg.product_model_id = sir.product_model_id
- WHERE sir.approval_status = 1 AND sir.record_type = 10
- ) t
- GROUP BY t.sales_ledger_id
- ) T2 ON T2.sales_ledger_id = pl.id
WHERE pl.supplier_id = #{supplierId}
</select>
+
</mapper>
--
Gitblit v1.9.3