From c27858b16969db1ff313b73f017187e06bf5aa9c Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 19 十一月 2025 10:03:38 +0800
Subject: [PATCH] yys 1.发货台账修改

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

diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index efe93cf..55c70cf 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -14,13 +14,19 @@
         s.update_user,
         s.tenant_id,
         sl.sales_contract_no,
-        sl.customer_name
+        sl.customer_name,
+        slp.product_category,
+        slp.specification_model
         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},'%')
         </if>

--
Gitblit v1.9.3