diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesNumberRuleService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesNumberRuleService.java new file mode 100644 index 0000000..5960e27 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesNumberRuleService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesNumberRule; + +/** + * @Description : 条码生成规则 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/6/13 11:17 + * @Modify: + **/ +public interface IMesNumberRuleService extends IBaseMesService { +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesNumberRuleController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesNumberRuleController.java new file mode 100644 index 0000000..f101b7b --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesNumberRuleController.java @@ -0,0 +1,18 @@ +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.MesNumberRule; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : 条码生成规则 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/6/13 11:17 + * @Modify: + **/ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesNumberRule") +public class MesNumberRuleController extends BaseMesController { +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleServiceImpl.java similarity index 96% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleImpl.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleServiceImpl.java index 325571e..6ba1c42 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleServiceImpl.java @@ -21,7 +21,7 @@ import java.util.List; **/ @Service @Slf4j -public class MesMoveRuleImpl extends BaseMesService implements IMesMoveRuleService { +public class MesMoveRuleServiceImpl extends BaseMesService implements IMesMoveRuleService { @Override protected void setPackQueryBean(MesMoveRule bean, DdlPackBean packBean) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesNumberRuleServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesNumberRuleServiceImpl.java new file mode 100644 index 0000000..07d98e9 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesNumberRuleServiceImpl.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesNumberRuleService; +import cn.estsh.i3plus.ext.mes.apiservice.unit.exception.MesException; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesNumberRule; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @Description : 规则代码 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/6/13 11:19 + * @Modify: + **/ +@Service +@Slf4j +public class MesNumberRuleServiceImpl extends BaseMesService implements IMesNumberRuleService { + + @Override + protected void setPackQueryBean(MesNumberRule bean, DdlPackBean packBean) { + DdlPreparedPack.getStringLikerPack(bean.getRuleCode(), "ruleCode", packBean); + DdlPreparedPack.getStringLikerPack(bean.getPrefix(), "prefix", packBean); + DdlPreparedPack.getStringLikerPack(bean.getNumberRule(), "numberRule", packBean); + DdlPreparedPack.getNumEqualPack(bean.getIsCycle(), "isCycle", packBean); + } + + @Override + protected void onInsertBean(MesNumberRule item) { + // 数据校验 + checkNotNull(item); + + DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(item.getRuleCode(), "ruleCode", packBean); + + if (baseRDao.isExitByHql(packBean)) { + MesException.throwMesBusiException("规则代码【%s】数据已存在", item.getRuleCode()); + } + } + + @Override + protected void onUpdateBean(MesNumberRule item) { + // 数据校验 + checkNotNull(item); + + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(item.getRuleCode(), "ruleCode", ddlPackBean); + DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", ddlPackBean); + + if (baseRDao.isExitByHql(ddlPackBean)) { + MesException.throwMesBusiException("规则代码【%s】数据已存在", item.getRuleCode()); + } + } + + private void checkNotNull(MesNumberRule item) { + ValidatorBean.checkNotNull(item.getRuleCode(), "规则代码不能为空"); + } +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPrinterConfigureImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPrinterConfigureServiceImpl.java similarity index 94% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPrinterConfigureImpl.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPrinterConfigureServiceImpl.java index 67d7cc7..d17414f 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPrinterConfigureImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPrinterConfigureServiceImpl.java @@ -18,7 +18,7 @@ import org.springframework.stereotype.Service; **/ @Service @Slf4j -public class MesPrinterConfigureImpl extends BaseMesService implements IMesPrinterConfigureService { +public class MesPrinterConfigureServiceImpl extends BaseMesService implements IMesPrinterConfigureService { @Override protected void setPackQueryBean(MesPrinterConfigure bean, DdlPackBean packBean) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductOffLineImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductOffLineServiceImpl.java similarity index 75% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductOffLineImpl.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductOffLineServiceImpl.java index 93b72cc..c9fa3af 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductOffLineImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductOffLineServiceImpl.java @@ -12,6 +12,6 @@ import org.springframework.stereotype.Service; * @Modify: **/ @Service -public class MesProductOffLineImpl extends BaseMesService implements IMesProductOffLineService { +public class MesProductOffLineServiceImpl extends BaseMesService implements IMesProductOffLineService { }