From 6e5b385fac8fc356a5465d61745586087260da47 Mon Sep 17 00:00:00 2001 From: yxw Date: Wed, 15 Nov 2023 11:16:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E8=B4=A7=E6=A3=80=E9=AA=8C=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/jx/JxOqcProjectService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/jx/JxOqcProjectService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/jx/JxOqcProjectService.java index 16f93c7..a5dd253 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/jx/JxOqcProjectService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/jx/JxOqcProjectService.java @@ -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) {