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/IMesWorkCellBinCfgService.java similarity index 67% rename from modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinService.java rename to modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinCfgService.java index eb97111..f8cdc17 100644 --- 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/IMesWorkCellBinCfgService.java @@ -7,7 +7,7 @@ import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellBinCfg; * @CreateDate 2024/04/16 * @Author mingliang.li */ -public interface IMesWorkCellBinService extends IBaseMesService { +public interface IMesWorkCellBinCfgService 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 65% 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 db362b5..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 @@ -6,9 +6,9 @@ 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 + "/mesWorkCellBinCfg") +@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 800a672..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,11 +1,10 @@ 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.MesWorkCellBinCfg; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ValidatorBean; @@ -14,7 +13,7 @@ import org.springframework.stereotype.Service; @Service @Slf4j -public class MesWorkCellBinService extends BaseMesService implements IMesWorkCellBinService { +public class MesWorkCellBinService extends BaseMesService implements IMesWorkCellBinCfgService { protected void onInsertBean(MesWorkCellBinCfg item) { // 数据校验 @@ -63,7 +62,7 @@ public class MesWorkCellBinService extends BaseMesService imp } cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(item.getBinCode(), "locateNo", cellBinPackBean); + DdlPreparedPack.getStringEqualPack(item.getBinCode(), "binCode", cellBinPackBean); DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", cellBinPackBean); boolean flg1 = baseRDao.isExitByHql(cellBinPackBean); if (flg1) {