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/ProductionOrderMapper.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionOrderMapper.xml b/src/main/resources/mapper/production/ProductionOrderMapper.xml
index 8e64413..7326fe4 100644
--- a/src/main/resources/mapper/production/ProductionOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderMapper.xml
@@ -23,6 +23,7 @@
<resultMap id="ProductionOrderVoResultMap" type="com.ruoyi.production.bean.vo.ProductionOrderVo" extends="BaseResultMap">
<result column="salesContractNo" property="salesContractNo" />
+ <result column="masterContractNo" property="masterContractNo" />
<result column="customerName" property="customerName" />
<result column="productName" property="productName" />
<result column="model" property="model" />
@@ -47,6 +48,7 @@
po.plan_complete_time,
po.status,
po_sales.salesContractNo,
+ po_sales.masterContractNo,
po_sales.customerName,
p.product_name as productName,
pm.model as model,
@@ -62,6 +64,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,
group_concat(distinct sl2.project_name order by sl2.project_name separator ',') as projectName,
min(sl2.delivery_date) as deliveryDate
--
Gitblit v1.9.3