From 2bdf6b86c427cd8a0f433d6a559d532eed67b733 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 13 八月 2026 13:40:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_意博凯信' into dev_天津_意博凯信
---
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index 6fc1842..762c2d4 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -101,9 +101,8 @@
order by sor.id
</select>
<select id="getShippingInfoByCustomerName" resultType="com.ruoyi.sales.pojo.ShippingInfo">
- select distinct si.* from shipping_info si
+ select * from shipping_info si
left join sales_ledger sl on si.sales_ledger_id = sl.id
- inner join stock_out_record sor on sor.record_id = si.id and sor.record_type = '13' and sor.approval_status = 1
- where sl.customer_name = #{customerName} and si.status = '瀹℃牳閫氳繃'
+ where sl.customer_name = #{customerName}
</select>
</mapper>
--
Gitblit v1.9.3