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/production/ProductionProductMainMapper.xml |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index df585f9..1b5f92d 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -31,6 +31,7 @@
                pm.model as productModelName,
                pm.unit,
                po_sales.salesContractNo,
+               po_sales.masterContractNo,
                date(ppm.create_time) as schedulingDate,
                su.nick_name as schedulingUserName,
                po_sales.customerName,
@@ -42,6 +43,7 @@
                  left join (
             select po2.id as orderId,
                    group_concat(distinct sl2.sales_contract_no order by sl2.sales_contract_no separator ',') as salesContractNo,
+                   group_concat(distinct sl2.master_contract_no order by sl2.master_contract_no separator ',') as masterContractNo,
                    group_concat(distinct sl2.customer_name order by sl2.customer_name separator ',') as customerName
             from production_order po2
                      left join production_plan pp2
@@ -63,6 +65,9 @@
             <if test="c.salesContractNo != null and c.salesContractNo != ''">
                 and po_sales.salesContractNo like concat('%', #{c.salesContractNo}, '%')
             </if>
+            <if test="c.masterContractNo != null and c.masterContractNo != ''">
+                and po_sales.masterContractNo like concat('%', #{c.masterContractNo}, '%')
+            </if>
             <if test="c.customerName != null and c.customerName != ''">
                 and po_sales.customerName like concat('%', #{c.customerName}, '%')
             </if>

--
Gitblit v1.9.3