From 56e2819e4217c659921276e74d0154d6f408564f Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 18 Feb 2025 15:57:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=90=E5=93=81=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E8=A7=84=E5=88=99=20=E4=B8=BB=E6=95=B0=E6=8D=AE=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/MesPackingPartTypeService.java | 50 ++++++++++++++++++++ .../base/MesPackingRuleDetailService.java | 55 ++++++++++++++++++++++ .../serviceimpl/base/MesPackingRuleService.java | 53 +++++++++++++++++++++ 3 files changed, 158 insertions(+) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingPartTypeService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingPartTypeService.java index 4097701..7d8b431 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingPartTypeService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingPartTypeService.java @@ -2,12 +2,18 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesPackingPartTypeService; import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesPackingPartType; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.List; + @Service @Slf4j public class MesPackingPartTypeService extends BaseMesService implements IMesPackingPartTypeService { @@ -18,4 +24,48 @@ public class MesPackingPartTypeService extends BaseMesService validateReturnImport(List beanList) { + for (MesPackingPartType item : beanList) { + onInsertBean(item); + } + return beanList; + } + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingRuleDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingRuleDetailService.java index 2a0f5f5..dd85aa6 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingRuleDetailService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingRuleDetailService.java @@ -2,12 +2,19 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesPackingRuleDetailService; import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesPackingRuleDetail; +import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.List; + @Service @Slf4j public class MesPackingRuleDetailService extends BaseMesService implements IMesPackingRuleDetailService { @@ -19,4 +26,52 @@ public class MesPackingRuleDetailService extends BaseMesService validateReturnImport(List beanList) { + for (MesPackingRuleDetail item : beanList) { + onInsertBean(item); + } + return beanList; + } + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingRuleService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingRuleService.java index 74cacf4..e6203a8 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingRuleService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingRuleService.java @@ -2,11 +2,18 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesPackingRuleService; import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesPackingRule; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import java.util.List; @Service @Slf4j @@ -23,4 +30,50 @@ public class MesPackingRuleService extends BaseMesService implem DdlPreparedPack.getStringLikerPack(bean.getPrinter(), MesExtConstWords.PRINTER, packBean); } + @Override + protected void onInsertBean(MesPackingRule item) { + ValidatorBean.checkNotNull(item.getPackageCode(), "包装代码不能为空"); + ValidatorBean.checkNotNull(item.getGenerateType(), "统计方式不能为空"); + + DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(item.getPackageCode(), MesExtConstWords.PACKAGE_CODE, packBean); + Boolean flg = baseRDao.isExitByHql(packBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("包装代码[%s]信息已经存在，请检查数据", item.getPackageCode()) + .build(); + } + if (StringUtils.isEmpty(item.getDefaultFlag()) || item.getDefaultFlag().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) != 0) item.setDefaultFlag(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + } + + @Override + protected void onUpdateBean(MesPackingRule item) { + ValidatorBean.checkNotNull(item.getId(), "包装代码不能为空"); + ValidatorBean.checkNotNull(item.getPackageCode(), "包装代码不能为空"); + ValidatorBean.checkNotNull(item.getGenerateType(), "统计方式不能为空"); + + DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(item.getPackageCode(), MesExtConstWords.PACKAGE_CODE, packBean); + DdlPreparedPack.getNumNOEqualPack(item.getId(), MesExtConstWords.ID, packBean); + Boolean flg = baseRDao.isExitByHql(packBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("包装代码[%s]信息已经存在，请检查数据", item.getPackageCode()) + .build(); + } + if (StringUtils.isEmpty(item.getDefaultFlag()) || item.getDefaultFlag().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) != 0) item.setDefaultFlag(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + } + + @Override + public List validateReturnImport(List beanList) { + for (MesPackingRule item : beanList) { + onInsertBean(item); + } + return beanList; + } + } From 690d072318b23afa50bd43739f2ce98efafd4691 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 20 Feb 2025 20:49:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/apiservice/serviceimpl/base/MesPackingPartTypeService.java | 4 ++-- .../mes/apiservice/serviceimpl/base/MesPackingRuleDetailService.java | 4 ++-- .../ext/mes/apiservice/serviceimpl/base/MesPackingRuleService.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingPartTypeService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingPartTypeService.java index 7d8b431..fda1987 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingPartTypeService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingPartTypeService.java @@ -30,7 +30,7 @@ public class MesPackingPartTypeService extends BaseMesService implem ValidatorBean.checkNotNull(item.getGenerateType(), "统计方式不能为空"); DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringLikerPack(item.getPackageCode(), MesExtConstWords.PACKAGE_CODE, packBean); + DdlPreparedPack.getStringEqualPack(item.getPackageCode(), MesExtConstWords.PACKAGE_CODE, packBean); Boolean flg = baseRDao.isExitByHql(packBean); if (flg) { throw ImppExceptionBuilder.newInstance() @@ -55,7 +55,7 @@ public class MesPackingRuleService extends BaseMesService implem ValidatorBean.checkNotNull(item.getGenerateType(), "统计方式不能为空"); DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringLikerPack(item.getPackageCode(), MesExtConstWords.PACKAGE_CODE, packBean); + DdlPreparedPack.getStringEqualPack(item.getPackageCode(), MesExtConstWords.PACKAGE_CODE, packBean); DdlPreparedPack.getNumNOEqualPack(item.getId(), MesExtConstWords.ID, packBean); Boolean flg = baseRDao.isExitByHql(packBean); if (flg) {