From 0ae2d7e2cd0e0c3edde430c5cba8441a437e2d84 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 01 四月 2026 15:06:30 +0800
Subject: [PATCH] feat(production): 添加bomName字段及相关mapper映射
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index c5d7aed..57d804a 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -64,7 +64,7 @@
DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff,
CASE
WHEN shipping_status_counts.total_count = 0 THEN false
- WHEN shipping_status_counts.unshipped_count = 0 THEN true
+ WHEN shipping_status_counts.shipped_type = 0 THEN true
ELSE false
END AS is_fh
FROM sales_ledger T1
@@ -72,7 +72,8 @@
LEFT JOIN (
SELECT sales_ledger_id,
COUNT(*) as total_count,
- SUM(CASE WHEN status != '宸插彂璐�' THEN 1 ELSE 0 END) as unshipped_count
+ SUM(CASE WHEN status != '宸插彂璐�' THEN 1 ELSE 0 END) as shipped_type,
+ sum(part_send_amount) as part_send_amount
FROM shipping_info
GROUP BY sales_ledger_id
) shipping_status_counts ON T1.id = shipping_status_counts.sales_ledger_id
@@ -111,4 +112,16 @@
FROM sales_ledger
GROUP BY customer_name
</select>
+ <select id="listSalesLedgerAndShipped" resultType="com.ruoyi.sales.dto.SalesLedgerDto">
+ select distinct sl.id as 'disId', sl.* from
+ sales_ledger sl
+ left join sales_ledger_product slp on sl.id = slp.sales_ledger_id
+ left join shipping_info si on slp.id = si.sales_ledger_product_id
+ where si.status = '宸插彂璐�'
+ <if test="ew.customerName != null and ew.customerName != '' ">
+ and sl.customer_name like concat('%',#{ew.customerName},'%')
+ </if>
+ order by sl.execution_date desc
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3