diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index 51c6873b..e887a172 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -4,7 +4,7 @@ SELECT top 1 a.id,a.site,a.code_no,a.project_id,a.test_part_no,a.status,a.rev_no,a.work_center_no,a.ECN_flag,a.ECN_no,b.bu_no, - a.ECN_address,a.remark,a.create_date,a.create_by,a.update_date,a.update_by,b.final_part_no,dbo.plm_get_projectBaseDesc(b.part_type,'part_type') partTypeDesc, + a.ECN_address,a.remark,a.create_date,a.create_by,a.update_date,a.update_by,b.final_part_no,b.part_type partTypeDesc, b.part_type,b.part_name,b.part_desc,b.part_spec,dbo.plm_get_technicalBaseDesc(a.status,'status') statusDesc,a.proofing_no, dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'engineer') engineer,stage,dbo.plm_get_dictDataLabel('bm_process',process,a.site) process,remarkPage, dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'quotationOfficer') quotationOfficer,c.customer_Id,a.ori_code_no, @@ -113,7 +113,7 @@ a.mpOperator,dbo.get_userDisPlay(a.mpOperator) mpOperatorName ,dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'technician') technician FROM plm_technical_specification_sheet a - left join view_Project_Part b on a.site=b.site and a.project_id=b.project_id and a.test_part_no=b.test_part_no + 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 left join plm_project_info c on a.site=c.site and a.project_id=c.project_id left join plm_request_header as prh on a.site = prh.site and prh.menu_id = '103002' 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 isnull(a.step_id,10)= d.step_id @@ -128,19 +128,19 @@ @@ -193,7 +193,7 @@ b.remark projectRemark,a.remark,a.ori_code_no,a.materialType 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_Part c on a.site=c.site and a.test_part_no=c.test_part_no + left join view_Project_final_Part c on a.site=c.site and a.test_part_no=c.test_part_no where a.site=#{site} and a.code_no =#{codeNo} @@ -843,13 +843,13 @@ id