From 327e7f4f45fd9d8bf819c07d1a8e21a165c238d1 Mon Sep 17 00:00:00 2001 From: "zhang.xw" Date: Thu, 18 Apr 2024 10:29:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=B8=BB=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/api/base/IMesEquitmentService.java | 4 +- .../ext/mes/api/base/IMesPartPtrService.java | 14 + .../controller/base/BaseMesController.java | 8 +- .../controller/base/ExtProdOrgController.java | 383 +++++++++++++++++++++ .../controller/base/MesAreaController.java | 3 + .../controller/base/MesBomController.java | 3 + .../base/MesCustomerCarModelController.java | 3 + .../base/MesCustomerCarModelDetailController.java | 3 + .../controller/base/MesCustomerController.java | 3 + .../base/MesCustomerMessagePointController.java | 4 +- .../base/MesCustomerOriganizeController.java | 4 +- .../controller/base/MesCustomerPartController.java | 4 +- .../base/MesEquipmentCheckController.java | 5 +- .../base/MesEquipmentCheckDetailController.java | 4 +- .../controller/base/MesEquitmentController.java | 6 +- .../base/MesModelMultiCavityController.java | 3 + .../controller/base/MesPartController.java | 4 +- .../base/MesPartProdGroupController.java | 4 +- .../controller/base/MesPartPtrController.java | 17 + .../base/MesPartPtrDetailController.java | 43 +++ .../controller/base/MesPartPullController.java | 4 +- .../base/MesPartShippingGroupController.java | 4 +- ...itmentService.java => MesEquipmentService.java} | 4 +- .../serviceimpl/base/MesPartProdGroupService.java | 1 - .../serviceimpl/base/MesPartPtrDetailService.java | 12 + 25 files changed, 526 insertions(+), 21 deletions(-) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartPtrService.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartPtrDetailController.java rename modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/{MesEquitmentService.java => MesEquipmentService.java} (77%) create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPtrDetailService.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesEquitmentService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesEquitmentService.java index 9e220e0..49b99e8 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesEquitmentService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesEquitmentService.java @@ -1,13 +1,13 @@ package cn.estsh.i3plus.ext.mes.api.base; -import cn.estsh.i3plus.pojo.mes.bean.MesEquitment; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipment; /** * @Description: * @CreateDate 2024/04/16 * @Author mingliang.li */ -public interface IMesEquitmentService extends IBaseMesService { +public interface IMesEquitmentService extends IBaseMesService { } diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartPtrService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartPtrService.java new file mode 100644 index 0000000..4fe1a20 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartPtrService.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesPartPull; +import cn.estsh.impp.framework.boot.util.ResultBean; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author mingliang.li + */ +public interface IMesPartPtrService { + + ResultBean getDetailById(int id); +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java index 8382c41..24c8987 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java @@ -152,7 +152,7 @@ public abstract class BaseMesController extends BaseControll @ApiOperation(value = "查询信息带分页", notes = "组合查询，外带分页功能") public ResultBean queryByPager(T bean, Pager pager) { try { - bean.setOrganizeCode(AuthUtilExt.getOrganizeCode()); + bean.setOrganizeCode("1154"); ListPager listPager = getBaseService().queryPager(bean, pager); return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) @@ -203,8 +203,8 @@ public abstract class BaseMesController extends BaseControll try { validateInsert(bean); //新增初始化 - bean.setOrganizeCode(AuthUtilExt.getOrganizeCode()); - ConvertBean.serviceModelInitialize(bean, AuthUtil.getSessionUser().getUserName()); + bean.setOrganizeCode("1154"); + ConvertBean.serviceModelInitialize(bean, "zxw"); T t = (T) getBaseService().insert(bean); afterInsert(t); return ResultBean.success("操作成功") @@ -221,7 +221,7 @@ public abstract class BaseMesController extends BaseControll @ApiOperation(value = "修改信息", notes = "修改信息") public ResultBean update(@RequestBody T bean) { try { - bean.setOrganizeCode(AuthUtilExt.getOrganizeCode()); + bean.setOrganizeCode("1154"); validateUpdate(bean); T t = getBaseService().update(bean); afterUpdate(t); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java new file mode 100644 index 0000000..2013f27 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java @@ -0,0 +1,383 @@ +package cn.estsh.i3plus.ext.mes.apiservice.controller.base; + +import cn.estsh.i3plus.mes.api.iservice.base.IProdOrgService; +import cn.estsh.i3plus.mes.api.iservice.busi.IEquipmentService; +import cn.estsh.i3plus.mes.apiservice.util.MesCommConstWords; +import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.common.util.MesConstWords; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesArea; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipment; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter; +import cn.estsh.i3plus.pojo.mes.model.ProdOrgModel; +import cn.estsh.impp.framework.base.controller.MesBaseController; +import cn.estsh.impp.framework.boot.auth.AuthUtil; +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 cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-05-06-9:51 + * @Modify: + **/ +@RestController +@Api("MES组织模型") +@RequestMapping(CommonConstWords.BASE_URL_MES + "/prod-org-new") +public class ExtProdOrgController extends MesBaseController { + + public static final Logger LOGGER = LoggerFactory.getLogger(ExtProdOrgController.class); + + @Autowired + private IProdOrgService prodOrgService; + + @Autowired + private IEquipmentService mesEquipmentService; + + @GetMapping(value = "/mes-data-tree/query") + @ApiOperation(value = "查询MES组织模型数据返回树结构") + public ResultBean queryMesDataTree() { + try { + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(prodOrgService.queryMesDataTree(AuthUtil.getOrganize().getOrganizeCode())); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/mes-prod/query") + @ApiOperation(value = "按条件分页查询MES组织模型数据") + public ResultBean queryMesProdOrgByPager(ProdOrgModel prodOrgModel, Pager pager) { + try { + + ListPager listPager = null; + + prodOrgModel.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + //工厂 + if (MesEnumUtil.PROD_ORG_LEVEL.LEVEL_ONE.getValue() == prodOrgModel.getLevel()) { + + MesArea mesArea = new MesArea(); + BeanUtils.copyProperties(prodOrgModel, mesArea); + + listPager = prodOrgService.queryMesAreaByPager(mesArea, pager); + } + //生产线 + if (MesEnumUtil.PROD_ORG_LEVEL.LEVEL_TWO.getValue() == prodOrgModel.getLevel()) { + + MesWorkCenter workCenter = new MesWorkCenter(); + BeanUtils.copyProperties(prodOrgModel, workCenter); + + listPager = prodOrgService.queryWorkCenterByPager(workCenter, pager); + } + //工位 + if (MesEnumUtil.PROD_ORG_LEVEL.LEVEL_THREE.getValue() == prodOrgModel.getLevel()) { + + MesWorkCell workCell = new MesWorkCell(); + BeanUtils.copyProperties(prodOrgModel, workCell); + + listPager = prodOrgService.queryWorkCellByPager(workCell, pager); + } + //工位下的设备 + if (MesEnumUtil.PROD_ORG_LEVEL.LEVEL_FOUR.getValue() <= prodOrgModel.getLevel()) { + + MesEquipment equipment = new MesEquipment(); + //这是用到的参数有id 必须使用org.springframework.beans.BeanUtils + //如果使用org.apache.commons.beanutils.BeanUtils当id为null会默认转化为0 + BeanUtils.copyProperties(prodOrgModel, equipment); + + listPager = mesEquipmentService.queryMesEquipmentByPagerOrg(equipment, pager); + } + + if (null == listPager) { + return ResultBean.success("操作成功").setMsg("暂无数据") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } else { + return ResultBean.success("操作成功").setListPager(listPager) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @PostMapping(value = "/mes-prod/insert") + @ApiOperation(value = "新增mes组织模型信息(区域，生产线，工位)") + public ResultBean insertMesProdOrg(ProdOrgModel prodOrgModel) { + try { + + prodOrgModel.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + ConvertBean.serviceModelInitialize(prodOrgModel, AuthUtil.getSessionUser().getUserName()); + + prodOrgService.insertMesProdOrg(prodOrgModel); + + return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/mes-area/query") + @ApiOperation(value = "分页查询区域") + public ResultBean queryMesAreaByPager(MesArea mesArea, Pager pager) { + try { + mesArea.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + ListPager areaList = prodOrgService.queryMesAreaByPager(mesArea, pager); + + return ResultBean.success("操作成功").setListPager(areaList) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/mes-area/query-all") + @ApiOperation(value = "按条件查询区域所有数据") + public ResultBean queryMesAreaByProperties(MesArea mesArea) { + try { + mesArea.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + List areaList = prodOrgService.queryMesAreaByProperties(mesArea); + + return ResultBean.success("操作成功").setResultList(areaList) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @PutMapping(value = "/mes-area/status-update") + @ApiOperation(value = "根据id启用或禁用区域信息") + public ResultBean updateMesAreaStatusById(Long id, int status) { + try { + + if (null == id) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要操作的资源。") + .build(); + } + + prodOrgService.updateMesAreaStatusById(id, status, AuthUtil.getSessionUser().getUserName(), AuthUtil.getOrganize().getOrganizeCode()); + + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @PutMapping(value = "/mes-area/update") + @ApiOperation(value = "更新mes区域信息") + public ResultBean updateMesArea(MesArea mesArea) { + try { + //条件验证 + ValidatorBean.beginValid(mesArea) + .notNull(MesConstWords.ID, mesArea.getId()) + .notNull(MesCommConstWords.AREA_CODE, mesArea.getAreaCode()) + .notNull(MesCommConstWords.AREA_NAME, mesArea.getAreaName()); + + prodOrgService.updateMesArea(mesArea, AuthUtil.getSessionUser().getUserName(), AuthUtil.getOrganize().getOrganizeCode()); + return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @PutMapping(value = "/work-center/update") + @ApiOperation(value = "更新生产线信息") + public ResultBean updateMesWorkCenter(MesWorkCenter workCenter) { + try { + //条件验证 + ValidatorBean.beginValid(workCenter) + .notNull(MesConstWords.ID, workCenter.getId()) + .notNull(MesConstWords.WORK_CENTER_CODE, workCenter.getWorkCenterCode()) + .notNull(MesCommConstWords.WORK_CENTER_NAME, workCenter.getWorkCenterName()) + .notNull(MesCommConstWords.AREA_CODE, workCenter.getAreaCode()); + + prodOrgService.updateMesWorkCenter(workCenter, AuthUtil.getSessionUser().getUserName(), AuthUtil.getOrganize().getOrganizeCode()); + return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/mes-center/query") + @ApiOperation(value = "分页查询生产线") + public ResultBean queryMesWorkCenterByPager(MesWorkCenter workCenter, Pager pager) { + try { + workCenter.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + ListPager workCenterList = prodOrgService.queryWorkCenterByPager(workCenter, pager); + + return ResultBean.success("操作成功").setListPager(workCenterList) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/mes-center/query-all") + @ApiOperation(value = "按条件查询生产线所有数据") + public ResultBean queryMesWorkCenterByProperties(MesWorkCenter workCenter) { + try { + workCenter.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + List workCenterList = prodOrgService.queryMesWorkCenterByProperties(workCenter); + + return ResultBean.success("操作成功").setResultList(workCenterList) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/mes-center-all/query") + @ApiOperation(value = "按条件查询生产线所有数据") + public ResultBean queryMesWorkCenterByOrg() { + try { + + List workCenterList = prodOrgService.queryMesWorkCenterByOrg(AuthUtil.getOrganize().getOrganizeCode()); + + return ResultBean.success("操作成功").setResultList(workCenterList) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @PutMapping(value = "/mes-center/status-update") + @ApiOperation(value = "根据id启用或禁用生产线信息") + public ResultBean updateMesCenterStatusById(Long id, int status) { + try { + + if (null == id) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要操作的资源。") + .build(); + } + + prodOrgService.updateMesCenterStatusById(id, status, AuthUtil.getSessionUser().getUserName(), AuthUtil.getOrganize().getOrganizeCode()); + + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @PutMapping(value = "/work-cell/update") + @ApiOperation(value = "更新工位信息") + public ResultBean updateMesWorkCell(MesWorkCell workCell) { + try { + ValidatorBean.beginValid(workCell) + .notNull(MesConstWords.ID, workCell.getId()) + .notNull(MesConstWords.WORK_CELL_CODE, workCell.getWorkCellCode()) + .notNull(MesCommConstWords.WORK_CELL_NAME, workCell.getWorkCellName()) + .notNull(MesConstWords.WORK_CENTER_CODE, workCell.getWorkCenterCode()) + .notNull("workCellType", workCell.getWorkCellType()) + .notNull(MesCommConstWords.AREA_CODE, workCell.getAreaCode()); + + prodOrgService.updateMesWorkCell(workCell, AuthUtil.getSessionUser().getUserName(), AuthUtil.getOrganize().getOrganizeCode()); + return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/mes-cell/query") + @ApiOperation(value = "分页查询工位") + public ResultBean queryMesWorkCellByPager(MesWorkCell workCell, Pager pager) { + try { + workCell.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + ListPager workCellList = prodOrgService.queryWorkCellByPager(workCell, pager); + return ResultBean.success("操作成功").setListPager(workCellList) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/mes-cell/query-all") + @ApiOperation(value = "按条件查询工位所有数据") + public ResultBean queryMesWorkCellByProperties(MesWorkCell workCell) { + try { + workCell.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + List workCellList = prodOrgService.queryMesWorkCellByProperties(workCell); + return ResultBean.success("操作成功").setResultList(workCellList) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @PutMapping(value = "/mes-cell/status-update") + @ApiOperation(value = "根据id启用或禁用工位信息") + public ResultBean updateMesCellStatusById(Long id, int status) { + try { + + if (null == id) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要操作的资源。") + .build(); + } + + prodOrgService.updateMesCellStatusById(id, status, AuthUtil.getSessionUser().getUserName(), AuthUtil.getOrganize().getOrganizeCode()); + + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesAreaController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesAreaController.java index f9c8042..577c662 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesAreaController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesAreaController.java @@ -5,6 +5,9 @@ import cn.estsh.i3plus.pojo.mes.bean.MesArea; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * 地域信息 + */ @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesArea") public class MesAreaController extends BaseMesController{ diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBomController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBomController.java index f291abb..c2273ac 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBomController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBomController.java @@ -6,6 +6,9 @@ import cn.estsh.i3plus.pojo.mes.bean.MesBom; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * bom信息 + */ @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesBom") public class MesBomController extends BaseMesController{ diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerCarModelController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerCarModelController.java index 7d63548..370797c 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerCarModelController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerCarModelController.java @@ -5,6 +5,9 @@ import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModel; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * 客户车型配置 + */ @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCustomerCarModel") public class MesCustomerCarModelController extends BaseMesController{ diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerCarModelDetailController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerCarModelDetailController.java index d112f78..324e484 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerCarModelDetailController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerCarModelDetailController.java @@ -6,6 +6,9 @@ import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModelDetail; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * 客户车型配置明细 + */ @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCustomerCarModelDetail") public class MesCustomerCarModelDetailController extends BaseMesController{ diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerController.java index 354b107..602ec39 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerController.java @@ -6,6 +6,9 @@ import cn.estsh.i3plus.pojo.mes.bean.MesCustomer; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * 客户信息 + */ @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCustomer") public class MesCustomerController extends BaseMesController{ diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerMessagePointController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerMessagePointController.java index 5f80bdd..949ee55 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerMessagePointController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerMessagePointController.java @@ -6,8 +6,10 @@ import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * 客户信息点 + */ @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCustomerMessagePoint") - public class MesCustomerMessagePointController extends BaseMesController{ } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerOriganizeController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerOriganizeController.java index f70d883..09fae61 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerOriganizeController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerOriganizeController.java @@ -6,8 +6,10 @@ import cn.estsh.i3plus.pojo.mes.bean.MesCustomerOriganze; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * 客户工厂信息 + */ @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCustomerOriganze") - public class MesCustomerOriganizeController extends BaseMesController{ } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerPartController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerPartController.java index 839d603..a0ce5c5 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerPartController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerPartController.java @@ -6,8 +6,10 @@ import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * 客户零件号 + */ @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCustomerPart") - public class MesCustomerPartController extends BaseMesController{ } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquipmentCheckController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquipmentCheckController.java index 8c5a51a..6ac4bbb 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquipmentCheckController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquipmentCheckController.java @@ -5,8 +5,11 @@ import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentCheck; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + +/** + * 设备点检 + */ @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesEquipmentCheck") - public class MesEquipmentCheckController extends BaseMesController{ } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquipmentCheckDetailController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquipmentCheckDetailController.java index f161323..c7aad09 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquipmentCheckDetailController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquipmentCheckDetailController.java @@ -5,8 +5,10 @@ import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentCheckDetail; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * 设备点检明细 + */ @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesEquipmentCheckDetail") - public class MesEquipmentCheckDetailController extends BaseMesController{ } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquitmentController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquitmentController.java index 04ef120..83130ff 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquitmentController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquitmentController.java @@ -1,12 +1,12 @@ 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.MesEquitment; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipment; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @RestController -@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesEquitment") +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesEquipment") -public class MesEquitmentController extends BaseMesController { +public class MesEquitmentController extends BaseMesController { } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesModelMultiCavityController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesModelMultiCavityController.java index 40c31cc..a537078 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesModelMultiCavityController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesModelMultiCavityController.java @@ -6,6 +6,9 @@ import cn.estsh.i3plus.pojo.mes.bean.MesModelMultiCavity; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * 一模多腔维护 + */ @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesModelMultiCavity") public class MesModelMultiCavityController extends BaseMesController{ diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartController.java index 3b12994..3ed89ba 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartController.java @@ -6,8 +6,10 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPart; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * 零件管理 + */ @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPart") - public class MesPartController extends BaseMesController{ } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartProdGroupController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartProdGroupController.java index f74606d..394a280 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartProdGroupController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartProdGroupController.java @@ -5,8 +5,10 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPartProdGroup; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * 零件生产组 + */ @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPartProdGroup") - public class MesPartProdGroupController extends BaseMesController{ } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartPtrController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartPtrController.java index e9ad5d9..489c382 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartPtrController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartPtrController.java @@ -1,12 +1,29 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesPartPtrService; +import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.MesPartPtrDetailService; import cn.estsh.i3plus.ext.mes.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.MesArea; import cn.estsh.i3plus.pojo.mes.bean.MesPartPtr; +import cn.estsh.i3plus.pojo.mes.bean.MesPartPtrDetail; +import cn.estsh.impp.framework.boot.auth.AuthUtil; +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.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * ptr零件 + */ @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPartPtr") public class MesPartPtrController extends BaseMesController { + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartPtrDetailController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartPtrDetailController.java new file mode 100644 index 0000000..59a23df --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartPtrDetailController.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.ext.mes.apiservice.controller.base; + +import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.MesPartPtrDetailService; +import cn.estsh.i3plus.ext.mes.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.MesPartPtr; +import cn.estsh.i3plus.pojo.mes.bean.MesPartPtrDetail; +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.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * ptr零件 + */ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPartPtrDetail") +public class MesPartPtrDetailController extends BaseMesController { + + @PostMapping(value = "/queryPtrDetail") + @ApiOperation(value = "查询节拍列表") + public ResultBean getPtrDetail(MesPartPtrDetail mesPartPtrDetail, Pager pager) { + try { + mesPartPtrDetail.setIsValid(1); + mesPartPtrDetail.setOrganizeCode("1154"); + + ListPager mesList = baseService.queryPager(mesPartPtrDetail, pager); + return ResultBean.success("查询成功").setListPager(mesList) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartPullController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartPullController.java index 15cba16..c89d1ad 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartPullController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartPullController.java @@ -5,8 +5,10 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPartPull; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * 物料拉动组 + */ @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPartPull") - public class MesPartPullController extends BaseMesController { } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartShippingGroupController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartShippingGroupController.java index 3ebe096..8284db8 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartShippingGroupController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartShippingGroupController.java @@ -5,8 +5,10 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroup; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * 物料发运组 + */ @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPartShippingGroup") - public class MesPartShippingGroupController extends BaseMesController { } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquitmentService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java similarity index 77% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquitmentService.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java index d006e79..90a86fd 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquitmentService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java @@ -2,13 +2,13 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesEquipmentCheckService; import cn.estsh.i3plus.ext.mes.api.base.IMesEquitmentService; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipment; import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentCheck; -import cn.estsh.i3plus.pojo.mes.bean.MesEquitment; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Service @Slf4j -public class MesEquitmentService extends BaseMesService implements IMesEquitmentService { +public class MesEquipmentService extends BaseMesService implements IMesEquitmentService { } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartProdGroupService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartProdGroupService.java index ca48e29..04f320e 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartProdGroupService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartProdGroupService.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesEquitmentService; import cn.estsh.i3plus.ext.mes.api.base.IMesPartProdGroupService; -import cn.estsh.i3plus.pojo.mes.bean.MesEquitment; import cn.estsh.i3plus.pojo.mes.bean.MesPartProdGroup; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPtrDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPtrDetailService.java new file mode 100644 index 0000000..dae5218 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPtrDetailService.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesPartPtr; +import cn.estsh.i3plus.pojo.mes.bean.MesPartPtrDetail; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Service +@Slf4j +public class MesPartPtrDetailService extends BaseMesService { + +}