From f7bcdab3d790e834f26294bf2a2a7d431f8ddfe8 Mon Sep 17 00:00:00 2001 From: gsz Date: Mon, 20 May 2024 14:31:31 +0800 Subject: [PATCH] =?UTF-8?q?Mes-Maximo=E4=BB=AA=E8=A1=A8=E4=B8=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AE&=E6=A8=A1=E5=85=B7=E6=98=A0=E5=B0=84=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/api/base/IMesMouldMappingCfgService.java | 13 ++++ .../base/MesMouldMappingCfgController.java | 18 ++++++ .../base/MesMouldMappingCfgServiceImpl.java | 70 ++++++++++++++++++++++ 3 files changed, 101 insertions(+) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMouldMappingCfgService.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMouldMappingCfgController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMouldMappingCfgServiceImpl.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMouldMappingCfgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMouldMappingCfgService.java new file mode 100644 index 0000000..0599bab --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMouldMappingCfgService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesMouldMappingCfg; + +/** + * @Description :模具映射关系维护 + * @Reference : + * @Author : gsz + * @CreateDate 2024/5/20 10:06 + * @Modify: + **/ +public interface IMesMouldMappingCfgService extends IBaseMesService { +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMouldMappingCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMouldMappingCfgController.java new file mode 100644 index 0000000..890fdab --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMouldMappingCfgController.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.ext.mes.apiservice.controller.base; + +import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.pojo.mes.bean.MesMouldMappingCfg; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description :模具映射关系维护 + * @Reference : + * @Author : gsz + * @CreateDate : 2024-05-20 10:16 + * @Modify: + **/ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesMouldMappingCfg") +public class MesMouldMappingCfgController extends BaseMesController{ +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMouldMappingCfgServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMouldMappingCfgServiceImpl.java new file mode 100644 index 0000000..6aecfb6 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMouldMappingCfgServiceImpl.java @@ -0,0 +1,70 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesMouldMappingCfgService; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.util.MesConstWords; +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.*; +import cn.estsh.i3plus.pojo.mes.repository.MesEquipmentRepository; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Objects; + + +/** + * @Description : 模具映射关系维护 + * @Reference : + * @Author : gsz + * @CreateDate 2024/5/20 10:06 + * @Modify: + **/ +@Service +@Slf4j +public class MesMouldMappingCfgServiceImpl extends BaseMesService implements IMesMouldMappingCfgService { + + @Autowired + private MesEquipmentRepository mesEquipmentRDao; + + protected void setPackQueryBean(MesMouldMappingCfg bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getAssetNum(), "assetNum", packBean); +// DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(), "equipmentCode", packBean); + } + protected void onInsertBean(MesMouldMappingCfg item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getOrganizeCode(), "工厂号不能为空"); + ValidatorBean.checkNotNull(item.getAssetNum(), "assetNum不能为空" ); + ValidatorBean.checkNotNull(item.getMouldNo(), "mouldNo不能为空"); + ValidatorBean.checkNotNull(item.getEquipmentCode(), "equipmentCode不能为空"); + + MesEquipment mesEquipmentDb = mesEquipmentRDao.getByProperty( + new String[]{MesConstWords.ORGANIZE_CODE, MesConstWords.IS_DELETED, MesConstWords.IS_VALID, "equipmentCode"}, + new Object[]{item.getOrganizeCode(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), + CommonEnumUtil.IS_VAILD.VAILD.getValue(), item.getEquipmentCode()}); + if (null == mesEquipmentDb) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("设备代码【%s】无效", item.getEquipmentCode()) + .build(); + } + DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getAssetNum(), "assetNum", packBean); + DdlPreparedPack.getStringEqualPack(item.getMouldNo(), "mouldNo", packBean); + DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(), "equipmentCode", packBean); + + boolean flg = baseRDao.isExitByHql(packBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("maximo模具号【%s】设备代码【%s】已经存在，请检查数据", item.getAssetNum(),item.getEquipmentCode()) + .build(); + } + } +}