|
|
@ -299,7 +299,8 @@ public class PropertiesServiceImpl implements PropertiesService { |
|
|
|
|
|
|
|
|
//区分是否是工具方法过来的参数 |
|
|
//区分是否是工具方法过来的参数 |
|
|
if("TL".equalsIgnoreCase(functionType) || "TLI".equalsIgnoreCase(functionType)){ |
|
|
if("TL".equalsIgnoreCase(functionType) || "TLI".equalsIgnoreCase(functionType)){ |
|
|
return propertiesMapper.searchPropertiesChoose("*", functionType, list); |
|
|
|
|
|
|
|
|
//return propertiesMapper.searchPropertiesChoose("*", functionType, list); 暂时注释掉 |
|
|
|
|
|
return propertiesMapper.searchPropertiesUnChoose(inData.getSite(), functionType, list); |
|
|
}else { |
|
|
}else { |
|
|
return propertiesMapper.searchPropertiesUnChoose(inData.getSite(), functionType, list); |
|
|
return propertiesMapper.searchPropertiesUnChoose(inData.getSite(), functionType, list); |
|
|
} |
|
|
} |
|
|
@ -420,7 +421,8 @@ public class PropertiesServiceImpl implements PropertiesService { |
|
|
String recordType = inData.getRecordType(); |
|
|
String recordType = inData.getRecordType(); |
|
|
List<PartSubPropertiesValueData> result = null; |
|
|
List<PartSubPropertiesValueData> result = null; |
|
|
if("TL".equalsIgnoreCase(recordType) || "TLI".equalsIgnoreCase(recordType)){ |
|
|
if("TL".equalsIgnoreCase(recordType) || "TLI".equalsIgnoreCase(recordType)){ |
|
|
result = propertiesMapper.getPropertiesListByPartAndCodeNoForTool(inData); |
|
|
|
|
|
|
|
|
//result = propertiesMapper.getPropertiesListByPartAndCodeNoForTool(inData); 暂时不需要 |
|
|
|
|
|
result = propertiesMapper.getPropertiesListByPartAndCodeNo(inData); |
|
|
}else { |
|
|
}else { |
|
|
result = propertiesMapper.getPropertiesListByPartAndCodeNo(inData); |
|
|
result = propertiesMapper.getPropertiesListByPartAndCodeNo(inData); |
|
|
} |
|
|
} |
|
|
@ -428,7 +430,9 @@ public class PropertiesServiceImpl implements PropertiesService { |
|
|
if ("Y".equals(result.get(i).getValueChooseFlag())) { |
|
|
if ("Y".equals(result.get(i).getValueChooseFlag())) { |
|
|
//针对工具的情况 需要特殊设置 |
|
|
//针对工具的情况 需要特殊设置 |
|
|
if("TL".equalsIgnoreCase(recordType) || "TLI".equalsIgnoreCase(recordType)){ |
|
|
if("TL".equalsIgnoreCase(recordType) || "TLI".equalsIgnoreCase(recordType)){ |
|
|
List<PlmPropertiesItemAvailableData> availableList = partInformationMapper.getAvailableValueListForTool(result.get(i)); |
|
|
|
|
|
|
|
|
//List<PlmPropertiesItemAvailableData> availableList = partInformationMapper.getAvailableValueListForTool(result.get(i)); |
|
|
|
|
|
//result.get(i).setAvailableValueList(availableList); |
|
|
|
|
|
List<PlmPropertiesItemAvailableData> availableList = partInformationMapper.getAvailableValueList(result.get(i)); |
|
|
result.get(i).setAvailableValueList(availableList); |
|
|
result.get(i).setAvailableValueList(availableList); |
|
|
}else { |
|
|
}else { |
|
|
List<PlmPropertiesItemAvailableData> availableList = partInformationMapper.getAvailableValueList(result.get(i)); |
|
|
List<PlmPropertiesItemAvailableData> availableList = partInformationMapper.getAvailableValueList(result.get(i)); |
|
|
|