1127

src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java

@@ -24,6 +24,7 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio
     private String username;
     private String finalCustomerNo;
     private String finalCustomerDesc;
+    private String customerDesc;
     private String partNo;
     private String partFamily;
     private String materialNumber;
@@ -31,8 +32,8 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio
     private String projectRemark;
     private String buNo;
     private String buDesc;
-
-
+    private String proofingNo;
+    private String projectName;
     public String getPartType() {
         return partType;
     }
@@ -224,4 +225,30 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio
     public void setBuDesc(String buDesc) {
         this.buDesc = buDesc;
     }
+
+    public String getCustomerDesc() {
+        return customerDesc;
+    }
+
+    public void setCustomerDesc(String customerDesc) {
+        this.customerDesc = customerDesc;
+    }
+
+    @Override
+    public String getProofingNo() {
+        return proofingNo;
+    }
+
+    @Override
+    public void setProofingNo(String proofingNo) {
+        this.proofingNo = proofingNo;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
 }

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

@@ -52,7 +52,7 @@
 </insert>
 
 <update id="updateTechnicalSpecificationSheet">
-    update plm_technical_specification_sheet set project_id=#{projectId},test_part_no=#{testPartNo},status=#{status},stage=#{stage},
+    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} where id=#{id}
 </update>
 
@@ -114,13 +114,16 @@
 </select>
 
 <select id="getProofingDataByUserRole" resultType="PlmTechnicalSpecificationSheetData">
-    SELECT site,proofing_no,project_id,test_part_no,dbo.plm_get_test_part_name(site,test_part_no) partName,dbo.plm_get_test_part_desc(site, test_part_no) partDesc
-    from plm_proofing_information
+    SELECT a.site,a.proofing_no,a.project_id,a.test_part_no,dbo.plm_get_test_part_name(a.site,a.test_part_no) partName,dbo.plm_get_test_part_desc(a.site, a.test_part_no) partDesc
+    ,b.customer_id,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
+    from plm_proofing_information a left join plm_project_info b on a.site=b.site and a.project_id=b.project_id
+
      <where>
-     and site=#{site}
-     AND project_id in ( select project_id from AccessProject where site=#{site} and username=#{username} and searchFlag='Y' )
+     and a.site=#{site}
+     AND a.project_id in ( select project_id from AccessProject where site=#{site} and username=#{username} and searchFlag='Y' )
      <if test="proofingNo!= null and proofingNo != ''">
-                AND proofing_no like #{proofingNo}
+                AND a.proofing_no like #{proofingNo}
       </if>
      </where>
 </select>
@@ -132,7 +135,7 @@
 
 <select id="searchBMcustomerInfo" resultType="PlmTechnicalSpecificationSheetData">
     select a.site,a.code_no,a.picture_addess,a.customerPictureChangeRemark,a.productionFileComments,
-    b.customer_id finalCustomerNo,dbo.plm_get_customer_desc(a.site,b.customer_id) finalCustomerDesc,
+    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,
     b.remark projectRemark,a.remark,a.ori_code_no,a.materialType
     from plm_technical_specification_sheet a