From e40a4645cf975d38a9ca7a0b6a616d46b4729dea Mon Sep 17 00:00:00 2001 From: ruanqi Date: Tue, 24 Sep 2024 17:29:19 +0800 Subject: [PATCH] 1127 --- .../TechnicalSpecificationController.java | 9 ++++++ .../dao/TechnicalSpecificationMapper.java | 2 ++ .../PlmTechnicalSpecificationSheet.java | 3 +- .../TechnicalSpecificationServiceImpl.java | 11 ++++++++ .../TechnicalSpecificationService.java | 3 ++ .../TechnicalSpecificationMapper.xml | 28 ++++++++++++++++--- 6 files changed, 51 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java index 21a00137..c808e766 100644 --- a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java +++ b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java @@ -1175,4 +1175,13 @@ public class TechnicalSpecificationController { technicalSpecificationService.submitChange(data); return R.ok(); } + + + + @PostMapping(value="/getBMStatusDesc") + @ResponseBody + public R getBMStatusDesc(@RequestBody PlmTechnicalSpecificationSheetData data) { + String status= technicalSpecificationService.getBMStatusDesc(data); + return R.ok().put("status",status); + } } diff --git a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java index aad9addd..8953bc0c 100644 --- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java +++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java @@ -1143,4 +1143,6 @@ public interface TechnicalSpecificationMapper { void updateStatus(PlmTechnicalSpecificationSheetData data); List selectTechnicalSpecificationTeam(@Param("site") String site, @Param("codeNo") String codeNo); + + PlmTechnicalSpecificationSheetData getBMStatusDesc(@Param("site") String site, @Param("codeNo") String codeNo); } 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 1cb288b8..8497815f 100644 --- a/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java +++ b/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java @@ -2,10 +2,11 @@ package com.spring.modules.sampleManagement.entity; import com.fasterxml.jackson.annotation.JsonFormat; import com.spring.common.utils.QueryPage; +import org.apache.ibatis.type.Alias; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; - +@Alias("PlmTechnicalSpecificationSheet") public class PlmTechnicalSpecificationSheet extends QueryPage { /** * 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 3a7d6c11..e3047b0f 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 @@ -1371,4 +1371,15 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification } } + + @Override + public String getBMStatusDesc(PlmTechnicalSpecificationSheetData data){ + PlmTechnicalSpecificationSheetData result= technicalSpecificationMapper.getBMStatusDesc(data.getSite(),data.getCodeNo()); + if(result==null){ + return "已完成"; + }else { + return result.getStatusDesc(); + } + } + } diff --git a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java index ab6aeb38..7ef8d4f4 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java @@ -14,6 +14,7 @@ import com.spring.modules.quotation.entity.QuotationHeader; import com.spring.modules.quotation.vo.QuotationDetailVo; import com.spring.modules.sampleManagement.dao.UpBMRevNoData; import com.spring.modules.sampleManagement.data.*; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.Map; @@ -962,4 +963,6 @@ public interface TechnicalSpecificationService { void issueChange(PlmTechnicalSpecificationSheetData data); void submitChange(PlmTechnicalSpecificationSheetData data); + + String getBMStatusDesc(PlmTechnicalSpecificationSheetData data); } diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index 137a1342..daf0f714 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -12,6 +12,12 @@ ,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.pod, a.mpOperator,dbo.get_userDisPlay(a.mpOperator) mpOperatorName + , a.cqcOperator,dbo.get_userDisPlay(a.cqcOperator) cqcOperatorName + , a.faiOperator,dbo.get_userDisPlay(a.faiOperator) faiOperatorName + ,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 @@ -43,8 +49,12 @@ insert into plm_technical_specification_sheet(site,code_no,project_id,test_part_no,status,rev_no,ECN_flag,ECN_no,ECN_address,remark, - create_date,create_by,proofing_no,ori_code_no,bom_type,eng_chg_level,bom_alternative_no,routing_type,routing_revision,routing_alternative_no,stage,materialType,step_id) values (#{site},#{codeNo},#{projectId},#{testPartNo},#{status},#{revNo},#{ecnFlag},#{ecnNo},#{ecnAddress} - ,#{remark},GetDate(),#{createBy},#{proofingNo},#{oriCodeNo},#{bomType},#{engChgLevel,jdbcType=INTEGER},#{bomAlternativeNo},#{routingType},#{routingRevision,jdbcType=INTEGER},#{routingAlternativeNo},'Sample','Label',10) + create_date,create_by,proofing_no,ori_code_no,bom_type,eng_chg_level,bom_alternative_no,routing_type,routing_revision,routing_alternative_no,stage,materialType,step_id + ,cqcOperator,faiOperator,peOperater,csOperater,dccOperater,mpOperator) + values + (#{site},#{codeNo},#{projectId},#{testPartNo},#{status},#{revNo},#{ecnFlag},#{ecnNo},#{ecnAddress} + ,#{remark},GetDate(),#{createBy},#{proofingNo},#{oriCodeNo},#{bomType},#{engChgLevel,jdbcType=INTEGER},#{bomAlternativeNo},#{routingType},#{routingRevision,jdbcType=INTEGER},#{routingAlternativeNo},'Sample','Label',10 + ,#{cqcOperator},#{faiOperator},#{peOperater},#{csOperater},#{dccOperater},#{mpOperator}) @@ -54,7 +64,10 @@ update plm_technical_specification_sheet set project_id=#{projectId},test_part_no=#{testPartNo},status=#{status} - ,rev_no=#{revNo},ECN_no=#{ecnNo},ECN_flag=#{ecnFlag},ECN_address=#{ecnAddress},remark=#{remark},update_date=GetDate(),update_by=#{updateBy} where id=#{id} + ,rev_no=#{revNo},ECN_no=#{ecnNo},ECN_flag=#{ecnFlag},ECN_address=#{ecnAddress},remark=#{remark},update_date=GetDate(),update_by=#{updateBy} + ,cqcOperator=#{cqcOperator},faiOperator=#{faiOperator},peOperater=#{peOperater}, + csOperater=#{csOperater},dccOperater=#{dccOperater},mpOperator=#{mpOperator} + where id=#{id} @@ -929,7 +942,7 @@ pressure,updateDate,updateBy,remark) values delete from plm_bm_printIndigoColor where id=#{id} - SELECT id,site,code_no,proofing_no,project_id,test_part_no,status,rev_no,work_center_no,ECN_flag,ECN_no,ECN_address,remark, create_date,create_by,update_date,update_by,picture_addess,customerPictureChangeRemark,productionFileComments, @@ -959,4 +972,11 @@ step_id,reject_flag,reject_step_id,mpOperator left join sys_user as b on a.operator_id = b.username where a.site = #{site} and a.code_no = #{codeNo} + + \ No newline at end of file