From 276357baf4a50ef132321e7a36fe52bf74c1d9c8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 12 五月 2026 13:34:56 +0800
Subject: [PATCH] refactor(dto): 为日期字段添加Spring日期格式化注解规范了日期范围查询SQL语句

---
 src/main/resources/mapper/sales/ShippingInfoMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index ee384ed..b0bf4b7 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -22,12 +22,14 @@
         pm.model as specification_model,
         pm.unit,
         p.product_name,
-        sl.customer_name
+        sl.customer_name,
+        sor.outbound_batches
         FROM shipping_info s
         LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
         LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id and slp.type = 1
         left join product_model pm on slp.product_model_id = pm.id
         left join product p on pm.product_id = p.id
+        left join stock_out_record sor on sor.record_id= s.id and sor.record_type='13' and sor.approval_status=1
         WHERE 1=1
         <if test="req.salesContractNo != null and req.salesContractNo != ''">
             AND sl.sales_contract_no LIKE CONCAT('%',#{req.salesContractNo},'%')
@@ -86,6 +88,6 @@
     <select id="getShippingInfoByCustomerName" resultType="com.ruoyi.sales.pojo.ShippingInfo">
         select * from shipping_info si
         left join sales_ledger sl on si.sales_ledger_id = sl.id
-        where si.status = '宸插彂璐�' and sl.customer_name = #{customerName}
+        where  sl.customer_name = #{customerName}
     </select>
 </mapper>

--
Gitblit v1.9.3