diff --git a/src/main/java/com/spring/modules/base/service/Impl/PropertiesServiceImpl.java b/src/main/java/com/spring/modules/base/service/Impl/PropertiesServiceImpl.java index c0af2d77..e1ab8a62 100644 --- a/src/main/java/com/spring/modules/base/service/Impl/PropertiesServiceImpl.java +++ b/src/main/java/com/spring/modules/base/service/Impl/PropertiesServiceImpl.java @@ -58,6 +58,10 @@ public class PropertiesServiceImpl implements PropertiesService { @Override public PageUtils propertiesItemSearch(PlmPropertiesItemData inData){ + // 如果是masterPart 则将site设置为"*" -- 2025-01-22 yfy + if ("MP".equals(inData.getItemType())) { + inData.setSite("*"); + } IPage resultList = this.propertiesMapper.plmPropertiesItemSearch(new Page(inData.getPage(), inData.getLimit()), inData); return new PageUtils(resultList); } @@ -65,6 +69,10 @@ public class PropertiesServiceImpl implements PropertiesService { @Override public ResponseData propertiesItemSave(PlmPropertiesItemData inData){ + // 如果是masterPart 则将site设置为"*" -- 2025-01-22 yfy + if ("MP".equals(inData.getItemType())) { + inData.setSite("*"); + } ResponseData responseData = new ResponseData(); if("T".equals(inData.getValueTypeDb())){ inData.setValueType("文本"); @@ -159,6 +167,10 @@ public class PropertiesServiceImpl implements PropertiesService { @Override public PageUtils propertiesModelSearch(PlmPropertiesModelHeaderData inData){ + // 如果是masterPart 则将site设置为"*" -- 2025-01-22 yfy + if ("MP".equals(inData.getFunctionType())) { + inData.setSite("*"); + } IPage resultList = this.propertiesMapper.plmPropertiesModelSearch( new Page(inData.getPage(), inData.getLimit()), inData); return new PageUtils(resultList); @@ -167,6 +179,10 @@ public class PropertiesServiceImpl implements PropertiesService { @Override @Transactional public void propertiesModelSave(PlmPropertiesModelHeaderData inData){ + // 如果是masterPart 则将site设置为"*" -- 2025-01-22 yfy + if ("MP".equals(inData.getFunctionType())) { + inData.setSite("*"); + } List checkPropertiesModel = propertiesMapper.checkPropertiesModel(inData); if(!checkPropertiesModel.isEmpty()) { throw new RuntimeException("该模板编码已存在!"); diff --git a/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java index 456ad07d..802782b1 100644 --- a/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java +++ b/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java @@ -192,6 +192,14 @@ public class MasterPartInformationServiceImpl extends ServiceImpl getMasterPartItem(PartSubPropertiesValueData data) { +// // 判断物料是否选择了模板 +// MasterPartInformationEntity masterPart = masterPartInformationMapper.selectOne(new QueryWrapper().eq("part_no", data.getPartNo())); +// if (StringUtils.isNotBlank(masterPart.getCodeNo())) { +// // 如果选择了模板但物料属性是空,则调用接口查出属性新增 +// +// } +// // + // 查询是否已存在属性 List checkValueHeaderData = partInformationMapper.checkValueHeaderData(data); // 初次或修改物料模板则重新加载模板 @@ -384,6 +402,7 @@ public class MasterPartInformationServiceImpl extends ServiceImpl