From 29e52d9524f22d7a641fd5658610a540e322d9aa Mon Sep 17 00:00:00 2001 From: gsz Date: Fri, 17 May 2024 14:25:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?Mes=E8=AE=BE=E5=A4=87=E5=81=9C=E6=9C=BA?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0+=E8=AE=BE=E5=A4=87=E5=81=9C=E6=9C=BA?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/api/base/IMesBasDowntimeReasonService.java | 13 ++++++++++ .../api/base/IMesBasDowntimeReasonTypeService.java | 13 ++++++++++ .../base/MesBasDowntimeReasonController.java | 18 ++++++++++++++ .../base/MesBasDowntimeReasonTypeController.java | 18 ++++++++++++++ .../base/MesBasDowntimeReasonServiceImpl.java | 28 ++++++++++++++++++++++ .../base/MesBasDowntimeReasonTypeServiceImpl.java | 27 +++++++++++++++++++++ .../base/MesMaximoMeterMainDataServiceImpl.java | 2 +- 7 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonTypeService.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonTypeController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonServiceImpl.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonTypeServiceImpl.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonService.java new file mode 100644 index 0000000..7796346 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReason; + +/** + * @Description :设备停机原因 + * @Reference : + * @Author : gsz + * @CreateDate 2024/5/17 14:06 + * @Modify: + **/ +public interface IMesBasDowntimeReasonService extends IBaseMesService { +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonTypeService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonTypeService.java new file mode 100644 index 0000000..32c2ccd --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonTypeService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReasonType; + +/** + * @Description :设备停机类型 + * @Reference : + * @Author : gsz + * @CreateDate 2024/5/17 14:06 + * @Modify: + **/ +public interface IMesBasDowntimeReasonTypeService extends IBaseMesService { +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonController.java new file mode 100644 index 0000000..7b6df07 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonController.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.MesBasDowntimeReason; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : + * @Reference : + * @Author : gsz + * @CreateDate : 2024-05-17 14:16 + * @Modify: + **/ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesBasDowntimeReason") +public class MesBasDowntimeReasonController extends BaseMesController{ +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonTypeController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonTypeController.java new file mode 100644 index 0000000..b5b33da --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonTypeController.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.MesBasDowntimeReasonType; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : + * @Reference : + * @Author : gsz + * @CreateDate : 2024-05-17 14:16 + * @Modify: + **/ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesBasDowntimeReasonType") +public class MesBasDowntimeReasonTypeController extends BaseMesController{ +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonServiceImpl.java new file mode 100644 index 0000000..e6c2010 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonServiceImpl.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesBasDowntimeReasonService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReason; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + + +/** + * @Description : Maximo仪表主数据 + * @Reference : + * @Author : gsz + * @CreateDate 2024/5/17 14:06 + * @Modify: + **/ +@Service +@Slf4j +public class MesBasDowntimeReasonServiceImpl extends BaseMesService implements IMesBasDowntimeReasonService { + + protected void setPackQueryBean(MesBasDowntimeReason bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getReasonCode(), "reasonCode", packBean); + DdlPreparedPack.getStringEqualPack(bean.getReasonName(), "reasonName", packBean); + DdlPreparedPack.getStringEqualPack(bean.getReasonType(), "reasonType", packBean); + } + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonTypeServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonTypeServiceImpl.java new file mode 100644 index 0000000..38d7566 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonTypeServiceImpl.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesBasDowntimeReasonTypeService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReasonType; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + + +/** + * @Description : Maximo仪表主数据 + * @Reference : + * @Author : gsz + * @CreateDate 2024/5/17 14:06 + * @Modify: + **/ +@Service +@Slf4j +public class MesBasDowntimeReasonTypeServiceImpl extends BaseMesService implements IMesBasDowntimeReasonTypeService { + + protected void setPackQueryBean(MesBasDowntimeReasonType bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getTypeCode(), "typeCode", packBean); + DdlPreparedPack.getStringEqualPack(bean.getTypeName(), "typeName", packBean); + } + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoMeterMainDataServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoMeterMainDataServiceImpl.java index 851bf58..9b7d536 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoMeterMainDataServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoMeterMainDataServiceImpl.java @@ -21,7 +21,7 @@ public class MesMaximoMeterMainDataServiceImpl extends BaseMesService Date: Fri, 17 May 2024 15:42:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?40794=20=E4=BA=A7=E5=93=81=E5=B7=A5?= =?UTF-8?q?=E8=89=BA=E8=B7=AF=E7=BA=BF-=E6=96=B0=E5=A2=9E=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/apiservice/serviceimpl/base/MesProdCraftRouteServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdCraftRouteServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdCraftRouteServiceImpl.java index 053ac56..c6edd3d 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdCraftRouteServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdCraftRouteServiceImpl.java @@ -79,7 +79,7 @@ public class MesProdCraftRouteServiceImpl extends BaseMesService Date: Fri, 17 May 2024 16:38:05 +0800 Subject: [PATCH 4/4] =?UTF-8?q?40858=20MES:=E5=88=9B=E5=BB=BA=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C-?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=94=9F=E4=BA=A7=E7=BA=BF=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83=E4=B8=8E=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=AD=E8=AF=A5=E7=89=A9=E6=96=99=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index 9604df8..ae2dee6 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -312,9 +312,10 @@ public class MesWorkOrderService extends BaseMesService implements //校验物料生产版本是否存在 ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", ddlPackBean); + DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", ddlPackBean); DdlPreparedPack.getStringEqualPack(item.getProductVersion(), "productVersion", ddlPackBean); if (!mesProductVersionRDao.isExitByHql(ddlPackBean)) { - MesException.throwMesBusiException("物料【%s】生产版本【%s】信息不存在", item.getPartNo(), item.getProductVersion()); + MesException.throwMesBusiException("物料【%s】产线【%s】生产版本【%s】信息不存在", item.getPartNo(),item.getWorkCenterCode(), item.getProductVersion()); } } else {