From 5d81fcc5768741323a2e343fc01f44e17e68b65b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 25 六月 2026 14:59:38 +0800
Subject: [PATCH] 1.库存入库新增质检流程 2.销售相关查询返回总合同号 3.采购相关查询返回总合同号

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

diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index 0d2dae7..9222b40 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -19,6 +19,7 @@
         s.update_user,
         s.tenant_id,
         sl.sales_contract_no,
+        sl.master_contract_no,
         s.outbound_batches,
         pm.model as specification_model,
         pm.unit,
@@ -57,6 +58,9 @@
         WHERE 1=1
         <if test="req.salesContractNo != null and req.salesContractNo != ''">
             AND sl.sales_contract_no LIKE CONCAT('%',#{req.salesContractNo},'%')
+        </if>
+        <if test="req.masterContractNo != null and req.masterContractNo != ''">
+            AND sl.master_contract_no LIKE CONCAT('%',#{req.masterContractNo},'%')
         </if>
         <if test="req.shippingCarNumber != null and req.shippingCarNumber != ''">
             AND s.shipping_car_number LIKE CONCAT('%',#{req.shippingCarNumber},'%')
@@ -134,6 +138,7 @@
             si.id AS shippingId,
             si.shipping_no AS shippingNo,
             sl.sales_contract_no AS salesContractNo,
+            sl.master_contract_no AS masterContractNo,
             sl.customer_name AS customerName,
             IFNULL(p.product_name, slp.product_category) AS productName,
             IFNULL(pm.model, slp.specification_model) AS model,

--
Gitblit v1.9.3