From 13ec051c5a960d3e12290aae053ba6fa4923536f Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 13 五月 2026 17:53:27 +0800
Subject: [PATCH] feat(生产工单): 添加成品型号字段及工单编号模糊搜索功能
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 10 ++++++++--
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 2 ++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index c94cacf..a528151 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -53,4 +53,6 @@
@ApiModelProperty(value = "鏄惁鍙互鎶ュ伐")
private Boolean hasUnreportedMachine;
+
+ private String finalProductModel;
}
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index d999db9..b87c86d 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,
+ t7.model 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,12 @@
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.product_id = po.product_model_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