From e06f85e3c052e24519939dabb91cbdc6bb12984b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Sat, 18 May 2024 22:10:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E9=9D=A2=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=90=8E=E6=9C=AA=E6=8C=89?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/api/base/IMesWorkCellExtendCfgService.java | 13 ++++++++++++ .../mes/api/base/IMesWorkCellSubCellService.java | 13 ------------ ...er.java => MesWorkCellExtendCfgController.java} | 7 +++---- .../base/MesCarSeriesLoosePartService.java | 7 +++++++ .../serviceimpl/base/MesCarSeriesService.java | 24 +++++++++++----------- ...rvice.java => MesWorkCellExtendCfgService.java} | 15 +++++++------- 6 files changed, 42 insertions(+), 37 deletions(-) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellExtendCfgService.java delete mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellSubCellService.java rename modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/{MesWorkCellSubCellController.java => MesWorkCellExtendCfgController.java} (60%) rename modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/{MesWorkCellSubCellService.java => MesWorkCellExtendCfgService.java} (51%) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellExtendCfgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellExtendCfgService.java new file mode 100644 index 0000000..d6c2b32 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellExtendCfgService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellExtendCfg; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author mingliang.li + */ +public interface IMesWorkCellExtendCfgService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellSubCellService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellSubCellService.java deleted file mode 100644 index 1276481..0000000 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellSubCellService.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.ext.mes.api.base; - -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellSubCell; - -/** - * @Description: - * @CreateDate 2024/04/16 - * @Author mingliang.li - */ -public interface IMesWorkCellSubCellService extends IBaseMesService { - - -} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellSubCellController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellExtendCfgController.java similarity index 60% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellSubCellController.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellExtendCfgController.java index 5cf6cc1..665523b 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellSubCellController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellExtendCfgController.java @@ -1,15 +1,14 @@ 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.MesWorkCellBin; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellSubCell; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellExtendCfg; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Api("主工位与子工位关系维护") +@Api("主子工位关系维护") @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesWorkCellSubCell") -public class MesWorkCellSubCellController extends BaseMesController { +public class MesWorkCellExtendCfgController extends BaseMesController { } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java index a34945e..0089d37 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java @@ -6,6 +6,7 @@ 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.MesCarSeriesLoosePart; +import cn.estsh.i3plus.pojo.mes.bean.MesCavityGroupDetailCfg; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; @@ -56,4 +57,10 @@ public class MesCarSeriesLoosePartService extends BaseMesService implements // 数据校验 ValidatorBean.checkNotNull(item.getCarSeriesCode(), "车系代码不能为空"); ValidatorBean.checkNotNull(item.getCarSeriesName(), "车系名称不能为空"); - ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空"); - ValidatorBean.checkNotNull(item.getCustomerOrganizeCode(), "客户工厂代码不能为空"); + ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空"); + ValidatorBean.checkNotNull(item.getCustOrganizeCode(), "客户工厂代码不能为空"); DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(item.getCarSeriesCode(), "carSeriesCode", seriesPackBean); - DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", seriesPackBean); + DdlPreparedPack.getStringEqualPack(item.getCustCode(), "custCode", seriesPackBean); boolean flg = baseRDao.isExitByHql(seriesPackBean); if (flg) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("【%s】车系代码【%s】客户代码已经存在，请检查数据", item.getCarSeriesCode(), item.getCustomerCode()) + .setErrorDetail("【%s】车系代码【%s】客户代码已经存在，请检查数据", item.getCarSeriesCode(), item.getCustCode()) .build(); } @@ -42,19 +42,19 @@ public class MesCarSeriesService extends BaseMesService implements // 数据校验 ValidatorBean.checkNotNull(item.getCarSeriesCode(), "车系代码不能为空"); ValidatorBean.checkNotNull(item.getCarSeriesName(), "车系名称不能为空"); - ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空"); - ValidatorBean.checkNotNull(item.getCustomerOrganizeCode(), "客户工厂代码不能为空"); + ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空"); + ValidatorBean.checkNotNull(item.getCustOrganizeCode(), "客户工厂代码不能为空"); DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(item.getCarSeriesCode(), "carSeriesCode", seriesPackBean); - DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", seriesPackBean); + DdlPreparedPack.getStringEqualPack(item.getCustCode(), "custCode", seriesPackBean); DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", seriesPackBean); boolean flg = baseRDao.isExitByHql(seriesPackBean); if (flg) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("【%s】车系代码【%s】客户代码已经存在，请检查数据", item.getCarSeriesCode(), item.getCustomerCode()) + .setErrorDetail("【%s】车系代码【%s】客户代码已经存在，请检查数据", item.getCarSeriesCode(), item.getCustCode()) .build(); } } @@ -62,10 +62,10 @@ public class MesCarSeriesService extends BaseMesService implements protected void setPackQueryBean(MesCarSeries bean, DdlPackBean packBean) { DdlPreparedPack.getStringLikerPack(bean.getCarSeriesCode(), "carSeriesCode", packBean); DdlPreparedPack.getStringLikerPack(bean.getCarSeriesName(), "carSeriesName", packBean); - DdlPreparedPack.getStringEqualPack(bean.getCustomerCode(), "customerCode", packBean); - DdlPreparedPack.getStringEqualPack(bean.getCustomerOrganizeCode(), "customerOrganizeCode", packBean); - DdlPreparedPack.getStringLikerPack(bean.getYearType(), "yearType", packBean); - DdlPreparedPack.getStringLikerPack(bean.getCustomerCarSeries(), "customerCarSeries", packBean); + DdlPreparedPack.getStringEqualPack(bean.getCustCode(), "custCode", packBean); + DdlPreparedPack.getStringEqualPack(bean.getCustOrganizeCode(), "custOrganizeCode", packBean); + DdlPreparedPack.getStringLikerPack(bean.getYearModel(), "yearModel", packBean); + DdlPreparedPack.getStringLikerPack(bean.getCustCarSerialCode(), "custCarSerialCode", packBean); } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellSubCellService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellExtendCfgService.java similarity index 51% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellSubCellService.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellExtendCfgService.java index 15736fd..30b2b92 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellSubCellService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellExtendCfgService.java @@ -1,30 +1,29 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; -import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCellSubCellService; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellBin; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellSubCell; +import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCellExtendCfgService; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellExtendCfg; import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Service @Slf4j -public class MesWorkCellSubCellService extends BaseMesService implements IMesWorkCellSubCellService { +public class MesWorkCellExtendCfgService extends BaseMesService implements IMesWorkCellExtendCfgService { - protected void onInsertBean(MesWorkCellSubCell item) { + protected void onInsertBean(MesWorkCellExtendCfg item) { // 数据校验 ValidatorBean.checkNotNull(item.getWorkCenterCode(), "产线不能为空"); ValidatorBean.checkNotNull(item.getWorkCellCode(), "主工位不能为空"); - ValidatorBean.checkNotNull(item.getSubCellCode(), "子工位不能为空"); + ValidatorBean.checkNotNull(item.getWorkCellCodeBak(), "子工位不能为空"); } - protected void onUpdateBean(MesWorkCellSubCell item) { + protected void onUpdateBean(MesWorkCellExtendCfg item) { // 数据校验 ValidatorBean.checkNotNull(item.getWorkCenterCode(), "产线不能为空"); ValidatorBean.checkNotNull(item.getWorkCellCode(), "主工位不能为空"); - ValidatorBean.checkNotNull(item.getSubCellCode(), "子工位不能为空"); + ValidatorBean.checkNotNull(item.getWorkCellCodeBak(), "子工位不能为空"); } }