From c6778d3b5624145cb5f5f10a1765deb778f02c81 Mon Sep 17 00:00:00 2001 From: jun Date: Mon, 3 Jun 2024 19:59:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=AE=9A=E4=B9=89=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/base/IMesPackingDefineDetailsService.java | 13 +++++ .../ext/mes/api/base/IMesPackingDefineService.java | 13 +++++ .../base/IMesPackingDefineTimeLinesService.java | 13 +++++ .../base/MesPackingDefineController.java | 21 ++++++++ .../base/MesPackingDefineDetailsController.java | 21 ++++++++ .../base/MesPackingDefineTimeLinesController.java | 21 ++++++++ .../base/MesPackingDefineDetailsServiceImpl.java | 63 ++++++++++++++++++++++ .../base/MesPackingDefineServiceImpl.java | 57 ++++++++++++++++++++ .../base/MesPackingDefineTimeLinesServiceImpl.java | 36 +++++++++++++ 9 files changed, 258 insertions(+) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPackingDefineDetailsService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPackingDefineService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPackingDefineTimeLinesService.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPackingDefineController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPackingDefineDetailsController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPackingDefineTimeLinesController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingDefineDetailsServiceImpl.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingDefineServiceImpl.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingDefineTimeLinesServiceImpl.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPackingDefineDetailsService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPackingDefineDetailsService.java new file mode 100644 index 0000000..613f6de --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPackingDefineDetailsService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesPackingDefineDetails; + +/** + * @Description : 包装定义维护明细 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/6/3 18:25 + * @Modify: + **/ +public interface IMesPackingDefineDetailsService extends IBaseMesService { +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPackingDefineService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPackingDefineService.java new file mode 100644 index 0000000..2c96557 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPackingDefineService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesPackingDefine; + +/** + * @Description : 包装定义维护 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/6/3 18:25 + * @Modify: + **/ +public interface IMesPackingDefineService extends IBaseMesService { +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPackingDefineTimeLinesService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPackingDefineTimeLinesService.java new file mode 100644 index 0000000..0b1534d --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPackingDefineTimeLinesService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesPackingDefineTimeLines; + +/** + * @Description : 包装定义维护时效性 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/6/3 18:25 + * @Modify: + **/ +public interface IMesPackingDefineTimeLinesService extends IBaseMesService { +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPackingDefineController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPackingDefineController.java new file mode 100644 index 0000000..a44ea04 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPackingDefineController.java @@ -0,0 +1,21 @@ +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.MesPackingDefine; +import cn.estsh.i3plus.pojo.mes.bean.MesPart; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : 包装定义维护 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/6/3 18:34 + * @Modify: + **/ +@Api("包装定义维护") +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPackingDefine") +public class MesPackingDefineController extends BaseMesController{ +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPackingDefineDetailsController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPackingDefineDetailsController.java new file mode 100644 index 0000000..420069e --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPackingDefineDetailsController.java @@ -0,0 +1,21 @@ +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.MesPackingDefine; +import cn.estsh.i3plus.pojo.mes.bean.MesPackingDefineDetails; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : 包装定义维护明细 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/6/3 18:34 + * @Modify: + **/ +@Api("包装定义维护明细") +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPackingDefineDetails") +public class MesPackingDefineDetailsController extends BaseMesController{ +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPackingDefineTimeLinesController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPackingDefineTimeLinesController.java new file mode 100644 index 0000000..1bb6bc3 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPackingDefineTimeLinesController.java @@ -0,0 +1,21 @@ +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.MesPackingDefine; +import cn.estsh.i3plus.pojo.mes.bean.MesPackingDefineTimeLines; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : 包装定义维护时效性 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/6/3 18:34 + * @Modify: + **/ +@Api("包装定义维护时效性") +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPackingDefineTimeLines") +public class MesPackingDefineTimeLinesController extends BaseMesController{ +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingDefineDetailsServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingDefineDetailsServiceImpl.java new file mode 100644 index 0000000..32c5105 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingDefineDetailsServiceImpl.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesPackingDefineDetailsService; +import cn.estsh.i3plus.ext.mes.apiservice.unit.exception.MesException; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesPackingDefineDetails; +import cn.estsh.i3plus.pojo.mes.bean.MesPartProduceType; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @Description : 包装定义维护明细 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/6/3 14:41 + * @Modify: + **/ +@Service +@Slf4j +public class MesPackingDefineDetailsServiceImpl extends BaseMesService implements IMesPackingDefineDetailsService { + + @Override + protected void setPackQueryBean(MesPackingDefineDetails bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getPackCode(), "packCode", packBean); + DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partName", packBean); + } + + @Override + protected void onInsertBean(MesPackingDefineDetails item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getPackCode(), "箱类别代号不能为空"); + ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空"); + + DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getPackCode(), "packCode", roadPackBean); + DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", roadPackBean); + + boolean flg = baseRDao.isExitByHql(roadPackBean); + if (flg) { + MesException.throwMesBusiException("箱类别代号【%s】物料号【%s】已经存在，请检查数据", item.getPackCode(),item.getPartNo()); + } + } + + @Override + protected void onUpdateBean(MesPackingDefineDetails item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getPackCode(), "箱类别代号不能为空"); + ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空"); + + + DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getPackCode(), "packCode", roadPackBean); + DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", roadPackBean); + DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", roadPackBean); + boolean flg = baseRDao.isExitByHql(roadPackBean); + if (flg) { + MesException.throwMesBusiException("箱类别代号【%s】物料号【%s】已经存在，请检查数据", item.getPackCode(),item.getPartNo()); + } + } +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingDefineServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingDefineServiceImpl.java new file mode 100644 index 0000000..75b0b82 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingDefineServiceImpl.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesPackingDefineService; +import cn.estsh.i3plus.ext.mes.apiservice.unit.exception.MesException; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesPackingDefine; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @Description : 包装定义维护 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/6/3 14:41 + * @Modify: + **/ +@Service +@Slf4j +public class MesPackingDefineServiceImpl extends BaseMesService implements IMesPackingDefineService { + + @Override + protected void setPackQueryBean(MesPackingDefine bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getPackCode(), "packCode", packBean); + DdlPreparedPack.getStringLikerPack(bean.getPackName(), "packName", packBean); + } + + @Override + protected void onInsertBean(MesPackingDefine item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getPackCode(), "箱类别代号不能为空"); + + DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getPackCode(), "packCode", roadPackBean); + + boolean flg = baseRDao.isExitByHql(roadPackBean); + if (flg) { + MesException.throwMesBusiException("箱类别代号【%s】已经存在，请检查数据", item.getPackCode()); + } + } + + @Override + protected void onUpdateBean(MesPackingDefine item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getPackCode(), "箱类别代号不能为空"); + + + DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getPackCode(), "packCode", roadPackBean); + DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", roadPackBean); + boolean flg = baseRDao.isExitByHql(roadPackBean); + if (flg) { + MesException.throwMesBusiException("箱类别代号【%s】已经存在，请检查数据", item.getPackCode()); + } + } +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingDefineTimeLinesServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingDefineTimeLinesServiceImpl.java new file mode 100644 index 0000000..8a60380 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingDefineTimeLinesServiceImpl.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesPackingDefineTimeLinesService; +import cn.estsh.i3plus.ext.mes.api.base.IMesPartProduceTypeService; +import cn.estsh.i3plus.ext.mes.apiservice.unit.exception.MesException; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesPackingDefineTimeLines; +import cn.estsh.i3plus.pojo.mes.bean.MesPartProduceType; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @Description : 包装定义维护时效性 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/6/3 14:41 + * @Modify: + **/ +@Service +@Slf4j +public class MesPackingDefineTimeLinesServiceImpl extends BaseMesService implements IMesPackingDefineTimeLinesService { + + @Override + protected void setPackQueryBean(MesPackingDefineTimeLines bean, DdlPackBean packBean) { + } + + @Override + protected void onInsertBean(MesPackingDefineTimeLines item) { + } + + @Override + protected void onUpdateBean(MesPackingDefineTimeLines item) { + } +}