From 35a8e2f73dd2a959409d07b1bd657580662b6956 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 24 三月 2026 13:03:44 +0800
Subject: [PATCH] feat: 根据产品规格获取产品名称

---
 src/main/resources/mapper/production/ProductOrderMapper.xml |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index ed6c187..c758af7 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -49,7 +49,8 @@
         pb.bom_no AS bomNo,
         ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus,
         pms.model,
-        pms.material_code AS materialCode
+        pms.material_code AS materialCode,
+        pms.id AS productId
         FROM product_order po
         LEFT JOIN process_route pr ON po.route_id = pr.id
         LEFT JOIN product_bom pb ON pr.bom_id = pb.id
@@ -68,9 +69,23 @@
             <if test="c.startTime != null and c.endTime != null">
                 AND po.create_time BETWEEN #{c.startTime} AND #{c.endTime}
             </if>
+            <if test="c.status != null">
+                AND po.status = #{c.status}
+            </if>
+            <if test="c.productName != null and c.productName != ''">
+                AND pm.product_name LIKE CONCAT('%', #{c.productName}, '%')
+            </if>
+            <if test="c.materialCode != null and c.materialCode != ''">
+                AND pms.material_code LIKE CONCAT('%', #{c.materialCode}, '%')
+            </if>
+            <if test="c.model != null and c.model != ''">
+                AND pms.model LIKE CONCAT('%', #{c.model}, '%')
+            </if>
+            <if test="c.strength != null and c.strength != ''">
+                AND po.strength = #{c.strength}
+            </if>
         </where>
     </select>
-
     <select id="listProcessRoute" resultType="com.ruoyi.production.pojo.ProcessRoute">
         select pr.*
         from process_route pr

--
Gitblit v1.9.3