|
|
@ -1650,7 +1650,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification |
|
|
// 获取指定属性值 |
|
|
// 获取指定属性值 |
|
|
// 主信息字段 |
|
|
// 主信息字段 |
|
|
if ("plm_technical_specification_sheet".equals(nodeDetail.getPlmTable())) { |
|
|
if ("plm_technical_specification_sheet".equals(nodeDetail.getPlmTable())) { |
|
|
fieldValue = (String) getPropertyValue(changeRequest, nodeDetail.getPlmField()); |
|
|
|
|
|
|
|
|
fieldValue = getTechnicalSpecificationSheetFieldValue(changeRequest, nodeDetail.getPlmField()); |
|
|
// 判断是否有值 |
|
|
// 判断是否有值 |
|
|
if (StringUtils.hasText(fieldValue)) { |
|
|
if (StringUtils.hasText(fieldValue)) { |
|
|
// 判断是否为人员 |
|
|
// 判断是否为人员 |
|
|
@ -1998,7 +1998,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification |
|
|
// 获取指定属性值 |
|
|
// 获取指定属性值 |
|
|
// 主信息字段 |
|
|
// 主信息字段 |
|
|
if ("plm_technical_specification_sheet".equals(nodeDetail.getPlmTable())) { |
|
|
if ("plm_technical_specification_sheet".equals(nodeDetail.getPlmTable())) { |
|
|
fieldValue = (String) getPropertyValue(changeRequest, nodeDetail.getPlmField()); |
|
|
|
|
|
|
|
|
fieldValue = getTechnicalSpecificationSheetFieldValue(changeRequest, nodeDetail.getPlmField()); |
|
|
// 判断是否有值 |
|
|
// 判断是否有值 |
|
|
if (StringUtils.hasText(fieldValue)) { |
|
|
if (StringUtils.hasText(fieldValue)) { |
|
|
// 判断是否为人员 |
|
|
// 判断是否为人员 |
|
|
@ -2088,6 +2088,29 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification |
|
|
return mainData; |
|
|
return mainData; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* 出口配置里的 BU 不读 plm_technical_specification_sheet.bu_no, |
|
|
|
|
|
* 与技术参数卡列表 technicalSpecificationList 相同,取关联项目物料 bu_no。 |
|
|
|
|
|
*/ |
|
|
|
|
|
private String getTechnicalSpecificationSheetFieldValue(PlmTechnicalSpecificationSheet sheet, String plmField) { |
|
|
|
|
|
if (sheet == null || !StringUtils.hasText(plmField)) { |
|
|
|
|
|
return ""; |
|
|
|
|
|
} |
|
|
|
|
|
if ("bu".equals(plmField) || "buNo".equals(plmField) || "bu_no".equals(plmField)) { |
|
|
|
|
|
return resolveTechnicalSpecificationBuNo(sheet); |
|
|
|
|
|
} |
|
|
|
|
|
Object value = getPropertyValue(sheet, plmField); |
|
|
|
|
|
return value == null ? "" : (String) value; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private String resolveTechnicalSpecificationBuNo(PlmTechnicalSpecificationSheet sheet) { |
|
|
|
|
|
if (sheet == null || !StringUtils.hasText(sheet.getSite()) || !StringUtils.hasText(sheet.getCodeNo())) { |
|
|
|
|
|
return ""; |
|
|
|
|
|
} |
|
|
|
|
|
String buNo = technicalSpecificationMapper.getTechnicalSpecificationBuNo(sheet.getSite(), sheet.getCodeNo()); |
|
|
|
|
|
return buNo == null ? "" : buNo; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public List<ChangeRequestVo> queryChangeLog(PlmTechnicalSpecificationSheetData data) { |
|
|
public List<ChangeRequestVo> queryChangeLog(PlmTechnicalSpecificationSheetData data) { |
|
|
return technicalSpecificationMapper.queryChangeLog(data); |
|
|
return technicalSpecificationMapper.queryChangeLog(data); |
|
|
|