From 9b69ab7550e0277f49c4e8f65295fbcd35c9b1f5 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Mon, 3 Jun 2024 18:02:06 +0800 Subject: [PATCH] 1127 --- .../dao/TechnicalSpecificationMapper.java | 7 ++- .../PlmTechnicalSpecificationSheetData.java | 27 --------- .../PlmTechnicalSpecificationSheet.java | 28 +++++++++ .../TechnicalSpecificationServiceImpl.java | 25 ++++++-- .../TechnicalSpecificationMapper.xml | 58 ++++--------------- 5 files changed, 62 insertions(+), 83 deletions(-) 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 a2ba027c..d73de2b4 100644 --- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java +++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java @@ -16,6 +16,7 @@ import com.spring.modules.project.data.TechnicalCustomerInfoData; import com.spring.modules.quotation.entity.QuotationHeader; import com.spring.modules.quotation.vo.QuotationDetailVo; import com.spring.modules.sampleManagement.data.*; +import com.spring.modules.sampleManagement.entity.PlmTechnicalSpecificationSheet; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; @@ -1081,8 +1082,8 @@ public interface TechnicalSpecificationMapper { RoutingHeaderEntity getRouteNowRevNo(@Param("site") String site, @Param("partNo") String partNo); RoutingDetailEntity getTopOneRouteAlternativeNo(RoutingHeaderEntity inData); - BomDetailEntity getBMBomDetail(PlmBmBomData inData); - RoutingDetailEntity getBMRouteDetail(PlmBmBomData inData); + List getBMBomDetail(PlmBmBomData inData); + List getBMRouteDetail(PlmBmBomData inData); /** * @Description 更新benchmark bom版本 * @Title updateBMBomRev @@ -1137,7 +1138,7 @@ public interface TechnicalSpecificationMapper { void saveBMprintIndigoColor(PlmBmPrintIndigoColorData data); void deleteBMprintIndigoColor(PlmBmPrintIndigoColorData data); - PlmTechnicalSpecificationSheetData selectTechnicalSpecification(@Param("site") String site, @Param("codeNo") String codeNo); + PlmTechnicalSpecificationSheet selectTechnicalSpecification(@Param("site") String site, @Param("codeNo") String codeNo); void updateStatus(PlmTechnicalSpecificationSheetData data); } 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 62df4197..650294c9 100644 --- a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java +++ b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java @@ -52,11 +52,7 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio private String isReject; - private Integer stepId; - private String rejectFlag; - - private Integer rejectStepId; public String getNodeConclusion() { return nodeConclusion; @@ -74,29 +70,6 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio this.isReject = isReject; } - public Integer getStepId() { - return stepId; - } - - public void setStepId(Integer stepId) { - this.stepId = stepId; - } - - public String getRejectFlag() { - return rejectFlag; - } - - public void setRejectFlag(String rejectFlag) { - this.rejectFlag = rejectFlag; - } - - public Integer getRejectStepId() { - return rejectStepId; - } - - public void setRejectStepId(Integer rejectStepId) { - this.rejectStepId = rejectStepId; - } public String getBu() { return bu; 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 e29997ee..9427354c 100644 --- a/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java +++ b/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java @@ -118,6 +118,10 @@ public class PlmTechnicalSpecificationSheet extends QueryPage { private String peOperater; private String csOperater; private String dccOperater; + private Integer stepId; + private String rejectFlag; + private Integer rejectStepId; + public Integer getId() { return id; @@ -422,5 +426,29 @@ public class PlmTechnicalSpecificationSheet extends QueryPage { public void setDccOperater(String dccOperater) { this.dccOperater = dccOperater; } + + public Integer getStepId() { + return stepId; + } + + public void setStepId(Integer stepId) { + this.stepId = stepId; + } + + public String getRejectFlag() { + return rejectFlag; + } + + public void setRejectFlag(String rejectFlag) { + this.rejectFlag = rejectFlag; + } + + public Integer getRejectStepId() { + return rejectStepId; + } + + public void setRejectStepId(Integer rejectStepId) { + this.rejectStepId = rejectStepId; + } } 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 4e1d7631..8f0bbc3f 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 @@ -40,6 +40,7 @@ import com.spring.modules.request.vo.PlmRequestHeaderVo; import com.spring.modules.sampleManagement.dao.TechnicalSpecificationMapper; import com.spring.modules.sampleManagement.dao.UpBMRevNoData; import com.spring.modules.sampleManagement.data.*; +import com.spring.modules.sampleManagement.entity.PlmTechnicalSpecificationSheet; import com.spring.modules.sampleManagement.service.TechnicalSpecificationService; import com.spring.modules.sys.dao.SysUserDao; import com.spring.modules.sys.entity.SysUserEntity; @@ -328,8 +329,14 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification @Override public Map searchBMBom(PlmBmBomData inData){ HashMap map = new HashMap<>(); - BomDetailEntity bomDetailEntity=technicalSpecificationMapper.getBMBomDetail(inData); - List list= bomManagementMapper.queryBomComponent(bomDetailEntity); + List bomDetailEntity=technicalSpecificationMapper.getBMBomDetail(inData); + if(bomDetailEntity.size()>1){ + throw new RuntimeException("物料编码在物料视图view_Project_Part中有重复！请联系管理员"); + } + if(bomDetailEntity.size()==0){ + throw new RuntimeException("物料编码在物料视图view_Project_Part中查询不到！请联系管理员"); + } + List list= bomManagementMapper.queryBomComponent(bomDetailEntity.get(0)); map.put("rows",list); map.put("row",bomDetailEntity); return map; @@ -465,8 +472,14 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification @Override public Map searchBMRoute(PlmBmBomData data){ HashMap map = new HashMap<>(); - RoutingDetailEntity bomDetailEntity=technicalSpecificationMapper.getBMRouteDetail(data); - List list= technicalSpecificationMapper.searchBMRoute(bomDetailEntity); + List bomDetailEntity=technicalSpecificationMapper.getBMRouteDetail(data); + if(bomDetailEntity.size()>1){ + throw new RuntimeException("物料编码在物料视图view_Project_Part中有重复！请联系管理员"); + } + if(bomDetailEntity.size()==0){ + throw new RuntimeException("物料编码在物料视图view_Project_Part中查询不到！请联系管理员"); + } + List list= technicalSpecificationMapper.searchBMRoute(bomDetailEntity.get(0)); map.put("rows",list); map.put("row",bomDetailEntity); return map; @@ -1111,7 +1124,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification // 查出变更单相关表的数据 // 主信息 - PlmTechnicalSpecificationSheetData changeRequest = technicalSpecificationMapper.selectTechnicalSpecification(data.getSite(), data.getCodeNo()); + PlmTechnicalSpecificationSheet changeRequest = technicalSpecificationMapper.selectTechnicalSpecification(data.getSite(), data.getCodeNo()); // 根据字段对应的数据库表+字段查询出数据 for (PlmRequestDetailVo nodeDetail : nodeDetails) { @@ -1362,7 +1375,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification // 4、 接口:流程提交接口(同意) / 流程退回接口(驳回) // 主信息 - PlmTechnicalSpecificationSheetData changeRequest = technicalSpecificationMapper.selectTechnicalSpecification(data.getSite(), data.getCodeNo()); + PlmTechnicalSpecificationSheet changeRequest = technicalSpecificationMapper.selectTechnicalSpecification(data.getSite(), data.getCodeNo()); ParamData paramData = new ParamData(data.getSite(), processFormList.get(0).getNodeId(), data.getCodeNo(), data.getUserName(), processFormList.get(0).getClassificationNo(), userId, processFormList.get(0).getWorkflowId(), processFormList.get(0).getWorkflowname(), requestName, path, requestId, diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index 472c9ec6..4239eff5 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -42,8 +42,8 @@ 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) 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') + 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) @@ -85,10 +85,12 @@ ,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 + ,a.dccOperater,dbo.get_userDisPlay(a.dccOperater) dccOperaterName,isnull(a.step_id,10) stepId,d.is_reject 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 + left join plm_request_header as prh on a.site = prh.site and prh.menu_id = '103002' + left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and isnull(a.step_id,10)= d.step_id where a.site=#{site} and a.code_no=#{codeNo} @@ -904,52 +906,14 @@ pressure,updateDate,updateBy,remark) values delete from plm_bm_printIndigoColor where id=#{id} - SELECT - a.id, - a.site, - a.code_no, - a.project_id, - a.test_part_no, - a.status, - a.rev_no, - a.work_center_no, - a.ECN_flag, - a.ECN_no, - a.ori_code_no, - a.ECN_address, - a.remark, - a.create_date, - a.create_by, - a.update_date, - a.update_by, - b.final_part_no, - dbo.plm_get_projectBaseDesc(b.part_type,'part_type') partTypeDesc, - b.part_type, - b.part_name, - b.part_desc, - b.part_spec, - dbo.plm_get_technicalBaseDesc(a.status,'status') statusDesc, - a.proofing_no, - c.bu_no, - dbo.plm_get_bu_desc(a.site,c.bu_no) buDesc, - dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'engineer') engineer, - 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 + 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, +ori_code_no,bom_type,eng_chg_level,bom_alternative_no,routing_type,routing_revision,routing_alternative_no,remarkPage, +process,stage,materialType,cqcOperator,faiOperator,overPrintOperator,printOperator,peOperater,csOperater,dccOperater, +step_id,reject_flag,reject_step_id 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 where a.site = #{site} and a.code_no = #{codeNo}