From 1c8757f865bd5a0c80fa1d44ec4b62dfc6e24e39 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 12 十月 2026 16:55:31 +0800
Subject: [PATCH] fix: 优化客户往来查询逻辑，修复应收金额计算及批号显示问题
---
src/main/resources/mapper/sales/ShippingProductDetailMapper.xml | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml b/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml
index 15a6168..af9250f 100644
--- a/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml
@@ -10,22 +10,40 @@
<result column="quantity" property="quantity" />
<result column="shipping_info_id" property="shippingInfoId" />
</resultMap>
+ <!--
+ 鍙戣揣鏄庣粏锛堝彂璐у彴璐︺�岃鎯呫�嶉噷鐨勬壒鍙疯〃锛夛細
+ 鎵瑰彿鐩存帴鍙� shipping_product_detail.batch_no锛堝彂璐ф椂閫夊畾鐨勫簱瀛樻壒鍙凤級锛�
+ 浜у搧鍚嶇О/瑙勬牸鐢� spd.product_model_id 鍏宠仈銆�
+ 娉ㄦ剰锛歴tock_inventory_id 鍦ㄦ媶鎵瑰彂璐ф椂鍙兘涓虹┖锛屼笉鑳藉啀闈犲畠鍙栨壒鍙凤紝鍚﹀垯鎵瑰彿銆佽鏍奸兘浼氭槸绌恒��
+ -->
<select id="getDetail" resultType="com.ruoyi.sales.dto.ShippingProductDetailDto">
- select si.batch_no, pm.model as specification_model, p.product_name, spd.quantity as delivery_quantity
+ select spd.batch_no,
+ coalesce(pm.model, pm_inv.model) as specification_model,
+ coalesce(p.product_name, p_inv.product_name) as product_name,
+ spd.quantity as delivery_quantity
from shipping_product_detail spd
left join stock_inventory si on si.id = spd.stock_inventory_id
- left join product_model pm on pm.id = si.product_model_id
+ left join product_model pm on pm.id = spd.product_model_id
left join product p on p.id = pm.product_id
+ left join product_model pm_inv on pm_inv.id = si.product_model_id
+ left join product p_inv on p_inv.id = pm_inv.product_id
where spd.shipping_info_id = #{id}
+ order by spd.id
</select>
<select id="getDateilByShippingNo" resultType="com.ruoyi.sales.dto.ShippingProductDetailDto">
- select si.batch_no, pm.model as specification_model, p.product_name, spd.quantity as delivery_quantity
- from shipping_product_detail spd
- left join shipping_info sp on sp.id = spd.shipping_info_id
- left join stock_inventory si on si.id = spd.stock_inventory_id
- left join product_model pm on pm.id = si.product_model_id
- left join product p on p.id = pm.product_id
- where sp.shipping_no = #{shippingNo}
+ select spd.batch_no,
+ coalesce(pm.model, pm_inv.model) as specification_model,
+ coalesce(p.product_name, p_inv.product_name) as product_name,
+ spd.quantity as delivery_quantity
+ from shipping_product_detail spd
+ left join shipping_info sp on sp.id = spd.shipping_info_id
+ left join stock_inventory si on si.id = spd.stock_inventory_id
+ left join product_model pm on pm.id = spd.product_model_id
+ left join product p on p.id = pm.product_id
+ left join product_model pm_inv on pm_inv.id = si.product_model_id
+ left join product p_inv on p_inv.id = pm_inv.product_id
+ where sp.shipping_no = #{shippingNo}
+ order by spd.id
</select>
</mapper>
--
Gitblit v1.9.3