From a38dcfbcb546612fb6a240b181a2b46dfed34c2a Mon Sep 17 00:00:00 2001 From: gsz Date: Sat, 25 May 2024 18:41:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=85=B3=E7=8F=AD=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/api/base/IMesProdShiftRecordService.java | 13 ++++ .../base/MesProdShiftRecordController.java | 17 ++++++ .../base/MesProdShiftRecordServiceImpl.java | 71 ++++++++++++++++++++++ 3 files changed, 101 insertions(+) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProdShiftRecordService.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProdShiftRecordController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProdShiftRecordService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProdShiftRecordService.java new file mode 100644 index 0000000..916441d --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProdShiftRecordService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.base; + + +import cn.estsh.i3plus.pojo.mes.bean.MesProdShiftRecord; + +/** + * @Description: 开关班记录表 + * @Author: gsz + * @Date: 2024/5/25 18:16 + * @Modify: + */ +public interface IMesProdShiftRecordService extends IBaseMesService { +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProdShiftRecordController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProdShiftRecordController.java new file mode 100644 index 0000000..5328f7f --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProdShiftRecordController.java @@ -0,0 +1,17 @@ +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.MesProdShiftRecord; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: 开关班记录 + * @Author: gsz + * @Date: 2024/5/25 18:16 + * @Modify: + */ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesProdShiftRecord") +public class MesProdShiftRecordController extends BaseMesController{ +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java new file mode 100644 index 0000000..86c4417 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesEnumDetailService; +import cn.estsh.i3plus.ext.mes.api.base.IMesProdShiftRecordService; +import cn.estsh.i3plus.platform.common.convert.ConvertBean; +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.base.util.StringUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesCcscTask; +import cn.estsh.i3plus.pojo.mes.bean.MesEnumDetail; +import cn.estsh.i3plus.pojo.mes.bean.MesProdShiftRecord; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + + +/** + * @Description: 枚举明细配置 + * @Author: gsz + * @Date: 2024/5/21 14:16 + * @Modify: + */ +@Service +@Slf4j +public class MesProdShiftRecordServiceImpl extends BaseMesService implements IMesProdShiftRecordService { + + @Override + protected void setPackQueryBean(MesProdShiftRecord bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(bean.getShiftGroup(), "shiftGroup", packBean); + DdlPreparedPack.getStringEqualPack(bean.getShiftCode(), "shiftCode", packBean); + } + @Override + public MesProdShiftRecord insert(MesProdShiftRecord item) { + if(StringUtil.isEmpty(item.getStartTime())){ + item.setWorkStatus(MesExtEnumUtil.WORK_STATUS.END.getValue()); + }else if(StringUtil.isEmpty(item.getEndTime())){ + item.setWorkStatus(MesExtEnumUtil.WORK_STATUS.START.getValue()); + } + return baseRDao.insert(item); + } + @Override + protected void onInsertBean(MesProdShiftRecord item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getOrganizeCode(), "工厂号不能为空"); + ValidatorBean.checkNotNull(item.getWorkCenterCode(), "workCenterCode不能为空" ); + ValidatorBean.checkNotNull(item.getShiftGroup(), "shiftGroup不能为空"); + ValidatorBean.checkNotNull(item.getShiftCode(), "shiftCode不能为空"); + + //唯一性校验 +// DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); +// DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", packBean); +// DdlPreparedPack.getStringEqualPack(item.getShiftGroup(), "shiftGroup", packBean); +// DdlPreparedPack.getStringEqualPack(item.getShiftCode(), "shiftCode", packBean); +// +// boolean flg = baseRDao.isExitByHql(packBean); +// if (flg) { +// throw ImppExceptionBuilder.newInstance() +// .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) +// .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) +// .setErrorDetail("开关班记录产线【%s】班组代码【%s】班次代码【%s】已经存在，请检查数据", +// item.getWorkCenterCode(),item.getShiftGroup(),item.getShiftCode()) +// .build(); +// } + } +}