Merge remote-tracking branch 'origin/master'

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 ecnNeedChangeDrawing;
 
     /**
      * CQC人员多选
@@ -87,22 +83,6 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio
      */
     private List<String> faiOperatorList;
 
-    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;
     }

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;
     }

src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@@ -372,6 +372,7 @@
         a.customer_rev,
         relevance_part_no,
         a.ecn_upgrade_version,
+        a.ecn_upgrade_flag,
         a.ecn_need_change_drawing
         FROM plm_technical_specification_sheet a
                  left join view_Project_final_Part b
@@ -2167,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}