jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

出货检验项目新增、编辑接口修改

Browse Source
tags/yfai-mes-ext-v1.0
yxw 1 year ago
parent 4ee5ca4f54
commit 5221589839
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File

41
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/jx/JxOqcProjectService.java
Unescape Escape View File

@ -88,7 +88,7 @@ public class JxOqcProjectService implements IJxOqcProjectService {
|| (MesExtEnumUtil.OQC_CHECK_TYPE.DAILY_INSPECTION.getValue() != model.getOqcNoType() &&
StringUtils.isEmpty(model.getCategoryCode3()))) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.QMS.getCode())
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.PARAMETER_EXCEPTION.getCode())
.setErrorDetail("参数异常")
.build();
@ -117,7 +117,7 @@ public class JxOqcProjectService implements IJxOqcProjectService {
if (null != oqcProjectDb) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.QMS.getCode())
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
.setErrorDetail("根据[检验单类型,物料或者产品类型,检验项目,序号]查询已经存在此条数据,请勿重复新增")
.build();
@ -128,7 +128,7 @@ public class JxOqcProjectService implements IJxOqcProjectService {
checkCompareValueTypeIsValid(model);
} else if(model.getCheckType() == MesExtEnumUtil.CHECK_JUDGE_TYPE.EQUIVALENCE_TYPE.getValue() && StringUtils.isEmpty(model.getStandardValue())){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.QMS.getCode())
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
.setErrorDetail("值类型为[等值类型],标准值不能为空")
.build();
@ -156,7 +156,7 @@ public class JxOqcProjectService implements IJxOqcProjectService {
String[] seqArr = seq.toString().split(MesExtConstWords.DECIMAL_POINT);
if (null != seqArr && seqArr.length == 2 && seqArr[1].length() > 1) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.QMS.getCode())
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.PARAMETER_EXCEPTION.getCode())
.setErrorDetail("序号最多1位小数")
.build();
@ -196,7 +196,7 @@ public class JxOqcProjectService implements IJxOqcProjectService {
MesOqcRuleNoteDetail oqcProjectDb = oqcProjectDao.getById(model.getId());
if (null == oqcProjectDb || CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == oqcProjectDb.getIsDeleted()) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.QMS.getCode())
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
.setErrorDetail("ID[%s]数据不存在", model.getId())
.build();
@ -217,7 +217,7 @@ public class JxOqcProjectService implements IJxOqcProjectService {
if (null != oqcProject && oqcProject.getId().compareTo(model.getId()) != 0) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.QMS.getCode())
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
.setErrorDetail("根据[检验单类型,物料或者产品类型,检验项目,序号]查询已经存在此条数据,修改失败")
.build();
@ -251,7 +251,7 @@ public class JxOqcProjectService implements IJxOqcProjectService {
public void updateOqcProjectValidById(JxOqcProjectModel model, String userName) {
if (model.getStatus() != CommonEnumUtil.IS_VAILD.INVAILD.getValue() && model.getStatus() != CommonEnumUtil.IS_VAILD.VAILD.getValue()) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.QMS.getCode())
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("启用，禁用枚举状态值[%s]未被定义", model.getStatus())
.build();
@ -263,7 +263,7 @@ public class JxOqcProjectService implements IJxOqcProjectService {
MesOqcRuleNoteDetail oqcProjectDb = oqcProjectDao.getById(id);
if (oqcProjectDb == null || CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == oqcProjectDb.getIsDeleted()) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.QMS.getCode())
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
.setErrorDetail("ID[%s]记录不存在", id)
.build();
@ -290,6 +290,9 @@ public class JxOqcProjectService implements IJxOqcProjectService {
}
private Double baseConvertToDecimalism(String value, int baseOfValue) {
if (MesExtEnumUtil.OQC_BASE_TYPE.DECIMALISM.getValue() == baseOfValue) return Double.valueOf(value);
return Double.valueOf(Integer.parseInt(value, MesExtEnumUtil.OQC_BASE_TYPE.baseOfValue(baseOfValue)));
}
@ -306,11 +309,11 @@ public class JxOqcProjectService implements IJxOqcProjectService {
standardValue = baseConvertToDecimalism(model.getStandardValue(), model.getBaseType());
} catch (NumberFormatException e) {
throwImppException(CommonEnumUtil.SOFT_TYPE.QMS.getCode(), ImppExceptionEnum.PARAMETER_EXCEPTION.getCode(), "请输入数字");
throwImppException(CommonEnumUtil.SOFT_TYPE.MES.getCode(), ImppExceptionEnum.PARAMETER_EXCEPTION.getCode(), "请输入数字");
}
String[] standard = model.getStandardValue().split(MesExtConstWords.DECIMAL_POINT);
if (null != standard && standard.length == 2 && standard[1].length() > 3) {
throwImppException(CommonEnumUtil.SOFT_TYPE.QMS.getCode(), ImppExceptionEnum.PARAMETER_EXCEPTION.getCode(), "最多三位小数");
throwImppException(CommonEnumUtil.SOFT_TYPE.MES.getCode(), ImppExceptionEnum.PARAMETER_EXCEPTION.getCode(), "最多三位小数");
}
}
int num = 0;
@ -319,11 +322,11 @@ public class JxOqcProjectService implements IJxOqcProjectService {
upLimit = baseConvertToDecimalism(model.getUpLimit(), model.getBaseType());
} catch (NumberFormatException e) {
throwImppException(CommonEnumUtil.SOFT_TYPE.QMS.getCode(), ImppExceptionEnum.PARAMETER_EXCEPTION.getCode(), "请输入数字");
throwImppException(CommonEnumUtil.SOFT_TYPE.MES.getCode(), ImppExceptionEnum.PARAMETER_EXCEPTION.getCode(), "请输入数字");
}
String[] standard = model.getUpLimit().split(MesExtConstWords.DECIMAL_POINT);
if (null != standard && standard.length == 2 && standard[1].length() > 3) {
throwImppException(CommonEnumUtil.SOFT_TYPE.QMS.getCode(), ImppExceptionEnum.PARAMETER_EXCEPTION.getCode(), "最多三位小数");
throwImppException(CommonEnumUtil.SOFT_TYPE.MES.getCode(), ImppExceptionEnum.PARAMETER_EXCEPTION.getCode(), "最多三位小数");
}
}else{
num++;
@ -333,18 +336,18 @@ public class JxOqcProjectService implements IJxOqcProjectService {
try {
downLimit = baseConvertToDecimalism(model.getDownLimit(), model.getBaseType());
} catch (NumberFormatException e) {
throwImppException(CommonEnumUtil.SOFT_TYPE.QMS.getCode(), ImppExceptionEnum.PARAMETER_EXCEPTION.getCode(), "请输入数字");
throwImppException(CommonEnumUtil.SOFT_TYPE.MES.getCode(), ImppExceptionEnum.PARAMETER_EXCEPTION.getCode(), "请输入数字");
}
String[] standard = model.getDownLimit().split(MesExtConstWords.DECIMAL_POINT);
if (null != standard && standard.length == 2 && standard[1].length() > 3) {
throwImppException(CommonEnumUtil.SOFT_TYPE.QMS.getCode(), ImppExceptionEnum.PARAMETER_EXCEPTION.getCode(), "最多三位小数");
throwImppException(CommonEnumUtil.SOFT_TYPE.MES.getCode(), ImppExceptionEnum.PARAMETER_EXCEPTION.getCode(), "最多三位小数");
}
}else{
num++;
}
if(num == 2){
throwImppException(CommonEnumUtil.SOFT_TYPE.QMS.getCode(), ImppExceptionEnum.PARAMETER_EXCEPTION.getCode(), "上限值和下限值需至少有一位有值");
throwImppException(CommonEnumUtil.SOFT_TYPE.MES.getCode(), ImppExceptionEnum.PARAMETER_EXCEPTION.getCode(), "上限值和下限值需至少有一位有值");
}
String computeType = null;
@ -361,22 +364,22 @@ public class JxOqcProjectService implements IJxOqcProjectService {
switch (computeType){
case ONE:
if(downLimit > standardValue || standardValue > upLimit || downLimit > upLimit){
throwImppException(CommonEnumUtil.SOFT_TYPE.QMS.getCode(), ImppExceptionEnum.VARIFY_EXCEPTION.getCode(), "比值范围输入不合理");
throwImppException(CommonEnumUtil.SOFT_TYPE.MES.getCode(), ImppExceptionEnum.VARIFY_EXCEPTION.getCode(), "比值范围输入不合理");
}
break;
case TWO:
if(standardValue < downLimit){
throwImppException(CommonEnumUtil.SOFT_TYPE.QMS.getCode(), ImppExceptionEnum.VARIFY_EXCEPTION.getCode(), "标准值小于下限值");
throwImppException(CommonEnumUtil.SOFT_TYPE.MES.getCode(), ImppExceptionEnum.VARIFY_EXCEPTION.getCode(), "标准值小于下限值");
}
break;
case THREE:
if(standardValue > upLimit){
throwImppException(CommonEnumUtil.SOFT_TYPE.QMS.getCode(), ImppExceptionEnum.VARIFY_EXCEPTION.getCode(), "标准值大于上限值");
throwImppException(CommonEnumUtil.SOFT_TYPE.MES.getCode(), ImppExceptionEnum.VARIFY_EXCEPTION.getCode(), "标准值大于上限值");
}
break;
case FOUR:
if(downLimit > upLimit){
throwImppException(CommonEnumUtil.SOFT_TYPE.QMS.getCode(), ImppExceptionEnum.VARIFY_EXCEPTION.getCode(), "上限值小于下限值");
throwImppException(CommonEnumUtil.SOFT_TYPE.MES.getCode(), ImppExceptionEnum.VARIFY_EXCEPTION.getCode(), "上限值小于下限值");
}
}
}

Write Preview
Loading…
Cancel
Save