From 5c35f490b18915f95d4ccdb2227b175fc0f39b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Thu, 30 May 2024 14:14:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/api/busi/IMesWorkCenterService.java | 31 ++++++++++ .../controller/busi/MesWorkCenterController.java | 66 +++++++++++++++++++++ .../serviceimpl/busi/MesWorkCenterService.java | 67 ++++++++++++++++++++++ 3 files changed, 164 insertions(+) create mode 100644 modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesWorkCenterService.java create mode 100644 modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesWorkCenterController.java create mode 100644 modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkCenterService.java diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesWorkCenterService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesWorkCenterService.java new file mode 100644 index 0000000..7f34d88 --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesWorkCenterService.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.ext.mes.pcn.api.busi; + +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter; +import io.swagger.annotations.ApiOperation; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : + * @CreateDate : 2024-04-26 15:37 + * @Modify: + **/ +public interface IMesWorkCenterService { + + + @ApiOperation(value = "查询工单") + public MesWorkCenter queryMesWorkCenter(MesWorkCenter workCenter); + + @ApiOperation(value = "查询工单") + public List queryMesWorkCenterList(MesWorkCenter workCenter); + + @ApiOperation(value = "查询工单") + public ListPager queryMesWorkCenterByPager(MesWorkCenter workCenter, Pager pager); + + +} diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesWorkCenterController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesWorkCenterController.java new file mode 100644 index 0000000..145af3c --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesWorkCenterController.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.busi; + +import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkCenterService; +import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +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.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : + * @Reference : + * @Author : + * @CreateDate : 2024-05-30 13:46 + * @Modify: + **/ +@RestController +@Api(tags = "工单") +@RequestMapping(MesCommonConstant.MES_YANFEN + "/work-center") +@Slf4j +public class MesWorkCenterController { + + @Autowired + private IMesWorkCenterService workCenterService; + + + @GetMapping("/query") + @ApiOperation(value = "查询工单") + public ResultBean queryWorkOrder(MesWorkCenter workCenter) { + + try { + + return ResultBean.success("查询成功").setResultList(workCenterService.queryMesWorkCenterList(workCenter)); + } catch (ImppBusiException imppException) { + return ResultBean.fail(imppException); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping("/query-pager") + @ApiOperation(value = "查询产线") + public ResultBean queryWorkOrderByPager(MesWorkCenter workCenter, Pager pager) { + + try { + + return ResultBean.success("查询成功").setListPager(workCenterService.queryMesWorkCenterByPager(workCenter, pager)); + } catch (ImppBusiException imppException) { + return ResultBean.fail(imppException); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + + +} diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkCenterService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkCenterService.java new file mode 100644 index 0000000..04f0027 --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkCenterService.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkCenterService; +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.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import cn.estsh.i3plus.pojo.mes.repository.MesWorkCenterRepository; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : + * @CreateDate : 2024-05-09 10:54 + * @Modify: + **/ + +@Service +@Slf4j +public class MesWorkCenterService implements IMesWorkCenterService { + + @Autowired + private MesWorkCenterRepository workCenterRepository; + + + @Override + public MesWorkCenter queryMesWorkCenter(MesWorkCenter workCenter) { + DdlPackBean packBean = getDdlPackBean(workCenter); + MesWorkCenter result = workCenterRepository.getByProperty(packBean); + return result; + } + + @Override + public List queryMesWorkCenterList(MesWorkCenter workOrder) { + DdlPackBean packBean = getDdlPackBean(workOrder); + + return workCenterRepository.findByHqlWhere(packBean); + } + + @Override + public ListPager queryMesWorkCenterByPager(MesWorkCenter workCenter, Pager pager) { + + DdlPackBean packBean = getDdlPackBean(workCenter); + + pager = PagerHelper.getPager(pager, workCenterRepository.findByHqlWhereCount(packBean)); + + List resultList = workCenterRepository.findByHqlWherePage(packBean, pager); + + return new ListPager<>(resultList, pager); + } + + private DdlPackBean getDdlPackBean(MesWorkCenter workCenter) { + + DdlPackBean packBean = DdlPackBean.getDdlPackBean(workCenter.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(workCenter.getWorkCenterCode(), "workCenterCode", packBean); + return packBean; + } +}