From 2b01910d78cc6c5ff7df08cd5fdc3364fd017276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Sat, 18 May 2024 22:57:53 +0800 Subject: [PATCH 1/2] =?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 --- .../ext/mes/api/base/IMesWorkCellBinCfgService.java | 13 +++++++++++++ .../ext/mes/api/base/IMesWorkCellBinService.java | 14 -------------- ...ntroller.java => MesWorkCellBinCfgController.java} | 6 +++--- .../serviceimpl/base/MesWorkCellBinService.java | 19 +++++++++---------- 4 files changed, 25 insertions(+), 27 deletions(-) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinCfgService.java delete mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinService.java rename modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/{MesWorkCellBinController.java => MesWorkCellBinCfgController.java} (67%) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinCfgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinCfgService.java new file mode 100644 index 0000000..f8cdc17 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinCfgService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellBinCfg; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author mingliang.li + */ +public interface IMesWorkCellBinCfgService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinService.java deleted file mode 100644 index 450d185..0000000 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinService.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.ext.mes.api.base; - -import cn.estsh.i3plus.pojo.mes.bean.MesPartPull; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellBin; - -/** - * @Description: - * @CreateDate 2024/04/16 - * @Author mingliang.li - */ -public interface IMesWorkCellBinService extends IBaseMesService { - - -} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellBinController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellBinCfgController.java similarity index 67% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellBinController.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellBinCfgController.java index 750ba7b..0b8cb48 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellBinController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellBinCfgController.java @@ -1,14 +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.MesWorkCellBinCfg; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Api("工位与Bin位关系") +@Api("工位与Bin位关系维护") @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesWorkCellBin") -public class MesWorkCellBinController extends BaseMesController { +public class MesWorkCellBinCfgController extends BaseMesController { } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellBinService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellBinService.java index 3536ed3..9a21552 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellBinService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellBinService.java @@ -1,12 +1,11 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; -import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCellBinService; +import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCellBinCfgService; 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.MesShippingOrderManagement; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellBin; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellBinCfg; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; @@ -14,9 +13,9 @@ import org.springframework.stereotype.Service; @Service @Slf4j -public class MesWorkCellBinService extends BaseMesService implements IMesWorkCellBinService { +public class MesWorkCellBinService extends BaseMesService implements IMesWorkCellBinCfgService { - protected void onInsertBean(MesWorkCellBin item) { + protected void onInsertBean(MesWorkCellBinCfg item) { // 数据校验 ValidatorBean.checkNotNull(item.getWorkCenterCode(), "产线不能为空"); ValidatorBean.checkNotNull(item.getWorkCellCode(), "工位不能为空"); @@ -33,18 +32,18 @@ public class MesWorkCellBinService extends BaseMesService implem } cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(item.getLocateNo(), "locateNo", cellBinPackBean); + DdlPreparedPack.getStringEqualPack(item.getBinCode(), "binCode", cellBinPackBean); boolean flg1 = baseRDao.isExitByHql(cellBinPackBean); if (flg1) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("【%s】bin位已经存在，请检查数据", item.getLocateNo()) + .setErrorDetail("【%s】bin位已经存在，请检查数据", item.getBinCode()) .build(); } } - protected void onUpdateBean(MesWorkCellBin item) { + protected void onUpdateBean(MesWorkCellBinCfg item) { // 数据校验 ValidatorBean.checkNotNull(item.getWorkCenterCode(), "产线不能为空"); @@ -63,14 +62,14 @@ public class MesWorkCellBinService extends BaseMesService implem } cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(item.getLocateNo(), "locateNo", cellBinPackBean); + DdlPreparedPack.getStringEqualPack(item.getBinCode(), "binCode", cellBinPackBean); DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", cellBinPackBean); boolean flg1 = baseRDao.isExitByHql(cellBinPackBean); if (flg1) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("【%s】bin位已经存在，请检查数据", item.getLocateNo()) + .setErrorDetail("【%s】bin位已经存在，请检查数据", item.getBinCode()) .build(); } } From 03227dd37627f43dda7daac9156980db37f8efa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Sat, 18 May 2024 23:00:02 +0800 Subject: [PATCH 2/2] =?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 --- .../i3plus/ext/mes/api/base/IMesWorkCellBinService.java | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinService.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinService.java deleted file mode 100644 index 450d185..0000000 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinService.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.ext.mes.api.base; - -import cn.estsh.i3plus.pojo.mes.bean.MesPartPull; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellBin; - -/** - * @Description: - * @CreateDate 2024/04/16 - * @Author mingliang.li - */ -public interface IMesWorkCellBinService extends IBaseMesService { - - -}