From 6230802541add86346e817ab0b273c8ac6added9 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 13:41:31 +0800
Subject: [PATCH] 分支获取
---
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index efe93cf..a23a02c 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -2,7 +2,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.sales.mapper.ShippingInfoMapper">
- <select id="listPage" resultType="com.ruoyi.sales.pojo.ShippingInfo">
+ <select id="listPage" resultType="com.ruoyi.sales.vo.ShippingInfoVo">
SELECT
s.id,
s.sales_ledger_id,
@@ -14,12 +14,19 @@
s.update_user,
s.tenant_id,
sl.sales_contract_no,
- sl.customer_name
+ sl.customer_name,
+ slp.product_category,
+ slp.specification_model,
+ slp.quantity
FROM shipping_info s
LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ left join sales_ledger_product slp on slp.id = s.sales_ledger_product_id and slp.type = 1
WHERE 1=1
<if test="req.salesContractNo != null and req.salesContractNo != ''">
AND sl.sales_contract_no LIKE CONCAT('%',#{req.salesContractNo},'%')
+ </if>
+ <if test="req.productCategory != null and req.productCategory != ''">
+ AND slp.product_category LIKE CONCAT('%',#{req.productCategory},'%')
</if>
<if test="req.shippingCarNumber != null and req.shippingCarNumber != ''">
AND s.shipping_car_number LIKE CONCAT('%',#{req.shippingCarNumber},'%')
@@ -41,4 +48,4 @@
FROM shipping_info s
LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3