From 182186077ca8dec1d8265dc407b5920ee9d39355 Mon Sep 17 00:00:00 2001 From: pzj Date: Fri, 20 Sep 2024 09:39:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=89=E7=A6=BB=E5=AD=90=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=20=E5=8F=AF=E5=9B=9E=E7=94=A8=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E7=B1=BB=E5=9E=8B=E3=80=81=E5=8F=AF=E5=9B=9E=E7=94=A8?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E3=80=81=E5=8F=AF=E5=9B=9E=E7=94=A8=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E9=9B=B6=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/base/IMesRecyclablePackagePartService.java | 16 +++++ .../mes/api/base/IMesRecyclablePackageService.java | 14 +++++ .../api/base/IMesRecyclablePackageTypeService.java | 14 +++++ .../base/MesRecyclablePackageController.java | 20 +++++++ .../base/MesRecyclablePackagePartController.java | 19 ++++++ .../base/MesRecyclablePackageTypeController.java | 19 ++++++ .../base/MesRecyclablePackagePartServiceImpl.java | 60 +++++++++++++++++++ .../base/MesRecyclablePackageServiceImpl.java | 61 +++++++++++++++++++ .../base/MesRecyclablePackageTypeServiceImpl.java | 70 ++++++++++++++++++++++ 9 files changed, 293 insertions(+) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesRecyclablePackagePartService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesRecyclablePackageService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesRecyclablePackageTypeService.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesRecyclablePackageController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesRecyclablePackagePartController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesRecyclablePackageTypeController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesRecyclablePackagePartServiceImpl.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesRecyclablePackageServiceImpl.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesRecyclablePackageTypeServiceImpl.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesRecyclablePackagePartService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesRecyclablePackagePartService.java new file mode 100644 index 0000000..058ab54 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesRecyclablePackagePartService.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.recyclablepackage.MesRecyclablePackagePart; + +/** + * @Description : + * @Reference : + * @Author : PZJ + * @CreateDate : 2024/9/14 13:40 + * @Modify: + **/ +public interface IMesRecyclablePackagePartService extends IBaseMesService{ + + + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesRecyclablePackageService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesRecyclablePackageService.java new file mode 100644 index 0000000..dab4972 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesRecyclablePackageService.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.recyclablepackage.MesRecyclablePackage; + +/** + * @Description : + * @Reference : + * @Author : PZJ + * @CreateDate : 2024/9/14 10:02 + * @Modify: + **/ +public interface IMesRecyclablePackageService extends IBaseMesService{ + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesRecyclablePackageTypeService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesRecyclablePackageTypeService.java new file mode 100644 index 0000000..703b131 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesRecyclablePackageTypeService.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.recyclablepackage.MesRecyclablePackageType; + +/** + * @Description : 回收物包装类型 + * @Reference : + * @Author : PZJ + * @CreateDate : 2024/9/13 17:36 + * @Modify: + **/ +public interface IMesRecyclablePackageTypeService extends IBaseMesService{ + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesRecyclablePackageController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesRecyclablePackageController.java new file mode 100644 index 0000000..b5927da --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesRecyclablePackageController.java @@ -0,0 +1,20 @@ +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.recyclablepackage.MesRecyclablePackage; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : 回收包装 + * @Reference : + * @Author : PZJ + * @CreateDate : 2024/9/14 10:00 + * @Modify: + **/ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesRecyclablePackage") +public class MesRecyclablePackageController extends BaseMesController { + + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesRecyclablePackagePartController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesRecyclablePackagePartController.java new file mode 100644 index 0000000..58f59d2 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesRecyclablePackagePartController.java @@ -0,0 +1,19 @@ +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.recyclablepackage.MesRecyclablePackagePart; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : 回收包装零件 + * @Reference : + * @Author : PZJ + * @CreateDate : 2024/9/14 10:57 + * @Modify: + **/ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesRecyclablePackagePart") +public class MesRecyclablePackagePartController extends BaseMesController{ + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesRecyclablePackageTypeController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesRecyclablePackageTypeController.java new file mode 100644 index 0000000..6452180 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesRecyclablePackageTypeController.java @@ -0,0 +1,19 @@ +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.recyclablepackage.MesRecyclablePackageType; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : 回收包装类型 + * @Reference : + * @Author : PZJ + * @CreateDate : 2024/9/13 17:14 + * @Modify: + **/ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesRecyclablePackageType") +public class MesRecyclablePackageTypeController extends BaseMesController { + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesRecyclablePackagePartServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesRecyclablePackagePartServiceImpl.java new file mode 100644 index 0000000..afd0fce --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesRecyclablePackagePartServiceImpl.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesRecyclablePackagePartService; +import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.recyclablepackage.MesRecyclablePackagePart; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +/** + * @Description : + * @Reference : + * @Author : PZJ + * @CreateDate : 2024/9/14 13:45 + * @Modify: + **/ +@Slf4j +@Service +public class MesRecyclablePackagePartServiceImpl extends BaseMesService implements IMesRecyclablePackagePartService { + + + @Override + protected void onInsertBean(MesRecyclablePackagePart item) { + ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空"); + ValidatorBean.checkNotNull(item.getPackageTypeCode(), "包类型不能为空"); + DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", seriesPackBean); + if (baseRDao.isExitByHql(seriesPackBean)) { + MesException.throwMesBusiException("零件号【%s】已存在", item.getPartNo()); + } + } + + @Override + protected void setPackQueryBean(MesRecyclablePackagePart bean, DdlPackBean packBean) { + String packageTypeCode = bean.getPackageTypeCode(); + if (!StringUtils.isEmpty(packageTypeCode)) { + DdlPreparedPack.getStringLikerPack(packageTypeCode, "packageTypeCode", packBean); + } + String partNo = bean.getPartNo(); + if (!StringUtils.isEmpty(partNo)) { + DdlPreparedPack.getStringLikerPack(partNo, "partNo", packBean); + } + } + + @Override + protected void onUpdateBean(MesRecyclablePackagePart item) { + ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空"); + ValidatorBean.checkNotNull(item.getPackageTypeCode(), "包类型不能为空"); + DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", seriesPackBean); + DdlPreparedPack.getNumNOEqualPack(item.getId(),"id",seriesPackBean); + if (baseRDao.isExitByHql(seriesPackBean)) { + MesException.throwMesBusiException("零件号【%s】已存在", item.getPartNo()); + } + } + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesRecyclablePackageServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesRecyclablePackageServiceImpl.java new file mode 100644 index 0000000..393ebe4 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesRecyclablePackageServiceImpl.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesRecyclablePackageService; +import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.recyclablepackage.MesRecyclablePackage; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +/** + * @Description : + * @Reference : + * @Author : PZJ + * @CreateDate : 2024/9/14 10:03 + * @Modify: + **/ +@Slf4j +@Service +public class MesRecyclablePackageServiceImpl extends BaseMesService implements IMesRecyclablePackageService { + + @Override + protected void onInsertBean(MesRecyclablePackage item) { + ValidatorBean.checkNotNull(item.getPackageTypeCode(), "包类型不能为空"); + ValidatorBean.checkNotNull(item.getPackageSn(), "包条码不能为空"); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getPackageSn(), "packageSn", ddlPackBean); + if (baseRDao.isExitByHql(ddlPackBean)) { + MesException.throwMesBusiException("回收包装条码【%s】已存在", item.getPackageSn()); + } + } + + @Override + protected void onUpdateBean(MesRecyclablePackage item) { + ValidatorBean.checkNotNull(item.getId(), "id不能为空"); + ValidatorBean.checkNotNull(item.getPackageTypeCode(), "包类型不能为空"); + ValidatorBean.checkNotNull(item.getPackageSn(), "包条码不能为空"); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getPackageSn(), "packageSn", ddlPackBean); + DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", ddlPackBean); + if (baseRDao.isExitByHql(ddlPackBean)) { + MesException.throwMesBusiException("回收包装条码【%s】已存在", item.getPackageSn()); + } + } + + @Override + protected void setPackQueryBean(MesRecyclablePackage bean, DdlPackBean packBean) { + String packageTypeCode = bean.getPackageTypeCode(); + if (!StringUtils.isEmpty(packageTypeCode)) { + DdlPreparedPack.getStringLikerPack(packageTypeCode, "packageTypeCode", packBean); + } + String packageSn = bean.getPackageSn(); + if (!StringUtils.isEmpty(packageSn)) { + DdlPreparedPack.getStringLikerPack(packageSn, "packageSn", packBean); + } + } + + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesRecyclablePackageTypeServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesRecyclablePackageTypeServiceImpl.java new file mode 100644 index 0000000..691ec4b --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesRecyclablePackageTypeServiceImpl.java @@ -0,0 +1,70 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesRecyclablePackageTypeService; +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.recyclablepackage.MesRecyclablePackageType; +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; + +/** + * @Description : + * @Reference : + * @Author : PZJ + * @CreateDate : 2024/9/13 17:38 + * @Modify: + **/ +@Slf4j +@Service +public class MesRecyclablePackageTypeServiceImpl extends BaseMesService implements IMesRecyclablePackageTypeService { + + + + @Override + protected void onInsertBean(MesRecyclablePackageType item) { + ValidatorBean.checkNotNull(item.getPackageTypeCode(), "包类型不能为空"); + ValidatorBean.checkNotNull(item.getPackageTypeName(), "包描述不能为空"); + ValidatorBean.checkNotNull(item.getRuleType(),"规则类型不能为空"); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getPackageTypeCode(), "packageTypeCode", ddlPackBean); + if (baseRDao.isExitByHql(ddlPackBean)) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode( ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("回收包装类型已存在{}", item.getPackageTypeCode()) + .build(); + } + } + + @Override + protected void setPackQueryBean(MesRecyclablePackageType bean, DdlPackBean packBean) { + String packageTypeCode = bean.getPackageTypeCode(); + if (!StringUtils.isEmpty(packageTypeCode)) { + DdlPreparedPack.getStringLikerPack(packageTypeCode, "packageTypeCode", packBean); + } + } + + @Override + protected void onUpdateBean(MesRecyclablePackageType item) { + ValidatorBean.checkNotNull(item.getId(), "id不能为空"); + ValidatorBean.checkNotNull(item.getPackageTypeCode(), "包类型不能为空"); + ValidatorBean.checkNotNull(item.getPackageTypeName(), "包描述不能为空"); + ValidatorBean.checkNotNull(item.getRuleType(),"规则类型不能为空"); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getPackageTypeCode(), "packageTypeCode", ddlPackBean); + DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", ddlPackBean); + if (baseRDao.isExitByHql(ddlPackBean)) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode( ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("回收包装类型已存在{}", item.getPackageTypeCode()) + .build(); + } + } + +}