From f48ba3af549b54548e7167eae0ad5a0b35aeaf52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Sat, 18 May 2024 23:06:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E4=B8=8EBin=E4=BD=8D?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...adService.java => IMesCustomerDockService.java} | 3 +- ...troller.java => MesCustomerDockController.java} | 4 +-- ...oadService.java => MesCustomerDockService.java} | 34 +++++++++++----------- .../base/MesMaximoAssetMainDataServiceImpl.java | 2 +- ...nService.java => MesWorkCellBinCfgService.java} | 2 +- 5 files changed, 23 insertions(+), 22 deletions(-) rename modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/{IMesCustomerRoadService.java => IMesCustomerDockService.java} (56%) rename modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/{MesCustomerRoadController.java => MesCustomerDockController.java} (74%) rename modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/{MesCustomerRoadService.java => MesCustomerDockService.java} (53%) rename modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/{MesWorkCellBinService.java => MesWorkCellBinCfgService.java} (96%) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerRoadService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerDockService.java similarity index 56% rename from modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerRoadService.java rename to modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerDockService.java index 062bd1d..5f08225 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerRoadService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerDockService.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.ext.mes.api.base; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerDock; import cn.estsh.i3plus.pojo.mes.bean.MesCustomerRoad; /** @@ -7,7 +8,7 @@ import cn.estsh.i3plus.pojo.mes.bean.MesCustomerRoad; * @CreateDate 2024/04/16 * @Author mingliang.li */ -public interface IMesCustomerRoadService extends IBaseMesService { +public interface IMesCustomerDockService extends IBaseMesService { } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerRoadController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerDockController.java similarity index 74% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerRoadController.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerDockController.java index b1d1d8e..73ac9c4 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerRoadController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerDockController.java @@ -1,7 +1,7 @@ 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.MesCustomerRoad; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerDock; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -10,5 +10,5 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCustomerRoad") -public class MesCustomerRoadController extends BaseMesController { +public class MesCustomerDockController extends BaseMesController { } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerRoadService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerDockService.java similarity index 53% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerRoadService.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerDockService.java index f51c60a..9a3d870 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerRoadService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerDockService.java @@ -1,11 +1,11 @@ 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.IMesCustomerDockService; 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.MesCustomerRoad; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerDock; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; @@ -13,49 +13,49 @@ import org.springframework.stereotype.Service; @Service @Slf4j -public class MesCustomerRoadService extends BaseMesService implements IMesCustomerRoadService { +public class MesCustomerDockService extends BaseMesService implements IMesCustomerDockService { - protected void onInsertBean(MesCustomerRoad item) { + protected void onInsertBean(MesCustomerDock item) { // 数据校验 - ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空"); + ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空"); DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean); - DdlPreparedPack.getStringEqualPack(item.getRoadCode(), "roadCode", roadPackBean); + DdlPreparedPack.getStringEqualPack(item.getCustCode(), "customerCode", roadPackBean); + DdlPreparedPack.getStringEqualPack(item.getCustDockCode(), "custDockCode", 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.getCustomerCode(), item.getRoadCode()) + .setErrorDetail("【%s】客户代码【%s】道口代码已经存在，请检查数据", item.getCustCode(), item.getCustDockCode()) .build(); } } - protected void onUpdateBean(MesCustomerRoad item) { + protected void onUpdateBean(MesCustomerDock item) { // 数据校验 - ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空"); + ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空"); DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean); - DdlPreparedPack.getStringEqualPack(item.getRoadCode(), "roadCode", roadPackBean); + DdlPreparedPack.getStringEqualPack(item.getCustCode(), "customerCode", roadPackBean); + DdlPreparedPack.getStringEqualPack(item.getCustDockCode(), "custDockCode", 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.getCustomerCode(), item.getRoadCode()) + .setErrorDetail("【%s】客户代码【%s】道口代码已经存在，请检查数据", item.getCustCode(), item.getCustDockCode()) .build(); } } - protected void setPackQueryBean(MesCustomerRoad bean, DdlPackBean packBean) { - DdlPreparedPack.getStringEqualPack(bean.getCustomerCode(), "customerCode", packBean); - DdlPreparedPack.getStringEqualPack(bean.getRoadCode(), "roadCode", packBean); - DdlPreparedPack.getNumEqualPack(bean.getType(), "type", packBean); + protected void setPackQueryBean(MesCustomerDock bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getCustCode(), "customerCode", packBean); + DdlPreparedPack.getStringEqualPack(bean.getCustDockCode(), "custDockCode", packBean); + DdlPreparedPack.getNumEqualPack(bean.getCustDockType(), "custDockType", packBean); } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoAssetMainDataServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoAssetMainDataServiceImpl.java index 8a9e62a..0f56b23 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoAssetMainDataServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoAssetMainDataServiceImpl.java @@ -21,7 +21,7 @@ public class MesMaximoAssetMainDataServiceImpl extends BaseMesService implements IMesWorkCellBinCfgService { +public class MesWorkCellBinCfgService extends BaseMesService implements IMesWorkCellBinCfgService { protected void onInsertBean(MesWorkCellBinCfg item) { // 数据校验