diff --git a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java index 4b852771..49b28923 100644 --- a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java +++ b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java @@ -34,6 +34,8 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio private String buDesc; private String proofingNo; private String projectName; + private String cqcOperatorName; + private String faiOperatorName; public String getPartType() { return partType; } @@ -251,4 +253,20 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio public void setProjectName(String projectName) { this.projectName = projectName; } + + public String getCqcOperatorName() { + return cqcOperatorName; + } + + public void setCqcOperatorName(String cqcOperatorName) { + this.cqcOperatorName = cqcOperatorName; + } + + public String getFaiOperatorName() { + return faiOperatorName; + } + + public void setFaiOperatorName(String faiOperatorName) { + this.faiOperatorName = faiOperatorName; + } } diff --git a/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java b/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java index a84a5c33..c093cace 100644 --- a/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java +++ b/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java @@ -111,6 +111,8 @@ public class PlmTechnicalSpecificationSheet extends QueryPage { private String process; private String stage; + private String cqcOperator; + private String faiOperator; public Integer getId() { return id; @@ -359,5 +361,21 @@ public class PlmTechnicalSpecificationSheet extends QueryPage { public void setMaterialType(String materialType) { this.materialType = materialType; } + + public String getCqcOperator() { + return cqcOperator; + } + + public void setCqcOperator(String cqcOperator) { + this.cqcOperator = cqcOperator; + } + + public String getFaiOperator() { + return faiOperator; + } + + public void setFaiOperator(String faiOperator) { + this.faiOperator = faiOperator; + } } diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index 3af40b83..09a6472b 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -80,7 +80,8 @@ 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, 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,process,remarkPage, - dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'quotationOfficer') quotationOfficer,c.customer_Id,a.ori_code_no + dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'quotationOfficer') quotationOfficer,c.customer_Id,a.ori_code_no, + a.cqcOperator,a.faiOperator,dbo.get_userDisPlay(a.cqcOperator) cqcOperatorName,dbo.get_userDisPlay(a.faiOperator) faiOperatorName 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 plm_project_info c on a.site=c.site and a.project_id=c.project_id @@ -128,8 +129,9 @@ update plm_technical_specification_sheet set status=#{status},stage=#{stage},remarkPage=#{remarkPage} - ,rev_no=#{revNo},ECN_no=#{ecnNo},ECN_flag=#{ecnFlag},ECN_address=#{ecnAddress},update_date=GetDate(),update_by=#{updateBy} where site=#{site} - and code_no=#{codeNo} + ,rev_no=#{revNo},ECN_no=#{ecnNo},ECN_flag=#{ecnFlag},ECN_address=#{ecnAddress},cqcOperator=#{cqcOperator},update_date=GetDate(),update_by=#{updateBy} + ,faiOperator=#{faiOperator} + where site=#{site} and code_no=#{codeNo}