2024-09-02 MES-关于上位机三个报表-产线编码改为产线名称

op-modules/op-mes/src/main/java/com/op/mes/domain/MesInspectionReport.java

@@ -68,6 +68,9 @@ public class MesInspectionReport extends BaseEntity {
     //项目名
     private String projectName;
 
+    //线体名
+    private String lineName;
+
     //开线
     private String openLine;
     //清换线
@@ -150,4 +153,7 @@ public class MesInspectionReport extends BaseEntity {
 
     public void setTeam(String team) { this.team = team; }
     public String getTeam() { return team; }
+
+    public void setLineName(String lineName) { this.lineName = lineName; }
+    public String getLineName() { return lineName; }
 }

op-modules/op-mes/src/main/resources/mapper/mes/MesInspectionReportMapper.xml

@@ -34,6 +34,7 @@
         <result property="equipmentName" column="equipment_name"/>
 
         <result property="projectName" column="project_name"/>
+        <result property="lineName" column="line_name"/>
 
     </resultMap>
 
@@ -126,6 +127,7 @@
     <select id="selectSelfMutualInspectionData" resultMap="MesInspectionReportResult" parameterType="MesInspectionReport">
         select top 1
             mts.line_code,
+            be.equipment_name as line_name,
             mts.product_date,
             mts.product_code,
             mts.product_name,
@@ -134,6 +136,7 @@
             mts.remark,
             mts.create_by
         from mes_table_self mts
+        left join base_equipment be on mts.line_code = be.equipment_code
         <where>
             and mts.report_name = #{reportName}
             and mts.del_flag = '0'