From f33c1fddbc030c4304c23e07be4c24c763d8a9aa Mon Sep 17 00:00:00 2001 From: ruanqi Date: Wed, 20 Dec 2023 11:05:30 +0800 Subject: [PATCH] 1127 --- .../TechnicalSpecificationController.java | 16 ++++++++++++++++ .../dao/TechnicalSpecificationMapper.java | 13 +++++++++++++ .../Impl/TechnicalSpecificationServiceImpl.java | 15 +++++++++++++-- .../service/TechnicalSpecificationService.java | 11 +++++++++++ .../resources/mapper/base/PropertiesMapper.xml | 2 +- .../TechnicalSpecificationMapper.xml | 12 +++++++++++- 6 files changed, 65 insertions(+), 4 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 e052d6f3..d3440a25 100644 --- a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java +++ b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java @@ -596,4 +596,20 @@ public class TechnicalSpecificationController { technicalSpecificationService.updateBMModal(data); return R.ok(); } + + /** + * @Description 查下BM页面是哪个模板的 + * @Title searchBMPropertiesHeaderForBM + * @param data + * @author rq + * @date 2023/12/20 10:38 + * @return R + * @throw + */ + @PostMapping(value="/searchBMPropertiesHeaderForBM") + @ResponseBody + public R searchBMPropertiesHeaderForBM(@RequestBody SearchBMData data){ + PlmBmModelHeaderData row= technicalSpecificationService.searchBMPropertiesHeaderForBM(data); + return R.ok().put("row", row); + } } 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 77e57cf8..7b09b530 100644 --- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java +++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java @@ -619,4 +619,17 @@ public interface TechnicalSpecificationMapper { * @throw */ void updateBMModal(PlmBmModelHeaderData data); + + List checkBMModelHeader(SearchBMData data); + + /** + * @Description 查下BM页面是哪个模板的 + * @Title searchBMPropertiesHeaderForBM + * @param data + * @author rq + * @date 2023/12/20 10:40 + * @return PlmBmModelHeaderData + * @throw + */ + PlmBmModelHeaderData searchBMPropertiesHeaderForBM(SearchBMData data); } 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 78997e92..89d99c80 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 @@ -8,6 +8,7 @@ import com.spring.modules.base.data.PlmBmModelHeaderData; import com.spring.modules.base.data.PlmBmPropertiesValueData; import com.spring.modules.base.data.PlmBmPropertiesValueHeaderData; import com.spring.modules.base.data.PlmPropertiesItemAvailableData; +import com.spring.modules.base.entity.PlmBmModelHeader; import com.spring.modules.base.entity.PlmBmPageBaseData; import com.spring.modules.base.entity.PlmBmPropertiesValueHeader; import com.spring.modules.base.entity.PlmPropertiesItemAvailable; @@ -292,8 +293,13 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification public List searchBMPropertiesValue(SearchBMData data){ List check=technicalSpecificationMapper.checkPlmBmPropertiesValueHeaderData(data); if(check.size()==0){ - technicalSpecificationMapper.savePlmBmPropertiesValueHeaderData(data); - technicalSpecificationMapper.savePlmBmPropertiesValueData(data); + List checkHeader=technicalSpecificationMapper.checkBMModelHeader(data); + if(checkHeader.size()>0){ + if(checkHeader.get(0).getPropertiesCodeDesc()!=null&&!"".equals(checkHeader.get(0).getPropertiesCodeDesc())){ + technicalSpecificationMapper.savePlmBmPropertiesValueHeaderData(data); + technicalSpecificationMapper.savePlmBmPropertiesValueData(data); + } + } } List result= technicalSpecificationMapper.searchBMPropertiesValue(data); for (int i = 0; i diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index 25dfabc4..2f5e6303 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -245,7 +245,7 @@ a.wiRevison,a.wiDate,a.routingRemark,a.routingAction, insert into plm_bm_propertiesValue(Site,bu_no,PartNo,CodeNo,SubCodeSeqNo,SubCodeDesc,ItemNo,PropertiesItemNo,TextValue,NumValue,RecordType,order_id) select #{site},#{buNo},#{codeNo},#{type},1,b.code_desc,a.seq_no,a.properties_item_no,null,null,'BM',a.order_id from plm_bm_model_header b left join plm_properties_model_detail a on a.site=${site} and a.function_type='BM' and a.code_no=b.properties_code_no - where b.site=${site} and b.bu_no=#{buNo} and b.function_type='BM' and b.code_no=#{type} + where b.site=${site} and b.bu_no=#{buNo} and b.function_type='BM' and b.code_no=#{type} and a.code_no is not null + select properties_code_no from plm_bm_model_header where site=#{site} + and bu_no=#{buNo} and code_no=#{codeNo} + + + + \ No newline at end of file