|
|
@ -208,6 +208,7 @@ public class TechnicalClassBean { |
|
|
for(PartIfsCatalogProperty tempData : paramList) { |
|
|
for(PartIfsCatalogProperty tempData : paramList) { |
|
|
//设置替代的ifs的key |
|
|
//设置替代的ifs的key |
|
|
tempData.setTechnicalSpecNo(technicalSpecNo); |
|
|
tempData.setTechnicalSpecNo(technicalSpecNo); |
|
|
|
|
|
logger.info("属性编码:"+tempData.getAttribute()); |
|
|
//api修改参数 |
|
|
//api修改参数 |
|
|
Map<String, String> resultMap = TechnicalClassApi.modifyTechnicalAttribute(srv, tempData); |
|
|
Map<String, String> resultMap = TechnicalClassApi.modifyTechnicalAttribute(srv, tempData); |
|
|
//设置记录的版本 |
|
|
//设置记录的版本 |
|
|
@ -268,12 +269,18 @@ public class TechnicalClassBean { |
|
|
&& (null == valueNo || "NULL".equalsIgnoreCase(valueNo) || valueNo.trim().isEmpty())){ |
|
|
&& (null == valueNo || "NULL".equalsIgnoreCase(valueNo) || valueNo.trim().isEmpty())){ |
|
|
continue; |
|
|
continue; |
|
|
}else if (!newValueNo.equals(valueNo)){ |
|
|
}else if (!newValueNo.equals(valueNo)){ |
|
|
//判断是否是相同大小的数字 |
|
|
|
|
|
BigDecimal oriValue = new BigDecimal(valueNo); |
|
|
|
|
|
oriValue = oriValue.setScale(6, BigDecimal.ROUND_HALF_UP); |
|
|
|
|
|
BigDecimal newValue = new BigDecimal(newValueNo); |
|
|
|
|
|
if(oriValue.compareTo(newValue) == 0) { |
|
|
|
|
|
continue; |
|
|
|
|
|
|
|
|
if ((newValueNo != null && "".equals(newValueNo.trim())) || (valueNo != null && "".equals(valueNo.trim()))){ |
|
|
|
|
|
//添加ifsRowId ifsRowVersion |
|
|
|
|
|
logger.info("可以放到修改中: 原始值:"+valueNo+",新值:"+newValueNo); |
|
|
|
|
|
}else { |
|
|
|
|
|
//判断是否是相同大小的数字 |
|
|
|
|
|
BigDecimal oriValue = new BigDecimal(valueNo); |
|
|
|
|
|
oriValue = oriValue.setScale(6, BigDecimal.ROUND_HALF_UP); |
|
|
|
|
|
logger.info("原始值:"+oriValue+",新值:"+newValueNo); |
|
|
|
|
|
BigDecimal newValue = new BigDecimal(newValueNo); |
|
|
|
|
|
if(oriValue.compareTo(newValue) == 0) { |
|
|
|
|
|
continue; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|