From 182b01bd27a82a618bc9d7d3fa1f122d19c0afaf Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Fri, 28 Mar 2025 14:25:51 +0800 Subject: [PATCH] 2025-03-27 --- .../modules/project/dao/ProjectDao.java | 2 + .../PlmTechnicalSpecificationSheet.java | 10 +++ .../TechnicalSpecificationServiceImpl.java | 9 ++ .../resources/mapper/project/ProjectDao.xml | 4 + .../mapper/quote/QuoteDetailMapper.xml | 2 +- .../mapper/quote/QuoteGroupDetailMapper.xml | 2 +- .../TechnicalSpecificationMapper.xml | 87 ++++++++++++++----- 7 files changed, 94 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/spring/modules/project/dao/ProjectDao.java b/src/main/java/com/spring/modules/project/dao/ProjectDao.java index 54112f05..c9bd181e 100644 --- a/src/main/java/com/spring/modules/project/dao/ProjectDao.java +++ b/src/main/java/com/spring/modules/project/dao/ProjectDao.java @@ -253,4 +253,6 @@ public interface ProjectDao extends BaseMapper { @Param("projectName")String projectName, @Param("username")String username, @Param("customerId")String customerId); + + void updateProjectFinalCustomerNo(PlmProjectInfoData project); } 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 74912dd9..47e7bf93 100644 --- a/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java +++ b/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java @@ -133,6 +133,16 @@ public class PlmTechnicalSpecificationSheet extends QueryPage { private String customerRev; + private String relevancePartNo; + + public String getRelevancePartNo() { + return relevancePartNo; + } + + public void setRelevancePartNo(String relevancePartNo) { + this.relevancePartNo = relevancePartNo; + } + public String getRev() { return rev; } diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java index d81a1611..3fd0e0d7 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java @@ -159,6 +159,9 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification inData.setOriCodeNo(codeId); inData.setCreateBy(sysUserEntity.getUsername()); inData.setStatus("cg"); + if (StringUtils.isEmpty(inData.getCertification())){ + inData.setCertification("RoHs"); + } technicalSpecificationMapper.saveTechnicalSpecificationSheet(inData); technicalSpecificationMapper.updateProjectPartNowBm(inData); @@ -310,9 +313,15 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification } @Override + @Transactional public void updateBMcustomerInfo(PlmTechnicalSpecificationSheetData data){ SysUserEntity sysUserEntity = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); data.setUpdateBy(sysUserEntity.getUsername()); + PlmProjectInfoData project = new PlmProjectInfoData(); + project.setSite(data.getSite()); + project.setProjectId(data.getProjectId()); + project.setFinalCustomerId(data.getFinalCustomerNo()); + projectDao.updateProjectFinalCustomerNo(project); technicalSpecificationMapper.updateBMcustomerInfo(data); } diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml index bb19e59e..f49dab86 100644 --- a/src/main/resources/mapper/project/ProjectDao.xml +++ b/src/main/resources/mapper/project/ProjectDao.xml @@ -764,4 +764,8 @@ update_by,update_date,priority,site,id,project_desc,customer_remark,remark,need_ order by LEFT(project_id, CHARINDEX('-', project_id + '-') - 1) desc + + + update plm_project_info set final_customer_id = #{finalCustomerId} where site = #{site} and project_id = #{projectId} + diff --git a/src/main/resources/mapper/quote/QuoteDetailMapper.xml b/src/main/resources/mapper/quote/QuoteDetailMapper.xml index 5e56f1ff..e8fb01bf 100644 --- a/src/main/resources/mapper/quote/QuoteDetailMapper.xml +++ b/src/main/resources/mapper/quote/QuoteDetailMapper.xml @@ -317,7 +317,7 @@ and qd.part_no = #{partNo} - order by qd.part_no + order by qd.part_no diff --git a/src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml b/src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml index b01081ff..97ad6ba7 100644 --- a/src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml +++ b/src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml @@ -313,8 +313,8 @@ and qd.part_no = #{partNo} - order by qd.part_no + order by qd.part_no diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index 1d1d2cbf..721af97e 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -233,7 +233,8 @@ dbo.get_technicalSpecificationTeamNames(a.site, a.code_no, 'dcc') dcc, dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'technician') technicianNo, a.rev, - a.customer_rev + a.customer_rev, + relevance_part_no FROM plm_technical_specification_sheet a 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 @@ -306,32 +307,78 @@ - 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},pod=#{pod},mpOperator=#{mpOperator} - where site=#{site} and code_no=#{codeNo} + 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} + , pod=#{pod} + , mpOperator=#{mpOperator} + , relevance_part_no=#{relevancePartNo} + where site = #{site} + and code_no = #{codeNo} - update plm_technical_specification_sheet set picture_Addess=#{pictureAddess},materialType=#{materialType}, - customerPictureChangeRemark=#{customerPictureChangeRemark},productionFileComments - =#{productionFileComments},remark=#{remark},update_date=GetDate(),update_by=#{updateBy} - ,certification=#{certification},customerRevNo=#{customerRevNo},materialNumber=#{materialNumber},customerRemark=#{customerRemark},projectRemark=#{projectRemark} - where site=#{site} and code_no=#{codeNo} + update plm_technical_specification_sheet + set picture_Addess=#{pictureAddess}, + materialType=#{materialType}, + customerPictureChangeRemark=#{customerPictureChangeRemark}, + productionFileComments =#{productionFileComments}, + remark=#{remark}, + update_date=GetDate(), + update_by=#{updateBy}, + certification=#{certification}, + customerRevNo=#{customerRevNo}, + materialNumber=#{materialNumber}, + customerRemark=#{customerRemark}, + projectRemark=#{projectRemark} + where site = #{site} + and code_no = #{codeNo}