Merge remote-tracking branch 'origin/master'

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

@@ -195,8 +195,8 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
         for (int i = 0; i <plmTechnicalSpecificationTeams.size() ; i++) {
             technicalSpecificationMapper.saveTechnicalSpecificationTeams(plmTechnicalSpecificationTeams.get(i));
         }
-        PlmProjectInfo plmProjectInfo=projectDao.getProjectData(inData.getSite(),inData.getProjectId());
-        inData.setBuNo(plmProjectInfo.getBuNo());
+        // PlmProjectInfo plmProjectInfo=projectDao.getProjectData(inData.getSite(),inData.getProjectId());
+        inData.setBuNo(checkPart.get(0).getBuNo());
         return inData;
 
     }

src/main/resources/mapper/customer/ProjectInformationMapper.xml

@@ -30,9 +30,7 @@
             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,
-            dbo.get_projectUserRoleName(site,project_id) userRoleName,
-            bu_no,
-            dbo.plm_get_bu_desc(site,bu_no) buDesc
+            dbo.get_projectUserRoleName(site,project_id) userRoleName
         FROM plm_project_info
         WHERE site = #{site} and customer_id = #{customerId}
     </select>

src/main/resources/mapper/quotation/QuotationInformationMapper.xml

@@ -242,7 +242,8 @@
                ppp.product_group_id2,
                dbo.get_product_group_name(ppp.site, ppp.product_group_id2, '2') as productGroupName2,
                ppp.um_id,
-                ppp.type
+                ppp.type,
+                ppp.bu_no
         FROM view_Project_Part as ppp
                  LEFT JOIN plm_project_info as ppi on ppp.site = ppi.site and ppp.project_id = ppi.project_id
         <where>