From dbb4e1eb2d18b330e20a31519cf4ae4168d03069 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 31 Oct 2024 17:57:53 +0800
Subject: [PATCH] 1127

---
 .../data/PlmProjectToolApplyDetailData.java       | 15 +++++++++------
 .../data/PlmProjectToolApplyHeaderData.java       |  2 +-
 .../mapper/Tooling/ProjectToolingApplyMapper.xml  | 12 ++++++++++--
 .../TechnicalSpecificationMapper.xml              |  9 ++++++---
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyDetailData.java b/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyDetailData.java
index feab4717..01d43674 100644
--- a/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyDetailData.java
+++ b/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyDetailData.java
@@ -7,10 +7,13 @@ import org.apache.ibatis.type.Alias;
 @Data
 @Alias("PlmProjectToolApplyDetailData")
 public class PlmProjectToolApplyDetailData extends PlmProjectToolApplyDetail {
-    public String toolDesc;
-    public String operationName;
-    public String operationNo;
-    public String customerPartNo;
-    public String partDesc;
-    public String ifsPartNo;
+    private String toolDesc;
+    private String operationName;
+    private String operationNo;
+    private String customerPartNo;
+    private String partDesc;
+    private String ifsPartNo;
+    private String nodeId;
+    private String nodeName;
+    private String sp;
 }
diff --git a/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java b/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java
index 7bda7b33..d97d7be2 100644
--- a/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java
+++ b/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java
@@ -33,6 +33,6 @@ public class PlmProjectToolApplyHeaderData extends PlmProjectToolApplyHeader {
     private String isReject;
     private String nodeId;
     private String nodeName;
-
+    private String sp;
 
 }
diff --git a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
index aa1582c1..6d2a7847 100644
--- a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
+++ b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
@@ -168,7 +168,8 @@
             a.totalCost,
             d.is_reject,
             d.node_id,
-            d.node_name
+            d.node_name,
+           d.create_by as sp
         FROM plm_project_tool_applyHeader a
         left join plm_request_header as prh on a.site = prh.site and prh.menu_id = '106002'
         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 a.step_id = d.step_id
@@ -216,12 +217,19 @@
                b.operation_name,
                 g.customer_part_no,
                 h.part_desc,
-                h.final_part_no  ifs_part_no
+                h.final_part_no  ifs_part_no,
+            d.node_id,
+            d.node_name,
+           d.create_by as sp
         from plm_project_tool_applyDetail a
          left join plm_routing_component b on a.site = b.site and a.orderRef6 = convert(varchar(20), b.operation_id)
          left join plm_project_info f on a.site=f.site and a.orderRef1=f.project_id
          left join plm_customer_part_info g on a.site=g.site and f.customer_id=g.customer_no and a.orderRef2 =g.part_no
          left join view_Project_Part h on b.site=h.site and a.orderRef2=h.test_part_no and a.orderRef1=h.project_id
+         left join plm_project_tool_applyHeader j on a.site=j.site and a.apply_no=j.apply_no
+              left join plm_request_header as prh on a.site = prh.site and prh.menu_id = '106002'
+        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 j.step_id = d.step_id
+
         <where>
             <if test="site != null and site != ''">
                 AND a.site = #{site}
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index c7c51099..4630738e 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -68,7 +68,8 @@
            d.is_reject,
            d.node_id,
            d.node_name,
-           pcpi.customer_part_no
+           pcpi.customer_part_no,
+               d.create_by as sp
     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
@@ -216,10 +217,11 @@
         b.final_customer_id,
         dbo.plm_get_customer_desc(a.site,b.customer_id) CustomerDesc,
         dbo.plm_get_customer_desc(a.site,b.final_customer_id) finalCustomerDesc,
-        b.project_name
+        b.project_name,d.bu_no
      from plm_proofing_information a
      left join plm_project_info b on a.site = b.site and a.project_id = b.project_id
      left join part as c on a.site = c.site and a.test_part_no = c.part_no
+     left join plm_project_part d on a.site = d.site and a.test_part_no = d.test_part_no
      <where>
          and a.site=#{site}
          AND a.project_id in ( select project_id from AccessProject where site=#{site} and username=#{username} and searchFlag='Y' )
@@ -247,6 +249,7 @@
 
 <select id="searchBMcustomerInfo" resultType="PlmTechnicalSpecificationSheetData">
     select a.site,a.code_no,a.picture_addess,a.customerPictureChangeRemark,a.productionFileComments,
+    b.customer_id,dbo.plm_get_customer_desc(b.site,b.customer_id) CustomerDesc,
     b.final_customer_id finalCustomerNo,dbo.plm_get_customer_desc(a.site,b.final_customer_id) finalCustomerDesc,
     a.test_part_no as part_no,c.part_desc,c.material_number,c.part_type as part_family,b.customer_remark,
     a.remark,a.ori_code_no,a.materialType,a.customerRevNo,a.materialNumber,a.certification,a.customerRemark,a.projectRemark,pcpi.customer_part_no
@@ -1056,7 +1059,7 @@ step_id,reject_flag,reject_step_id,mpOperator,pod
     </select>
 
     <select id="getFinalPartData"   resultType="PlmProjectPartData">
-        Select a.Final_Part_No,a.Test_part_no,a.Active, a.Part_desc ,a.project_id,pcpi.customer_part_no
+        Select a.Final_Part_No,a.Test_part_no,a.Active, a.Part_desc ,a.project_id,pcpi.customer_part_no,a.bu_no
         from view_Project_final_Part a
                  left join plm_project_info c on a.site = c.site and a.project_id = c.project_id
                  left join plm_customer_part_info pcpi on a.site = pcpi.site and a.test_part_no = pcpi.part_no and c.customer_id = pcpi.customer_no