From 9018bdb6ede7bccd16d78dd2de51bf88754012df Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 07 七月 2025 16:49:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/S7_master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
index df09271..286e3ff 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
@@ -132,11 +132,17 @@
<select id="queryProductNameByFlowCardId" resultType="com.mes.hollow.entity.dto.OrderDetailsDTO">
select t.product_name, t1.customer_name
from sd.order_detail t
- inner join sd.order t1 on t.order_id = t1.order_id
+ inner join sd.order t1 on t.order_id = t1.order_id
where (t.order_id, t.order_number) = (
- select min(order_id) as order_id, min(order_number) as order_number
- from pp.flow_card
- where process_id = #{flowCardId}
+ select min(order_id) as order_id, min(order_number) as order_number
+ from pp.flow_card
+ where process_id = #{flowCardId}
+ <if test="productName != null and productName != ''">
+ and t.product_name like concat('%', #{productName}, '%')
+ </if>
+ <if test="customerName != null and customerName != ''">
+ and t1.customer_name like concat('%', #{customerName}, '%')
+ </if>
)
limit 1
</select>
--
Gitblit v1.8.0