From f3048643ec3cfb07a1d9223c0beaecf21a091400 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 13 Jan 2026 18:13:47 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=8A=A0=E5=85=B3=E8=81=94=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/bo/ProdProductPlanDetailBo.java    |  5 ++++
 .../domain/vo/ProdProductPlanDetailVo.java    | 25 +++++++++++++++++++
 .../ProdProductPlanDetailServiceImpl.java     |  1 +
 .../mes/ProdProductPlanDetailMapper.xml       | 11 +++++++-
 4 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdProductPlanDetailBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdProductPlanDetailBo.java
index 5d65e737..69f73e71 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdProductPlanDetailBo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdProductPlanDetailBo.java
@@ -176,6 +176,11 @@ public class ProdProductPlanDetailBo extends BaseEntity {
      */
     private Long workshopId;
 
+    /**
+     * 工位ID
+     */
+    private Long stationId;
+
     /**
      * 余料数量
      */
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdProductPlanDetailVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdProductPlanDetailVo.java
index d2b4525d..216df51a 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdProductPlanDetailVo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdProductPlanDetailVo.java
@@ -217,4 +217,29 @@ public class ProdProductPlanDetailVo implements Serializable {
 
     private String teamName;//JOIN
 
+    /**
+     * 产品名称
+     */
+    private String materialName;
+
+    /**
+     * 工序名称
+     */
+    private String processName;
+
+    /**
+     * 工位ID
+     */
+    private Long stationId;
+
+    /**
+     * 工位名称
+     */
+    private String stationName;
+
+    /**
+     * 报工人
+     */
+    private String reportUser;
+
 }
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdProductPlanDetailServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdProductPlanDetailServiceImpl.java
index 0906dc1d..c67214d4 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdProductPlanDetailServiceImpl.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdProductPlanDetailServiceImpl.java
@@ -124,6 +124,7 @@ public class ProdProductPlanDetailServiceImpl implements IProdProductPlanDetailS
             .eq(StringUtils.isNotBlank(bo.getFirstFlag()), ProdProductPlanDetail::getFirstFlag, bo.getFirstFlag())
             .eq(StringUtils.isNotBlank(bo.getAlarmFlag()), ProdProductPlanDetail::getAlarmFlag, bo.getAlarmFlag())
             .eq(StringUtils.isNotBlank(bo.getSuppleFlag()), ProdProductPlanDetail::getSuppleFlag, bo.getSuppleFlag())
+            .eq(StringUtils.isNotNull(bo.getStationId()), "t7.station_id", bo.getStationId())
             .orderByDesc(ProdProductPlanDetail::getCreateTime);
         return lqw;
     }
diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdProductPlanDetailMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdProductPlanDetailMapper.xml
index 83011faf..1a51e178 100644
--- a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdProductPlanDetailMapper.xml
+++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdProductPlanDetailMapper.xml
@@ -11,11 +11,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         t1.tooling_name,
         t2.shift_name,
-        t3.team_name
+        t3.team_name,
+        t5.material_name materialName,
+        t6.process_name  processName,
+        t7.station_name  stationName,
+        t8.user_name     reportUser
         FROM ${tableName} t
         LEFT JOIN base_tooling_info t1 ON t.tooling_id = t1.tooling_id
         LEFT JOIN base_shift_info t2 ON t.shift_id = t2.shift_id
         LEFT JOIN base_class_team_info t3 ON t.class_team_id = t3.class_team_id
+        LEFT JOIN prod_plan_info t4 ON t4.plan_id = t.plan_id
+        LEFT JOIN base_material_info t5 ON t5.material_id = t4.material_id
+        LEFT JOIN prod_base_process_info t6 ON t6.process_id = t4.process_id
+        LEFT JOIN prod_base_station_info t7 ON t7.station_id = t4.release_id
+        LEFT JOIN sys_user t8 ON t8.user_id = t4.create_by
         ${ew.getCustomSqlSegment}
     </select>