From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index d999db9..6ed0d27 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -38,7 +38,8 @@
ELSE '姝ｅ父'
END AS work_order_type,
pp.device_name,
- pp.user_ids as process_user_ids
+ pp.user_ids as process_user_ids,
+ t8.product_name as final_product_model
FROM
product_work_order pwo
LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
@@ -46,7 +47,13 @@
LEFT JOIN product_process pp ON pp.id = ppri.process_id
LEFT JOIN product_model pm ON pm.id = ppri.product_model_id
LEFT JOIN product p ON p.id = pm.product_id
- where 1=1
+ left join product_model t7 on t7.id = po.product_model_id
+ left join product as t8 on t7.product_id = t8.id
+ <where>
+ <if test="c.workOrderNo != null and c.workOrderNo != ''">
+ pwo.work_order_no like concat('%', #{c.workOrderNo}, '%')
+ </if>
+ </where>
order by po.id desc,pwo.id asc
</select>
<select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
--
Gitblit v1.9.3