2025-03-27

src/main/java/com/spring/modules/project/dao/ProjectDao.java

@@ -253,4 +253,6 @@ public interface ProjectDao extends BaseMapper<PlmProjectInfo> {
                                                        @Param("projectName")String projectName,
                                                        @Param("username")String username,
                                                        @Param("customerId")String customerId);
+
+    void updateProjectFinalCustomerNo(PlmProjectInfoData project);
 }

src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java

@@ -133,6 +133,16 @@ public class PlmTechnicalSpecificationSheet extends QueryPage {
 
     private String customerRev;
 
+    private String relevancePartNo;
+
+    public String getRelevancePartNo() {
+        return relevancePartNo;
+    }
+
+    public void setRelevancePartNo(String relevancePartNo) {
+        this.relevancePartNo = relevancePartNo;
+    }
+
     public String getRev() {
         return rev;
     }

src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

@@ -159,6 +159,9 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
             inData.setOriCodeNo(codeId);
             inData.setCreateBy(sysUserEntity.getUsername());
             inData.setStatus("cg");
+            if (StringUtils.isEmpty(inData.getCertification())){
+                inData.setCertification("RoHs");
+            }
             technicalSpecificationMapper.saveTechnicalSpecificationSheet(inData);
             technicalSpecificationMapper.updateProjectPartNowBm(inData);
 
@@ -310,9 +313,15 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
     }
 
     @Override
+    @Transactional
     public void updateBMcustomerInfo(PlmTechnicalSpecificationSheetData data){
         SysUserEntity sysUserEntity = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
         data.setUpdateBy(sysUserEntity.getUsername());
+        PlmProjectInfoData project = new PlmProjectInfoData();
+        project.setSite(data.getSite());
+        project.setProjectId(data.getProjectId());
+        project.setFinalCustomerId(data.getFinalCustomerNo());
+        projectDao.updateProjectFinalCustomerNo(project);
         technicalSpecificationMapper.updateBMcustomerInfo(data);
     }
 

src/main/resources/mapper/project/ProjectDao.xml

@@ -764,4 +764,8 @@ update_by,update_date,priority,site,id,project_desc,customer_remark,remark,need_
         </where>
         order by LEFT(project_id, CHARINDEX('-', project_id + '-') - 1) desc
     </select>
+
+    <update id="updateProjectFinalCustomerNo">
+        update plm_project_info set final_customer_id = #{finalCustomerId} where site = #{site} and project_id = #{projectId}
+    </update>
 </mapper>

src/main/resources/mapper/quote/QuoteDetailMapper.xml

@@ -317,7 +317,7 @@
             <if test="partNo != null and partNo != ''">
                 and qd.part_no = #{partNo}
             </if>
-            order by qd.part_no
         </where>
+        order by qd.part_no
     </select>
 </mapper>

src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml

@@ -313,8 +313,8 @@
             <if test="partNo != null and partNo != ''">
                 and qd.part_no = #{partNo}
             </if>
-            order by qd.part_no
         </where>
+        order by qd.part_no
     </select>
 
     <update id="updateQuoteGroupDetailIsNull">

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

@@ -233,7 +233,8 @@
                  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
+                 a.customer_rev,
+                 relevance_part_no
     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
@@ -306,32 +307,78 @@
      </where>
 </select>
 <update  id="updateBMBasicInformation" >
-    update plm_technical_specification_sheet set status=#{status},stage=#{stage},remarkPage=#{remarkPage}
-    ,rev_no=#{revNo},ECN_no=#{ecnNo},ECN_flag=#{ecnFlag},ECN_address=#{ecnAddress},cqcOperator=#{cqcOperator},update_date=GetDate(),update_by=#{updateBy}
-    ,faiOperator=#{faiOperator},peOperater=#{peOperater},csOperater=#{csOperater},pod=#{pod},mpOperator=#{mpOperator}
-    where site=#{site} and  code_no=#{codeNo}
+    update plm_technical_specification_sheet
+    set status=#{status}
+      , stage=#{stage}
+      , remarkPage=#{remarkPage}
+      , rev_no=#{revNo}
+      , ECN_no=#{ecnNo}
+      , ECN_flag=#{ecnFlag}
+      , ECN_address=#{ecnAddress}
+      , cqcOperator=#{cqcOperator}
+      , update_date=GetDate()
+      , update_by=#{updateBy}
+      , faiOperator=#{faiOperator}
+      , peOperater=#{peOperater}
+      , csOperater=#{csOperater}
+      , pod=#{pod}
+      , mpOperator=#{mpOperator}
+      , relevance_part_no=#{relevancePartNo}
+    where site = #{site}
+      and code_no = #{codeNo}
 </update>
 
 <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_dictDataLabel('finalCustomer',b.final_customer_id,a.site) 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
+    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_dictDataLabel('finalCustomer', b.final_customer_id, a.site) 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,
+           b.project_id,
+           pcpi.customer_part_no
     from plm_technical_specification_sheet a
-    left join plm_project_info b on a.site=b.site and a.project_id=b.project_id
-    left join view_Project_final_Part c on a.site=c.site and a.test_part_no=c.test_part_no  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 b.customer_id = pcpi.customer_no
-    where a.site=#{site} and a.code_no =#{codeNo}
+             left join plm_project_info b on a.site = b.site and a.project_id = b.project_id
+             left join view_Project_final_Part c
+                       on a.site = c.site and a.test_part_no = c.test_part_no 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 b.customer_id = pcpi.customer_no
+    where a.site = #{site}
+      and a.code_no = #{codeNo}
 </select>
 
 <update id="updateBMcustomerInfo">
-    update plm_technical_specification_sheet set picture_Addess=#{pictureAddess},materialType=#{materialType},
-    customerPictureChangeRemark=#{customerPictureChangeRemark},productionFileComments
-    =#{productionFileComments},remark=#{remark},update_date=GetDate(),update_by=#{updateBy}
-    ,certification=#{certification},customerRevNo=#{customerRevNo},materialNumber=#{materialNumber},customerRemark=#{customerRemark},projectRemark=#{projectRemark}
-    where site=#{site} and code_no=#{codeNo}
+    update plm_technical_specification_sheet
+    set picture_Addess=#{pictureAddess},
+        materialType=#{materialType},
+        customerPictureChangeRemark=#{customerPictureChangeRemark},
+        productionFileComments =#{productionFileComments},
+        remark=#{remark},
+        update_date=GetDate(),
+        update_by=#{updateBy},
+        certification=#{certification},
+        customerRevNo=#{customerRevNo},
+        materialNumber=#{materialNumber},
+        customerRemark=#{customerRemark},
+        projectRemark=#{projectRemark}
+    where site = #{site}
+      and code_no = #{codeNo}
 </update>
 
 <select id="searchBMPackageInfo" resultType="PlmBmPackageInfoData">