From e5f8681fb0ae93d91753f6cef64b76cdd2d4d01b Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Fri, 23 May 2025 17:04:24 +0800
Subject: [PATCH] 2025-05-23

---
 .../PlmTechnicalSpecificationSheetData.java   | 28 ----------------
 .../PlmTechnicalSpecificationSheet.java       | 32 +++++++++++++++++++
 .../TechnicalSpecificationMapper.xml          |  6 +++-
 3 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java
index 4e14bbed..9ddfcd24 100644
--- a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java
+++ b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java
@@ -72,10 +72,6 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio
     private String plmPartNo;
     private String partSpec;
 
-    // 2025-05-22要求新增
-    private String ecnUpgradeVersion;
-    private String ecnUpgradeFlag;
-    private String ecnNeedChangeDrawing;
 
     /**
      * CQC人员多选
@@ -87,30 +83,6 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio
      */
     private List<String> faiOperatorList;
 
-    public String getEcnUpgradeFlag() {
-        return ecnUpgradeFlag;
-    }
-
-    public void setEcnUpgradeFlag(String ecnUpgradeFlag) {
-        this.ecnUpgradeFlag = ecnUpgradeFlag;
-    }
-
-    public String getEcnUpgradeVersion() {
-        return ecnUpgradeVersion;
-    }
-
-    public void setEcnUpgradeVersion(String ecnUpgradeVersion) {
-        this.ecnUpgradeVersion = ecnUpgradeVersion;
-    }
-
-    public String getEcnNeedChangeDrawing() {
-        return ecnNeedChangeDrawing;
-    }
-
-    public void setEcnNeedChangeDrawing(String ecnNeedChangeDrawing) {
-        this.ecnNeedChangeDrawing = ecnNeedChangeDrawing;
-    }
-
     public List<String> getCqcOperatorList() {
         return cqcOperatorList;
     }
diff --git a/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java b/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java
index 47e7bf93..f467c0da 100644
--- a/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java
+++ b/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java
@@ -135,6 +135,38 @@ public class PlmTechnicalSpecificationSheet extends QueryPage {
 
     private String relevancePartNo;
 
+
+    // 2025-05-22要求新增
+    private String ecnUpgradeVersion;
+    private String ecnUpgradeFlag;
+    private String ecnNeedChangeDrawing;
+
+
+
+    public String getEcnUpgradeFlag() {
+        return ecnUpgradeFlag;
+    }
+
+    public void setEcnUpgradeFlag(String ecnUpgradeFlag) {
+        this.ecnUpgradeFlag = ecnUpgradeFlag;
+    }
+
+    public String getEcnUpgradeVersion() {
+        return ecnUpgradeVersion;
+    }
+
+    public void setEcnUpgradeVersion(String ecnUpgradeVersion) {
+        this.ecnUpgradeVersion = ecnUpgradeVersion;
+    }
+
+    public String getEcnNeedChangeDrawing() {
+        return ecnNeedChangeDrawing;
+    }
+
+    public void setEcnNeedChangeDrawing(String ecnNeedChangeDrawing) {
+        this.ecnNeedChangeDrawing = ecnNeedChangeDrawing;
+    }
+
     public String getRelevancePartNo() {
         return relevancePartNo;
     }
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index 33f802c7..367e24dd 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -2168,7 +2168,11 @@
                reject_flag,
                reject_step_id,
                mpOperator,
-               pod
+               pod,
+               relevance_part_no,
+               ecn_upgrade_version,
+               ecn_need_change_drawing,
+               ecn_upgrade_flag
         FROM plm_technical_specification_sheet a
         where a.site = #{site}
           and a.code_no = #{codeNo}