From 58d2aa0a4d75b658b7e0b247c70837ee1f275526 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 2 Sep 2024 16:24:10 +0800
Subject: [PATCH] =?UTF-8?q?2024-09-02=20MES-=E5=85=B3=E4=BA=8E=E4=B8=8A?=
 =?UTF-8?q?=E4=BD=8D=E6=9C=BA=E4=B8=89=E4=B8=AA=E6=8A=A5=E8=A1=A8-?=
 =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E7=BC=96=E7=A0=81=E6=94=B9=E4=B8=BA=E4=BA=A7?=
 =?UTF-8?q?=E7=BA=BF=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/op/mes/domain/MesInspectionReport.java    | 6 ++++++
 .../main/resources/mapper/mes/MesInspectionReportMapper.xml | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesInspectionReport.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesInspectionReport.java
index 891a61ff..2cc55298 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesInspectionReport.java
+++ b/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; }
 }
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesInspectionReportMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesInspectionReportMapper.xml
index c35eb9f9..b560f3ab 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesInspectionReportMapper.xml
+++ b/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'