From 2d709e9c3512949aa18daa9873cb0dad8d2b2790 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Tue, 30 Apr 2024 22:22:51 +0800 Subject: [PATCH] 1127 --- .../PlmTechnicalSpecificationSheetData.java | 27 +++++++++++++++++++ .../PlmTechnicalSpecificationSheet.java | 27 +++++++++++++++++++ .../TechnicalSpecificationMapper.xml | 5 +++- 3 files changed, 58 insertions(+), 1 deletion(-) 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 510dfe96..8c2dc655 100644 --- a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java +++ b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java @@ -38,6 +38,9 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio private String faiOperatorName; private String overPrintOperatorName; private String printOperatorName; + private String peOperaterName; + private String csOperaterName; + private String dccOperaterName; public String getPartType() { return partType; } @@ -287,4 +290,28 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio public void setPrintOperatorName(String printOperatorName) { this.printOperatorName = printOperatorName; } + + public String getPeOperaterName() { + return peOperaterName; + } + + public void setPeOperaterName(String peOperaterName) { + this.peOperaterName = peOperaterName; + } + + public String getCsOperaterName() { + return csOperaterName; + } + + public void setCsOperaterName(String csOperaterName) { + this.csOperaterName = csOperaterName; + } + + public String getDccOperaterName() { + return dccOperaterName; + } + + public void setDccOperaterName(String dccOperaterName) { + this.dccOperaterName = dccOperaterName; + } } 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 464dc284..e29997ee 100644 --- a/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java +++ b/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java @@ -115,6 +115,9 @@ public class PlmTechnicalSpecificationSheet extends QueryPage { private String faiOperator; private String overPrintOperator; private String printOperator; + private String peOperater; + private String csOperater; + private String dccOperater; public Integer getId() { return id; @@ -395,5 +398,29 @@ public class PlmTechnicalSpecificationSheet extends QueryPage { public void setPrintOperator(String printOperator) { this.printOperator = printOperator; } + + public String getPeOperater() { + return peOperater; + } + + public void setPeOperater(String peOperater) { + this.peOperater = peOperater; + } + + public String getCsOperater() { + return csOperater; + } + + public void setCsOperater(String csOperater) { + this.csOperater = csOperater; + } + + public String getDccOperater() { + return dccOperater; + } + + public void setDccOperater(String dccOperater) { + this.dccOperater = dccOperater; + } } diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index c7ce3645..18493b5a 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -83,6 +83,9 @@ 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 ,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 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 @@ -131,7 +134,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} + ,faiOperator=#{faiOperator},peOperater=#{peOperater},csOperater=#{csOperater},dccOperater=#{dccOperater} where site=#{site} and code_no=#{codeNo}