From bb727380acf4204d733e57d970ee203e8eb5c890 Mon Sep 17 00:00:00 2001 From: "zhang.xw" Date: Tue, 30 Apr 2024 20:34:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=B8=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/api/base/IMesAreaService.java | 14 ++++++ .../i3plus/ext/mes/api/base/IMesBomService.java | 14 ++++++ .../base/IMesCustomerCarModelDetailService.java | 14 ++++++ .../mes/api/base/IMesCustomerCarModelService.java | 13 +++++ .../mes/api/base/IMesCustomerOriganizeService.java | 14 ++++++ .../ext/mes/api/base/IMesCustomerPartService.java | 14 ++++++ .../ext/mes/api/base/IMesCustomerService.java | 14 ++++++ .../ext/mes/api/base/IMesPartPtrDetailService.java | 15 ++++++ .../ext/mes/api/base/IMesPartPtrService.java | 5 +- .../i3plus/ext/mes/api/base/IMesPartService.java | 14 ++++++ .../ext/mes/api/base/IMesWorkCellService.java | 14 ++++++ .../ext/mes/api/base/IMesWorkCenterService.java | 14 ++++++ .../serviceimpl/base/MesAreaService.java | 3 +- .../apiservice/serviceimpl/base/MesBomService.java | 10 +++- .../base/MesCustomerCarModelDetailService.java | 41 +++++++++++++++- .../base/MesCustomerCarModelService.java | 53 +++++++++++++++++++- .../base/MesCustomerMessagePointService.java | 48 ++++++++++++++++++ .../base/MesCustomerOriganizeService.java | 57 +++++++++++++++++++++- .../serviceimpl/base/MesCustomerPartService.java | 19 +++++++- .../serviceimpl/base/MesCustomerService.java | 52 +++++++++++++++++++- .../serviceimpl/base/MesPartPtrDetailService.java | 7 ++- .../serviceimpl/base/MesPartPtrService.java | 11 ++++- .../serviceimpl/base/MesPartService.java | 11 ++++- .../serviceimpl/base/MesShiftService.java | 13 ++++- .../serviceimpl/base/MesWorkCellService.java | 3 +- .../serviceimpl/base/MesWorkCenterService.java | 4 +- 26 files changed, 475 insertions(+), 16 deletions(-) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAreaService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerCarModelDetailService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerCarModelService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerOriganizeService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerPartService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartPtrDetailService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCenterService.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAreaService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAreaService.java new file mode 100644 index 0000000..f5ee295 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAreaService.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesArea; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomer; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author mingliang.li + */ +public interface IMesAreaService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java new file mode 100644 index 0000000..9e9d2ae --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesArea; +import cn.estsh.i3plus.pojo.mes.bean.MesBom; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author mingliang.li + */ +public interface IMesBomService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerCarModelDetailService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerCarModelDetailService.java new file mode 100644 index 0000000..e062b64 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerCarModelDetailService.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesBom; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModelDetail; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author mingliang.li + */ +public interface IMesCustomerCarModelDetailService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerCarModelService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerCarModelService.java new file mode 100644 index 0000000..5b6b0c9 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerCarModelService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModel; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author mingliang.li + */ +public interface IMesCustomerCarModelService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerOriganizeService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerOriganizeService.java new file mode 100644 index 0000000..09d6881 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerOriganizeService.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesCustomer; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerOriganze; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author mingliang.li + */ +public interface IMesCustomerOriganizeService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerPartService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerPartService.java new file mode 100644 index 0000000..b9516a8 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerPartService.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesArea; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author mingliang.li + */ +public interface IMesCustomerPartService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerService.java new file mode 100644 index 0000000..f75d6bb --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerService.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesCustomer; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerRoad; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author mingliang.li + */ +public interface IMesCustomerService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartPtrDetailService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartPtrDetailService.java new file mode 100644 index 0000000..20426bf --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartPtrDetailService.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesPartPtr; +import cn.estsh.i3plus.pojo.mes.bean.MesPartPtrDetail; +import cn.estsh.impp.framework.boot.util.ResultBean; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author mingliang.li + */ +public interface IMesPartPtrDetailService extends IBaseMesService{ + + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartPtrService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartPtrService.java index 4fe1a20..92ab741 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartPtrService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartPtrService.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.ext.mes.api.base; +import cn.estsh.i3plus.pojo.mes.bean.MesPart; +import cn.estsh.i3plus.pojo.mes.bean.MesPartPtr; import cn.estsh.i3plus.pojo.mes.bean.MesPartPull; import cn.estsh.impp.framework.boot.util.ResultBean; @@ -8,7 +10,6 @@ import cn.estsh.impp.framework.boot.util.ResultBean; * @CreateDate 2024/04/16 * @Author mingliang.li */ -public interface IMesPartPtrService { +public interface IMesPartPtrService extends IBaseMesService{ - ResultBean getDetailById(int id); } diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartService.java new file mode 100644 index 0000000..c3fde06 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartService.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesBom; +import cn.estsh.i3plus.pojo.mes.bean.MesPart; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author mingliang.li + */ +public interface IMesPartService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellService.java new file mode 100644 index 0000000..bbac68d --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellService.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesArea; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author mingliang.li + */ +public interface IMesWorkCellService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCenterService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCenterService.java new file mode 100644 index 0000000..3a2c7a4 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCenterService.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author mingliang.li + */ +public interface IMesWorkCenterService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesAreaService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesAreaService.java index 6a04a66..a0f7c6b 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesAreaService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesAreaService.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesAreaService; import cn.estsh.i3plus.pojo.mes.bean.MesArea; import cn.estsh.i3plus.pojo.mes.bean.MesPart; import lombok.extern.slf4j.Slf4j; @@ -7,6 +8,6 @@ import org.springframework.stereotype.Service; @Service @Slf4j -public class MesAreaService extends BaseMesService { +public class MesAreaService extends BaseMesService implements IMesAreaService { } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java index 4ad99a5..86803a2 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java @@ -1,12 +1,20 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesBomService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesBom; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomer; import cn.estsh.i3plus.pojo.mes.bean.MesPart; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Service @Slf4j -public class MesBomService extends BaseMesService { +public class MesBomService extends BaseMesService implements IMesBomService { + protected void setPackQueryBean(MesBom bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getBomVersion(), "bomVersion", packBean); + DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean); + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelDetailService.java index d60d6b2..ba4de99 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelDetailService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelDetailService.java @@ -1,12 +1,51 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerCarModelDetailService; +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.MesCustomerCarModel; import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModelDetail; +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; @Service @Slf4j -public class MesCustomerCarModelDetailService extends BaseMesService{ +public class MesCustomerCarModelDetailService extends BaseMesService implements IMesCustomerCarModelDetailService { + protected void onInsertBean(MesCustomerCarModelDetail item) { + // 数据校验 + DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getCustomerPartNo(), "customerPartNo", roadPackBean); + + boolean flg = baseRDao.isExitByHql(roadPackBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("客户零件号【%s】已经存在，请检查数据", item.getCustomerPartNo()) + .build(); + } + + } + + protected void onUpdateBean(MesCustomerCarModelDetail item) { + // 数据校验 + + DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getCustomerPartNo(), "customerPartNo", roadPackBean); + + DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", roadPackBean); + boolean flg = baseRDao.isExitByHql(roadPackBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("客户零件号【%s】已经存在，请检查数据", item.getCustomerPartNo()) + .build(); + } + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelService.java index aaf1429..5c61cb1 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelService.java @@ -1,11 +1,62 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerCarModelDetailService; +import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerCarModelService; +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.MesBom; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomer; import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModel; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerRoad; +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; @Service @Slf4j -public class MesCustomerCarModelService extends BaseMesService{ +public class MesCustomerCarModelService extends BaseMesService implements IMesCustomerCarModelService { + protected void setPackQueryBean(MesCustomerCarModel bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getCustomerOrganizeCode(), "customerOrganizeCode", packBean); + DdlPreparedPack.getStringLikerPack(bean.getCarModelCode(), "carModelCode", packBean); + } + protected void onInsertBean(MesCustomerCarModel item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getCarModelCode(), "车型不能为空"); + + DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getCarModelCode(), "carModelCode", roadPackBean); + DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean); + + boolean flg = baseRDao.isExitByHql(roadPackBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("客户代码【%s】下车型【%s】已经存在，请检查数据", item.getOrganizeCode(),item.getCustomerCode()) + .build(); + } + + } + + protected void onUpdateBean(MesCustomerCarModel item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getCarModelCode(), "车型不能为空"); + + DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getCarModelCode(), "carModelCode", roadPackBean); + DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean); + DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", roadPackBean); + boolean flg = baseRDao.isExitByHql(roadPackBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("客户代码【%s】下车型【%s】已经存在，请检查数据", item.getOrganizeCode(),item.getCustomerCode()) + .build(); + } + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerMessagePointService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerMessagePointService.java index 8252c8c..ba245b6 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerMessagePointService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerMessagePointService.java @@ -1,12 +1,60 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerMessagePointService; +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.MesCustomer; import cn.estsh.i3plus.pojo.mes.bean.MesCustomerMessagePoint; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerOriganze; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerRoad; +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; @Service @Slf4j public class MesCustomerMessagePointService extends BaseMesService implements IMesCustomerMessagePointService { + protected void onInsertBean(MesCustomerMessagePoint item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getMessageNo(), "信息点代码不能为空"); + DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getMessageNo(), "messageNo", roadPackBean); + DdlPreparedPack.getStringEqualPack(item.getOrganizeCode(), "organizeCode", roadPackBean); + + boolean flg = baseRDao.isExitByHql(roadPackBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("信息点代码【%s】已经存在，请检查数据", item.getMessageNo()) + .build(); + } + + } + + protected void onUpdateBean(MesCustomerMessagePoint item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getMessageNo(), "信息点代码不能为空"); + + DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getMessageNo(), "messageNo", roadPackBean); + DdlPreparedPack.getStringEqualPack(item.getOrganizeCode(), "organizeCode", roadPackBean); + DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", roadPackBean); + boolean flg = baseRDao.isExitByHql(roadPackBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("信息点代码【%s】已经存在，请检查数据", item.getMessageNo()) + .build(); + } + } + + protected void setPackQueryBean(MesCustomerMessagePoint bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getCustomerOrganizeCode(), "customerOrganizeCode", packBean); + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerOriganizeService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerOriganizeService.java index 66fd80c..6311342 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerOriganizeService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerOriganizeService.java @@ -1,7 +1,16 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerOriganizeService; +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.MesCustomer; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModel; import cn.estsh.i3plus.pojo.mes.bean.MesCustomerOriganze; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerRoad; +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; @@ -12,6 +21,52 @@ import org.springframework.stereotype.Service; */ @Service @Slf4j -public class MesCustomerOriganizeService extends BaseMesService { +public class MesCustomerOriganizeService extends BaseMesService implements IMesCustomerOriganizeService { + + protected void onInsertBean(MesCustomerOriganze item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空"); + + DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean); + DdlPreparedPack.getStringEqualPack(item.getCustomerOrganizeCode(), "customerOrganizeCode", roadPackBean); + + boolean flg = baseRDao.isExitByHql(roadPackBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("客户工厂【%s】下客户代码【%s】已经存在，请检查数据", item.getOrganizeCode(),item.getCustomerCode()) + .build(); + } + + } + + protected void onUpdateBean(MesCustomerOriganze item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空"); + + DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean); + DdlPreparedPack.getStringEqualPack(item.getCustomerOrganizeCode(), "customerOrganizeCode", roadPackBean); + + DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", roadPackBean); + boolean flg = baseRDao.isExitByHql(roadPackBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("客户工厂【%s】下客户代码【%s】已经存在，请检查数据", item.getOrganizeCode(),item.getCustomerCode()) + .build(); + } + } + + + protected void setPackQueryBean(MesCustomerOriganze bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getCustomerOrganizeCode(), "customerOrganizeCode", packBean); + DdlPreparedPack.getStringLikerPack(bean.getCustomerOrganizeName(), "customerOrganizeName", packBean); + DdlPreparedPack.getStringEqualPack(bean.getCustomerCode(), "customerCode", packBean); + + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerPartService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerPartService.java index fabeba7..941918a 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerPartService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerPartService.java @@ -1,9 +1,19 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerPartService; +import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomer; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerOriganze; import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Description: * @CreateDate: 2023/10/11 15:38 @@ -11,6 +21,13 @@ import org.springframework.stereotype.Service; */ @Slf4j @Service -public class MesCustomerPartService extends BaseMesService { +public class MesCustomerPartService extends BaseMesService implements IMesCustomerPartService { + + protected void setPackQueryBean(MesCustomerPart bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getCustomerPartNo(), "customerPartNo", packBean); + DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(bean.getCustomerCode(), "customerCode", packBean); + + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerService.java index 0a6ea37..feec97a 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerService.java @@ -1,6 +1,15 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerRoadService; +import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerService; +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.MesCustomer; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerRoad; +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; @@ -11,6 +20,47 @@ import org.springframework.stereotype.Service; */ @Service @Slf4j -public class MesCustomerService extends BaseMesService { +public class MesCustomerService extends BaseMesService implements IMesCustomerService { + + + + protected void onInsertBean(MesCustomer item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空"); + + DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean); + boolean flg = baseRDao.isExitByHql(roadPackBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("【%s】客户代码已经存在，请检查数据", item.getCustomerCode()) + .build(); + } + + } + + protected void onUpdateBean(MesCustomerRoad item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空"); + + DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean); + DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", roadPackBean); + boolean flg = baseRDao.isExitByHql(roadPackBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("【%s】客户代码已经存在，请检查数据", item.getCustomerCode(), item.getRoadCode()) + .build(); + } + } + + protected void setPackQueryBean(MesCustomer bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getCustomerCode(), "customerCode", packBean); + DdlPreparedPack.getStringLikerPack(bean.getCustomerName(), "customerName", packBean); + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPtrDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPtrDetailService.java index dae5218..9e996a9 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPtrDetailService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPtrDetailService.java @@ -1,5 +1,9 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesPartPtrDetailService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart; import cn.estsh.i3plus.pojo.mes.bean.MesPartPtr; import cn.estsh.i3plus.pojo.mes.bean.MesPartPtrDetail; import lombok.extern.slf4j.Slf4j; @@ -7,6 +11,7 @@ import org.springframework.stereotype.Service; @Service @Slf4j -public class MesPartPtrDetailService extends BaseMesService { +public class MesPartPtrDetailService extends BaseMesService implements IMesPartPtrDetailService { + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPtrService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPtrService.java index 3fcacad..4718f15 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPtrService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPtrService.java @@ -1,12 +1,19 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesPartPtrService; +import cn.estsh.i3plus.ext.mes.api.base.IMesPartService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesArea; import cn.estsh.i3plus.pojo.mes.bean.MesPartPtr; +import cn.estsh.i3plus.pojo.mes.bean.MesPartPtrDetail; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Service @Slf4j -public class MesPartPtrService extends BaseMesService { - +public class MesPartPtrService extends BaseMesService implements IMesPartPtrService { + protected void setPackQueryBean(MesPartPtr bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean); + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartService.java index 7b2f0a0..c4b3f23 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartService.java @@ -1,11 +1,20 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesPartService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesPart; +import cn.estsh.i3plus.pojo.mes.bean.MesPartPtr; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Service @Slf4j -public class MesPartService extends BaseMesService { +public class MesPartService extends BaseMesService implements IMesPartService { + protected void setPackQueryBean(MesPart bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikeEqualPack(bean.getPartName(), "partName", packBean); + + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShiftService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShiftService.java index eb19504..243e513 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShiftService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShiftService.java @@ -1,11 +1,22 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesShiftService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesPart; import cn.estsh.i3plus.pojo.mes.bean.MesShift; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Service @Slf4j -public class MesShiftService extends BaseMesService { +public class MesShiftService extends BaseMesService implements IMesShiftService { + protected void setPackQueryBean(MesShift bean, DdlPackBean packBean) { + + DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", packBean); + DdlPreparedPack.getStringEqualPack(bean.getShiftCode(), "shiftCode", packBean); + DdlPreparedPack.getStringLikeEqualPack(bean.getShiftName(), "shiftName", packBean); + + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellService.java index 2ba5809..1f08866 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellService.java @@ -1,11 +1,12 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCellService; import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Service @Slf4j -public class MesWorkCellService extends BaseMesService { +public class MesWorkCellService extends BaseMesService implements IMesWorkCellService { } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCenterService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCenterService.java index 26e2cf7..b8db071 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCenterService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCenterService.java @@ -1,11 +1,13 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCenterService; import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Service @Slf4j -public class MesWorkCenterService extends BaseMesService { +public class MesWorkCenterService extends BaseMesService implements IMesWorkCenterService { + } From 3e84587e5399ebec00d04c7c91d06a9909ba6fb7 Mon Sep 17 00:00:00 2001 From: "zhang.xw" Date: Sun, 5 May 2024 22:50:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=B8=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/apiservice/controller/base/BaseMesController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java index 4dc5fdc..8382c41 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java @@ -204,7 +204,7 @@ public abstract class BaseMesController extends BaseControll validateInsert(bean); //新增初始化 bean.setOrganizeCode(AuthUtilExt.getOrganizeCode()); - ConvertBean.serviceModelInitialize(bean, "zxw"); + ConvertBean.serviceModelInitialize(bean, AuthUtil.getSessionUser().getUserName()); T t = (T) getBaseService().insert(bean); afterInsert(t); return ResultBean.success("操作成功")