From 1d77494d9d96c1c27dc4c4aa56fe28f30377ef0e Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Wed, 15 Oct 2025 09:33:45 +0800
Subject: [PATCH] =?UTF-8?q?change(mes):=E5=B7=A5=E6=97=B6=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E4=BD=BF=E7=94=A8=E8=AE=A1=E5=88=92=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5(plan=5Fcode)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将派工单字段(dispatch_code)更正为计划编号字段(plan_code)
- 更新实体WorkHourReportVo类中的字段注释和Excel导出属性
-保持查询逻辑与实际业务字段一致
---
 .../java/org/dromara/mes/domain/vo/WorkHourReportVo.java  | 8 ++++----
 .../src/main/resources/mapper/mes/ProdReportMapper.xml    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/WorkHourReportVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/WorkHourReportVo.java
index 18952535..54f86cf6 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/WorkHourReportVo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/WorkHourReportVo.java
@@ -22,10 +22,10 @@ public class WorkHourReportVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 派工单
+     * 使用计划编号planCode展示
      */
-    @ExcelProperty(value = "派工单")
-    private String dispatchCode;
+    @ExcelProperty(value = "编号")
+    private String planCode;
 
     /**
      * 班组
@@ -87,4 +87,4 @@ public class WorkHourReportVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
-}
\ No newline at end of file
+}
diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdReportMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdReportMapper.xml
index 59042678..b8759321 100644
--- a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdReportMapper.xml
+++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdReportMapper.xml
@@ -229,7 +229,7 @@
                 AND ppd.class_team_id = #{map.classTeamId}
             </if>
             <if test="map.planCode != null and map.planCode != ''">
-                AND ppi.dispatch_code LIKE CONCAT('%', #{map.planCode}, '%')
+                AND ppi.plan_code LIKE CONCAT('%', #{map.planCode}, '%')
             </if>
             <if test="map.materialName != null and map.materialName != ''">
                 AND bmi.material_name LIKE CONCAT('%', #{map.materialName}, '%')
@@ -243,7 +243,7 @@
 
     <select id="workHourReportList" resultType="org.dromara.mes.domain.vo.WorkHourReportVo">
         SELECT
-            ppi.dispatch_code        AS dispatchCode,
+            ppi.plan_code            AS planCode,
             bct.team_name            AS teamName,
             pbsi.station_name        AS stationName,
             bmi.material_name        AS materialName,
@@ -286,7 +286,7 @@
                 AND ppd.class_team_id = #{map.classTeamId}
             </if>
             <if test="map.planCode != null and map.planCode != ''">
-                AND ppi.dispatch_code LIKE CONCAT('%', #{map.planCode}, '%')
+                AND ppi.plan_code LIKE CONCAT('%', #{map.planCode}, '%')
             </if>
             <if test="map.materialName != null and map.materialName != ''">
                 AND bmi.material_name LIKE CONCAT('%', #{map.materialName}, '%')