From 5ed82e85ffe0ad398d4f58312095770fabbff8cb Mon Sep 17 00:00:00 2001 From: ruanqi Date: Mon, 4 Nov 2024 11:25:14 +0800 Subject: [PATCH] 1127 --- .../TechnicalSpecificationController.java | 16 ++++++++++++++++ .../PlmTechnicalSpecificationSheetData.java | 10 +++++++++- .../Impl/TechnicalSpecificationServiceImpl.java | 17 +++++++++++++++++ .../service/TechnicalSpecificationService.java | 3 +++ .../TechnicalSpecificationMapper.xml | 5 ++++- 5 files changed, 49 insertions(+), 2 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 418d8a9c..b50af236 100644 --- a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java +++ b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java @@ -1207,4 +1207,20 @@ public class TechnicalSpecificationController { List rows= technicalSpecificationService.searchCopyPart(data); return R.ok().put("rows",rows); } + + /** + * @Description 拷贝技术参数卡 + * @Title copyBm + * @param data + * @author rq + * @date 2024/11/4 10:48 + * @return R + * @throw + */ + @PostMapping(value="/copyBm") + @ResponseBody + public R copyBm(@RequestBody PlmTechnicalSpecificationSheetData data) { + technicalSpecificationService.copyBm(data); + return R.ok(); + } } 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 1ebfeda9..06c07c02 100644 --- a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java +++ b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java @@ -29,7 +29,7 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio private String customerDesc; private String partNo; private String partFamily; - + private String newPartNo; private String sp; private String buNo; private String buDesc; @@ -429,4 +429,12 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio public void setSp(String sp) { this.sp = sp; } + + public String getNewPartNo() { + return newPartNo; + } + + public void setNewPartNo(String newPartNo) { + this.newPartNo = newPartNo; + } } 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 f6be1384..e9f29586 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 @@ -1373,4 +1373,21 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification public List searchCopyPart(PlmTechnicalSpecificationSheetData inData){ return technicalSpecificationMapper.searchCopyPart(inData); } + + @Override + public void copyBm (PlmTechnicalSpecificationSheetData inData){ + List params = new ArrayList<>(); + params.add(inData.getSite()); + params.add(inData.getCodeNo()); + params.add(inData.getNewPartNo()); + params.add(inData.getUsername()); + //执行方法 + List> resultList = procedureDao.getProcedureData("plm_copy_bm", params); + //判断是否成功 + String code = String.valueOf(resultList.get(0).get("resultCode")); + if ("400".equalsIgnoreCase(code)) { + String msg = String.valueOf(resultList.get(0).get("resultMsg")); + throw new RuntimeException(msg); + } + } } 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 59ebbcaf..cf840ffe 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java @@ -972,4 +972,7 @@ public interface TechnicalSpecificationService { PlmTechnicalSpecificationSheetData getOADetailForBM(PlmTechnicalSpecificationSheetData data); List searchCopyPart(PlmTechnicalSpecificationSheetData inData); + + + void copyBm (PlmTechnicalSpecificationSheetData data); } diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index dba81d89..d83eda0b 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -1101,9 +1101,12 @@ step_id,reject_flag,reject_step_id,mpOperator,pod from plm_project_info c left join view_Project_Part a on a.site = c.site and a.project_id = c.project_id left join plm_customer_part_info pcpi on a.site = pcpi.site and a.test_part_no = pcpi.part_no and c.customer_id = pcpi.customer_no - left join part p on a.Final_Part_No=p.part_no + left join part p on a.Final_Part_No = p.part_no left join plm_technical_specification_sheet ps on a.site=ps.site and a.Test_part_no=ps.Test_part_no + where a.project_id=#{projectId} and a.site=#{site} and a.Test_part_no!=#{testPartNo} and a.realFlag='Y' and ps.Test_part_no is null + and dbo.Get_PartHasRealBOMRoute(a.site,a.Final_Part_No) ='Y' +