diff --git a/ccl-plm-java.iml b/ccl-plm-java.iml index ce035477..5d9350fa 100644 --- a/ccl-plm-java.iml +++ b/ccl-plm-java.iml @@ -211,5 +211,8 @@ + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8f8aa043..0b0fb9da 100644 --- a/pom.xml +++ b/pom.xml @@ -312,6 +312,16 @@ + + + + + + + + org.springframework.boot + spring-boot-starter-mail + diff --git a/src/main/java/com/spring/modules/cdc/task/GatherDataTask.java b/src/main/java/com/spring/modules/cdc/task/GatherDataTask.java index a315437a..53d79e73 100644 --- a/src/main/java/com/spring/modules/cdc/task/GatherDataTask.java +++ b/src/main/java/com/spring/modules/cdc/task/GatherDataTask.java @@ -11,7 +11,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import javax.mail.MessagingException; + import java.io.UnsupportedEncodingException; import java.util.Date; import java.util.List; 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 650294c9..7173c7dd 100644 --- a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java +++ b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java @@ -51,7 +51,7 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio private String nodeConclusion; private String isReject; - + private String mpOperatorName; public String getNodeConclusion() { @@ -368,4 +368,12 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio public void setDccOperaterName(String dccOperaterName) { this.dccOperaterName = dccOperaterName; } + + public String getMpOperatorName() { + return mpOperatorName; + } + + public void setMpOperatorName(String mpOperatorName) { + this.mpOperatorName = mpOperatorName; + } } 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 b1efea00..1cb288b8 100644 --- a/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java +++ b/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java @@ -122,7 +122,7 @@ public class PlmTechnicalSpecificationSheet extends QueryPage { private String rejectFlag; private Integer rejectStepId; private String pod; - + private String mpOperator; public Integer getId() { return id; } @@ -458,5 +458,13 @@ public class PlmTechnicalSpecificationSheet extends QueryPage { public void setPod(String pod) { this.pod = pod; } + + public String getMpOperator() { + return mpOperator; + } + + public void setMpOperator(String mpOperator) { + this.mpOperator = mpOperator; + } } diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index b4ef7864..c00aa13e 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -10,7 +10,8 @@ dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'technician') technician,process, dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'quotationOfficer') quotationOfficer,c.customer_Id ,a.picture_addess,a.customerPictureChangeRemark,a.productionFileComments,a.bom_type,a.eng_chg_level,a.bom_alternative_no,a.routing_type,a.routing_revision, - a.routing_alternative_no + a.routing_alternative_no,a.pod, + a.mpOperator,dbo.get_userDisPlay(a.mpOperator) mpOperatorName 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 @@ -85,7 +86,9 @@ ,a.overPrintOperator, a.printOperator,dbo.get_userDisPlay(a.overPrintOperator) overPrintOperatorName,dbo.get_userDisPlay(a.printOperator) printOperatorName ,a.peOperater,dbo.get_userDisPlay(a.peOperater) peOperaterName ,a.csOperater,dbo.get_userDisPlay(a.csOperater) csOperaterName - ,a.dccOperater,dbo.get_userDisPlay(a.dccOperater) dccOperaterName,isnull(a.step_id,10) stepId,d.is_reject,a.pod + ,a.dccOperater,dbo.get_userDisPlay(a.dccOperater) dccOperaterName,isnull(a.step_id,10) stepId,d.is_reject,a.pod, + 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 plm_project_info c on a.site=c.site and a.project_id=c.project_id @@ -136,7 +139,7 @@ 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},dccOperater=#{dccOperater},pod=#{pod} + ,faiOperator=#{faiOperator},peOperater=#{peOperater},csOperater=#{csOperater},dccOperater=#{dccOperater},pod=#{pod},mpOperator=#{mpOperator} where site=#{site} and code_no=#{codeNo}