From ec8d7cbe79f8c012f0d855e19fee9dc8cd27608f Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 09 一月 2026 16:24:54 +0800
Subject: [PATCH] 1.各生产订单的完成进度统计接口 2.在制品周转情况接口 3.生产报工记录添加上生产时间字段

---
 src/main/resources/mapper/production/ProcessRouteMapper.xml |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index 51aa322..c5e09fc 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -13,12 +13,13 @@
     </resultMap>
 
     <select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
-        select ps.*, pm.speculative_trading_name,pm.product_id
+        select ps.*, p.product_name,pm.product_id,pm.model
         from process_route ps
-                 left join product_model pm on ps.product_model_id = pm.id
+        left join product_model pm on ps.product_model_id = pm.id
+        left join product p on pm.product_id = p.id
         <where>
-            <if test="c.speculativeTradingName != null || c.speculativeTradingName != ''">
-                and pm.speculative_trading_name like concat('%',#{c.speculativeTradingName},'%')
+            <if test="c.model != null and c.model != ''">
+                and pm.model like concat('%',#{c.model},'%')
             </if>
         </where>
         order by ps.id asc

--
Gitblit v1.9.3