From 93b4d3a3955dbce2f791cf888cce1423feb66a5f Mon Sep 17 00:00:00 2001 From: gsz Date: Mon, 17 Jun 2024 15:30:52 +0800 Subject: [PATCH] =?UTF-8?q?41404=20=E4=B8=BB=E5=B7=A5=E4=BD=8D=E4=B8=8E?= =?UTF-8?q?=E5=AD=90=E5=B7=A5=E4=BD=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/api/base/IMesWorkCellExtendCfgService.java | 19 ++++++ .../busi/MesWorkCellExtendCfgController.java | 59 +++++++++++++++++++ .../base/MesWorkCellExtendCfgServiceImpl.java | 68 ++++++++++++++++++++++ 3 files changed, 146 insertions(+) create mode 100644 modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesWorkCellExtendCfgService.java create mode 100644 modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesWorkCellExtendCfgController.java create mode 100644 modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesWorkCellExtendCfgServiceImpl.java diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesWorkCellExtendCfgService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesWorkCellExtendCfgService.java new file mode 100644 index 0000000..9399a57 --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesWorkCellExtendCfgService.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.ext.mes.pcn.api.base; + + +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellExtendCfg; +import io.swagger.annotations.ApiOperation; + +import java.util.List; + + +public interface IMesWorkCellExtendCfgService { + + @ApiOperation(value = "分页查询主子工位关系") + ListPager queryMesWorkCellExtendCfgByPager(MesWorkCellExtendCfg mesWorkCellExtendCfg, Pager pager); + + @ApiOperation(value = "查询主子工位关系") + List queryMesWorkCellExtendCfg(MesWorkCellExtendCfg mesWorkCellExtendCfg); +} diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesWorkCellExtendCfgController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesWorkCellExtendCfgController.java new file mode 100644 index 0000000..bf2304b --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesWorkCellExtendCfgController.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.busi; + +import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesWorkCellExtendCfgService; +import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellExtendCfg; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Description: 主子工位关系 + * @Author: gsz + * @Date: 2024/6/17 15:16 + * @Modify: + */ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesWorkCellExtendCfg") +public class MesWorkCellExtendCfgController { + @Autowired + private IMesWorkCellExtendCfgService mesWorkCellExtendCfgService; + + @GetMapping("/query-pager") + @ApiOperation(value = "分页查询主子工位关系") + public ResultBean queryMesProdShiftRecordByPager(MesWorkCellExtendCfg workCellExtendCfg, Pager pager) { + try { + + ListPager mesWorkCellExtendCfgByPager = mesWorkCellExtendCfgService.queryMesWorkCellExtendCfgByPager(workCellExtendCfg, pager); + return ResultBean.success("查询主子工位关系成功").setListPager(mesWorkCellExtendCfgByPager); + } catch (ImppBusiException imppException) { + return ResultBean.fail(imppException); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/query") + @ApiOperation(value = "查询主子工位关系") + public ResultBean queryMesProdShiftRecord(MesWorkCellExtendCfg mesWorkCellExtendCfg) { + try { + //查询汇总工单数量 + List mesWorkCellExtendCfgList= mesWorkCellExtendCfgService.queryMesWorkCellExtendCfg(mesWorkCellExtendCfg); + return ResultBean.success("查询成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(mesWorkCellExtendCfgList); + } catch (ImppBusiException e) { + return ResultBean.fail(e).build(); + } catch (Exception e) { + return ResultBean.fail(e); + } + } + +} diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesWorkCellExtendCfgServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesWorkCellExtendCfgServiceImpl.java new file mode 100644 index 0000000..ba8ace6 --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesWorkCellExtendCfgServiceImpl.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesWorkCellExtendCfgService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.common.PagerHelper; +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.MesWorkCellExtendCfg; +import cn.estsh.i3plus.pojo.mes.repository.MesWorkCellExtendCfgRepository; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + * @Description: 开关班记录表 + * @Author: gsz + * @Date: 2024/5/21 14:16 + * @Modify: + */ +@Service +@Slf4j +public class MesWorkCellExtendCfgServiceImpl implements IMesWorkCellExtendCfgService { + + @Autowired + private MesWorkCellExtendCfgRepository mesWorkCellExtendCfgRDao; + + @Override + public ListPager queryMesWorkCellExtendCfgByPager(MesWorkCellExtendCfg bean, Pager pager) { + + DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(bean.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(bean.getExtendType(), "extendType", packBean); + + if(!StringUtil.isEmpty(bean.orderBy())){ + packBean.setOrderByStr(bean.orderBy()); + }else { + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"seq"}, packBean); + } + pager = PagerHelper.getPager(pager, mesWorkCellExtendCfgRDao.findByHqlWhereCount(packBean)); + + List resultList = mesWorkCellExtendCfgRDao.findByHqlWherePage(packBean, pager); + + return new ListPager<>(resultList, pager); + } + + + @Override + public List queryMesWorkCellExtendCfg(MesWorkCellExtendCfg bean) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(bean.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(StringUtil.isEmpty(bean.getExtendType())?"20":bean.getExtendType(), "extendType", packBean); + if(!StringUtil.isEmpty(bean.orderBy())){ + packBean.setOrderByStr(bean.orderBy()); + }else { + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"seq"}, packBean); + } + + return mesWorkCellExtendCfgRDao.findByHqlWhere(packBean); + } +}