Merge remote-tracking branch 'origin/master'

ccl-plm-java.iml

@@ -211,5 +211,8 @@
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.72" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.1.1" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-mail:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.mail:jakarta.mail:1.6.4" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.activation:jakarta.activation:1.2.1" level="project" />
   </component>
 </module>

pom.xml

@@ -312,6 +312,16 @@
 <!--            <artifactId>spring-boot-autoconfigure</artifactId>-->
 <!--            <version>2.2.4.RELEASE</version>-->
 <!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>com.infiniteautomation</groupId>-->
+<!--            <artifactId>modbus4j</artifactId>-->
+<!--            <version>3.0.3</version>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

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;

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;
+    }
 }

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;
+    }
 }
 

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  id="updateBMBasicInformation" >
     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}
 </update>