diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleNosortCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleNosortCfgService.java index 987a546..f1fca0e 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleNosortCfgService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleNosortCfgService.java @@ -76,4 +76,30 @@ public class MesProdRuleNosortCfgService extends BaseMesService beanList) { + + for (MesProdRuleNosortCfg item : beanList) { + // 数据校验 + ValidatorBean.checkNotNull(item.getOutPartNo(), "产成零件号不能为空"); + ValidatorBean.checkNotNull(item.getEquipmentCode(), "设备不能为空"); + + DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + if (StringUtils.isEmpty(item.getInPartNo())) { + DdlPreparedPack.getStringEqualPack(item.getInPartNo(), "inPartNo", seriesPackBean); + } + DdlPreparedPack.getStringEqualPack(item.getOutPartNo(), "outPartNo", seriesPackBean); + DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(), "equipmentCode", seriesPackBean); + + + boolean flg = baseRDao.isExitByHql(seriesPackBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("该非排序加工规则已存在,请检查数据") + .build(); + } + } + } }