1127

src/main/java/com/spring/modules/project/entity/PlmProjectInfo.java

@@ -25,7 +25,7 @@ public class PlmProjectInfo extends QueryPage {
      * 项目类型编码
      */
     private String projectTypeDb;
-
+    private String customerProjectNo;
     /**
      * 项目名称
      */
@@ -281,5 +281,13 @@ public class PlmProjectInfo extends QueryPage {
     public void setFinalCustomerId(String finalCustomerId) {
         this.finalCustomerId = finalCustomerId;
     }
+
+    public String getCustomerProjectNo() {
+        return customerProjectNo;
+    }
+
+    public void setCustomerProjectNo(String customerProjectNo) {
+        this.customerProjectNo = customerProjectNo;
+    }
 }
 

src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml

@@ -31,7 +31,7 @@
                dbo.get_projectUserRoleName(site, project_id)                            userRoleName,
                parent_project_no,
                final_customer_id,
-               dbo.plm_get_customer_desc(site, final_customer_id)                       finalCustomerName
+               dbo.plm_get_dictDataLabel('finalCustomer',final_customer_id,site)                       finalCustomerName
         FROM plm_project_info
         <where>
             <!--            and dbo.plm_get_projectBaseDesc(status,'project_status') !='未发布'-->

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

@@ -10,7 +10,7 @@
         dbo.plm_get_projectBaseDesc(status,'project_status') projectStatusDesc,dbo.plm_get_dictDataLabel('project_info_source',project_source,site) projectSourceDesc,
         dbo.plm_get_customer_desc(site,customer_id) customerName,dbo.plm_get_dictDataLabel('project_info_priority',priority,site) priorityDesc,need_date,
         dbo.get_projectUserRoleName(site,project_id) userRoleName,parent_project_no,
-        final_customer_id,dbo.plm_get_customer_desc(site,final_customer_id) finalCustomerName
+        final_customer_id,dbo.plm_get_dictDataLabel('finalCustomer',final_customer_id,site) finalCustomerName
         FROM plm_project_info
         <where>
             <if test="site != null and site != ''">
@@ -35,12 +35,15 @@
         ,dbo.get_projectTeamName(site,project_id,'manager') ProjectManagerName,dbo.plm_get_dictDataLabel('project_info_type_db',project_type_db,site) projectType,
         dbo.plm_get_projectBaseDesc(status,'project_status') projectStatusDesc,dbo.plm_get_dictDataLabel('project_info_source',project_source,site) projectSourceDesc,
         dbo.plm_get_customer_desc(site,customer_id) customerName,dbo.plm_get_dictDataLabel('project_info_priority',priority,site) priorityDesc,need_date,
-        dbo.get_projectUserRoleName(site,project_id) userRoleName,parent_project_no,
-        final_customer_id,dbo.plm_get_customer_desc(site,final_customer_id) finalCustomerName
+        dbo.get_projectUserRoleName(site,project_id) userRoleName,parent_project_no,customer_project_no,
+        final_customer_id,dbo.plm_get_dictDataLabel('finalCustomer',final_customer_id,site) finalCustomerName
         FROM plm_project_info
         <where>
              <if test="query.id != null">
                 AND id = #{query.id}
+            </if>
+              <if test="query.customerProjectNo != null and query.customerProjectNo != ''">
+                AND customer_project_no like #{query.customerProjectNo}
             </if>
             <if test="query.site != null and query.site != ''">
                 AND site = #{query.site}
@@ -123,17 +126,18 @@
 <insert id="saveProjectInfo">
     insert into plm_project_info
     (project_id,ori_project_id,project_type_db,project_name,status,project_source,customer_id,create_by,
-    create_date,priority,site,project_desc,customer_remark,remark,need_date,parent_project_no,final_customer_id) values
+    create_date,priority,site,project_desc,customer_remark,remark,need_date,parent_project_no,final_customer_id,
+    customer_Project_No) values
     (#{projectId},#{projectId},#{projectTypeDb},#{projectName},#{status},#{projectSource},#{customerId},
     #{createBy},GetDate(),#{priority},#{site},#{projectDesc},#{customerRemark},#{remark},#{needDate},#{parentProjectNo}
-    ,#{finalCustomerId})
+    ,#{finalCustomerId},#{customerProjectNo})
 
 </insert>
 <update id="updateProjectInfo">
     update plm_project_info set project_type_db=#{projectTypeDb},project_name=#{projectName},project_source=#{projectSource},status=#{status},
     customer_id=#{customerId},priority=#{priority},project_desc=#{projectDesc},customer_remark=#{customerRemark},remark=#{remark},need_date=#{needDate},
     update_by=#{updateBy},update_date=GetDate(),parent_project_no = #{parentProjectNo},final_customer_id=#{finalCustomerId}
-    where id=#{id}
+    ,customer_Project_No=#{customerProjectNo} where id=#{id}
 </update>
 <delete id="deletePlmProjectTeam">
     delete from plm_project_team where site=#{site} and project_id=#{projectId}
@@ -549,7 +553,7 @@ update_by,update_date,priority,site,id,project_desc,customer_remark,remark,need_
         select project_id,
                project_name,
                final_customer_id,
-               dbo.plm_get_customer_desc(site, final_customer_id) finalCustomerName
+               dbo.plm_get_dictDataLabel('finalCustomer',final_customer_id,site) finalCustomerName
         from plm_project_info
         where site = #{site}
           and project_id = #{projectId}

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

@@ -216,7 +216,7 @@
         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,
+        dbo.plm_get_dictDataLabel('finalCustomer',b.final_customer_id,a.site)  finalCustomerDesc,
         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
@@ -250,7 +250,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,
+    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
     from plm_technical_specification_sheet a