From 19bd3e436a26731eb82bebd6f82eb39dd79221f0 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 03 六月 2026 09:50:29 +0800
Subject: [PATCH] feat(shipping): 添加审批节点记录功能
---
src/main/resources/mapper/sales/ShipmentApprovalMapper.xml | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/sales/ShipmentApprovalMapper.xml b/src/main/resources/mapper/sales/ShipmentApprovalMapper.xml
index 8b9792e..15fc598 100644
--- a/src/main/resources/mapper/sales/ShipmentApprovalMapper.xml
+++ b/src/main/resources/mapper/sales/ShipmentApprovalMapper.xml
@@ -3,14 +3,22 @@
<mapper namespace="com.ruoyi.sales.mapper.ShipmentApprovalMapper">
<select id="listPage" resultType="com.ruoyi.sales.pojo.ShipmentApproval">
- SELECT *,
+ SELECT sa.*,
si.shipping_car_number,
+ sl.sales_contract_no,
+ sl.customer_name,
+ slp.product_category,
+ slp.specification_model,
+ slp.quantity,
+ slp.unit,
+ sd.dept_name as approveDeptName,
T2.nick_name AS entry_person_name
FROM shipment_approval sa
LEFT JOIN shipping_info si ON sa.shipping_info_id = si.id
LEFT JOIN sales_ledger sl ON sa.sales_ledger_id = sl.id
- LEFT JOIN sales_ledger_product slp ON sa.sales_ledger_product_id = slp.id
+ LEFT JOIN sales_ledger_product slp ON sa.sales_ledger_product_id = slp.id and slp.type = 1
LEFT JOIN sys_user T2 ON sl.entry_person = T2.user_id
+ LEFT JOIN sys_dept sd ON sa.approve_dept_id = sd.dept_id
<where>
1=1
<if test="req.approveStatus != null and req.approveStatus != '' ">
@@ -20,5 +28,6 @@
AND sl.sales_contract_no LIKE CONCAT('%',#{req.salesContractNo},'%')
</if>
</where>
+ ORDER BY sa.id DESC
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3