From 452a0aced57c58103050dfae2828ae31fa048b02 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Thu, 20 Mar 2025 11:15:51 +0800
Subject: [PATCH] 2025-03-20

---
 .../PlmTechnicalSpecificationSheet.java       | 21 ++++
 .../TechnicalSpecificationMapper.xml          | 98 ++++++++++++++-----
 2 files changed, 94 insertions(+), 25 deletions(-)

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 b4735f9f..74912dd9 100644
--- a/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java
+++ b/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java
@@ -128,6 +128,27 @@ public class PlmTechnicalSpecificationSheet extends QueryPage {
     private Integer rejectStepId;
     private String pod;
     private String mpOperator;
+
+    private String rev;
+
+    private String customerRev;
+
+    public String getRev() {
+        return rev;
+    }
+
+    public void setRev(String rev) {
+        this.rev = rev;
+    }
+
+    public String getCustomerRev() {
+        return customerRev;
+    }
+
+    public void setCustomerRev(String customerRev) {
+        this.customerRev = customerRev;
+    }
+
     public Integer getId() {
         return id;
     }
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index 4463727e..a268e707 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -69,7 +69,10 @@
            d.node_id,
            d.node_name,
            pcpi.customer_part_no,
-               dbo.get_plm_Approval_username (a.site, prh.workflow_id,d.node_id,a.code_no) as sp,a.remarkPage
+           dbo.get_plm_Approval_username(a.site, prh.workflow_id, d.node_id, a.code_no) as sp,
+           a.remarkPage,
+           a.rev,
+           a.customer_rev
     FROM plm_technical_specification_sheet a
              left join view_Project_final_Part b
                        on a.site = b.site and a.project_id = b.project_id and a.test_part_no = b.test_part_no
@@ -117,11 +120,11 @@
 <insert id="saveTechnicalSpecificationSheet">
     insert into plm_technical_specification_sheet(site,code_no,project_id,test_part_no,status,rev_no,ECN_flag,ECN_no,ECN_address,remark,
     create_date,create_by,proofing_no,ori_code_no,bom_type,eng_chg_level,bom_alternative_no,routing_type,routing_revision,routing_alternative_no,stage,materialType,step_id
-    ,cqcOperator,faiOperator,peOperater,csOperater,mpOperator)
+    ,cqcOperator,faiOperator,peOperater,csOperater,mpOperator,rev,customer_rev)
      values
       (#{site},#{codeNo},#{projectId},#{testPartNo},#{status},#{revNo},#{ecnFlag},#{ecnNo},#{ecnAddress}
     ,#{remark},GetDate(),#{createBy},#{proofingNo},#{oriCodeNo},#{bomType},#{engChgLevel,jdbcType=INTEGER},#{bomAlternativeNo},#{routingType},#{routingRevision,jdbcType=INTEGER},#{routingAlternativeNo},'Sample','Label',10
-    ,#{cqcOperator},#{faiOperator},#{peOperater},#{csOperater},#{mpOperator})
+    ,#{cqcOperator},#{faiOperator},#{peOperater},#{csOperater},#{mpOperator},#{rev},#{customerRev})
 </insert>
 
 <update id="updateProjectPartNowBm">
@@ -137,7 +140,7 @@
     update plm_technical_specification_sheet set project_id=#{projectId},test_part_no=#{testPartNo},status=#{status}
     ,rev_no=#{revNo},ECN_no=#{ecnNo},ECN_flag=#{ecnFlag},ECN_address=#{ecnAddress},remark=#{remark},update_date=GetDate(),update_by=#{updateBy}
     ,cqcOperator=#{cqcOperator},faiOperator=#{faiOperator},peOperater=#{peOperater},
-    csOperater=#{csOperater},mpOperator=#{mpOperator}
+    csOperater=#{csOperater},mpOperator=#{mpOperator},rev=#{rev},customer_rev=#{customerRev}
     where id=#{id}
 </update>
 
@@ -168,27 +171,72 @@
 </select>
 
 <select id="tsdBasicInformationSearch" resultType="PlmTechnicalSpecificationSheetData">
-     SELECT top 1 a.id,a.site,a.code_no,a.project_id,a.test_part_no,a.status,a.rev_no,a.work_center_no,a.ECN_flag,a.ECN_no,b.bu_no,
-        a.ECN_address,a.remark,a.create_date,a.create_by,a.update_date,a.update_by,b.final_part_no,b.part_type partTypeDesc,
-        b.part_type,b.part_name,b.part_desc,b.part_spec,dbo.plm_get_technicalBaseDesc(a.status,'status') statusDesc,a.proofing_no,
-        dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'engineer') engineer,stage,dbo.plm_get_dictDataLabel('bm_process',process,a.site) process,remarkPage,
-        dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'quotationOfficer') quotationOfficer,c.customer_Id,a.ori_code_no,
-        a.cqcOperator, a.faiOperator,dbo.get_userDisPlay(a.cqcOperator) cqcOperatorName,dbo.get_userDisPlay(a.faiOperator) faiOperatorName
-        ,a.overPrintOperator, a.printOperator,dbo.get_userDisPlay(a.overPrintOperator) overPrintOperatorName,dbo.get_userDisPlay(a.printOperator) printOperatorName
-        ,a.peOperater,dbo.get_userDisPlay(a.peOperater) peOperaterName
-        ,a.csOperater,dbo.get_userDisPlay(a.csOperater) csOperaterName
-        ,isnull(a.step_id,10) stepId,d.is_reject,a.pod, d.node_id, d.node_name,
-        a.mpOperator,dbo.get_userDisPlay(a.mpOperator) mpOperatorName
-        ,dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'technician') technician,
-            dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'engineer')         engineerNo,
-                        dbo.get_technicalSpecificationTeamNames(a.site, a.code_no, 'dcc')         dcc,
-            dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'technician')         technicianNo
-        FROM plm_technical_specification_sheet a
-        left join view_Project_final_Part b on a.site=b.site and a.project_id=b.project_id and a.test_part_no=b.test_part_no
-        left join plm_project_info c on a.site=c.site and a.project_id=c.project_id
-         left join plm_request_header as prh on a.site = prh.site and prh.menu_id = '103002'
-        left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and isnull(a.step_id,10)= d.step_id
-        where a.site=#{site} and a.code_no=#{codeNo}
+    SELECT top 1 a.id,
+                 a.site,
+                 a.code_no,
+                 a.project_id,
+                 a.test_part_no,
+                 a.status,
+                 a.rev_no,
+                 a.work_center_no,
+                 a.ECN_flag,
+                 a.ECN_no,
+                 b.bu_no,
+                 a.ECN_address,
+                 a.remark,
+                 a.create_date,
+                 a.create_by,
+                 a.update_date,
+                 a.update_by,
+                 b.final_part_no,
+                 b.part_type                                                                   partTypeDesc,
+                 b.part_type,
+                 b.part_name,
+                 b.part_desc,
+                 b.part_spec,
+                 dbo.plm_get_technicalBaseDesc(a.status, 'status')                             statusDesc,
+                 a.proofing_no,
+                 dbo.get_technicalSpecificationTeamName(a.site, a.code_no, 'engineer')         engineer,
+                 stage,
+                 dbo.plm_get_dictDataLabel('bm_process', process, a.site)                      process,
+                 remarkPage,
+                 dbo.get_technicalSpecificationTeamName(a.site, a.code_no, 'quotationOfficer') quotationOfficer,
+                 c.customer_Id,
+                 a.ori_code_no,
+                 a.cqcOperator,
+                 a.faiOperator,
+                 dbo.get_userDisPlay(a.cqcOperator)                                            cqcOperatorName,
+                 dbo.get_userDisPlay(a.faiOperator)                                            faiOperatorName,
+                 a.overPrintOperator,
+                 a.printOperator,
+                 dbo.get_userDisPlay(a.overPrintOperator)                                      overPrintOperatorName,
+                 dbo.get_userDisPlay(a.printOperator)                                          printOperatorName,
+                 a.peOperater,
+                 dbo.get_userDisPlay(a.peOperater)                                             peOperaterName,
+                 a.csOperater,
+                 dbo.get_userDisPlay(a.csOperater)                                             csOperaterName,
+                 isnull(a.step_id, 10)                                                         stepId,
+                 d.is_reject,
+                 a.pod,
+                 d.node_id,
+                 d.node_name,
+                 a.mpOperator,
+                 dbo.get_userDisPlay(a.mpOperator)                                             mpOperatorName,
+                 dbo.get_technicalSpecificationTeamName(a.site, a.code_no, 'technician')       technician,
+                 dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'engineer')           engineerNo,
+                 dbo.get_technicalSpecificationTeamNames(a.site, a.code_no, 'dcc')             dcc,
+                 dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'technician')         technicianNo,
+                 a.rev,
+                 a.customer_rev
+    FROM plm_technical_specification_sheet a
+             left join view_Project_final_Part b
+                       on a.site = b.site and a.project_id = b.project_id and a.test_part_no = b.test_part_no
+             left join plm_project_info c on a.site = c.site and a.project_id = c.project_id
+             left join plm_request_header as prh on a.site = prh.site and prh.menu_id = '103002'
+             left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and
+                                                prh.workflow_id = d.workflow_id and isnull(a.step_id, 10) = d.step_id
+    where a.site = #{site}
+      and a.code_no = #{codeNo}
 </select>
 
 <delete id="deleteTechnicalSpecificationList">