|
|
|
@ -115,6 +115,7 @@ public class JxOqcProjectService implements IJxOqcProjectService {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(model.getCheckType() == MesExtEnumUtil.CHECK_JUDGE_TYPE.COMPARE_TYPE.getValue()){
|
|
|
|
|
if (model.getBaseType() == null) model.setBaseType(MesExtEnumUtil.OQC_BASE_TYPE.DECIMALISM.getBase());
|
|
|
|
|
checkCompareValueTypeIsValid(model);
|
|
|
|
|
}else if(model.getCheckType() == MesExtEnumUtil.CHECK_JUDGE_TYPE.EQUIVALENCE_TYPE.getValue() && StringUtils.isEmpty(model.getStandardValue())){
|
|
|
|
|
throw ImppExceptionBuilder.newInstance()
|
|
|
|
@ -214,6 +215,7 @@ public class JxOqcProjectService implements IJxOqcProjectService {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(model.getCheckType() == MesExtEnumUtil.CHECK_JUDGE_TYPE.COMPARE_TYPE.getValue()){
|
|
|
|
|
if (model.getBaseType() == null) model.setBaseType(MesExtEnumUtil.OQC_BASE_TYPE.DECIMALISM.getBase());
|
|
|
|
|
checkCompareValueTypeIsValid(model);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -305,7 +307,6 @@ public class JxOqcProjectService implements IJxOqcProjectService {
|
|
|
|
|
int num = 0;
|
|
|
|
|
if(!StringUtils.isEmpty(model.getUpLimit())){
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
|
|
upLimit = baseConvertToDecimalism(model.getUpLimit(), model.getBaseType());
|
|
|
|
|
|
|
|
|
|
} catch (NumberFormatException e) {
|
|
|
|
|