From 723306796452353d79a43c1893f97eee8fb3dade Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 19 Jun 2024 14:19:00 +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=E3=80=90=E5=8C=BA=E5=9F=9F=20?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=20=E5=B7=A5=E4=BD=8D=E3=80=91=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/controller/busi/MesWorkCellExtendCfgController.java | 5 +++++ .../apiservice/serviceimpl/base/MesWorkCellExtendCfgServiceImpl.java | 1 + 2 files changed, 6 insertions(+) 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 index bf2304b..fa2cea2 100644 --- 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 @@ -9,6 +9,7 @@ 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 cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -45,6 +46,10 @@ public class MesWorkCellExtendCfgController { @ApiOperation(value = "查询主子工位关系") public ResultBean queryMesProdShiftRecord(MesWorkCellExtendCfg mesWorkCellExtendCfg) { try { + // 数据校验 + ValidatorBean.checkNotNull(mesWorkCellExtendCfg.getAreaCode(), "区域不能为空"); + ValidatorBean.checkNotNull(mesWorkCellExtendCfg.getWorkCenterCode(), "产线不能为空"); + ValidatorBean.checkNotNull(mesWorkCellExtendCfg.getWorkCellCode(), "工位不能为空"); //查询汇总工单数量 List mesWorkCellExtendCfgList= mesWorkCellExtendCfgService.queryMesWorkCellExtendCfg(mesWorkCellExtendCfg); return ResultBean.success("查询成功") 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 index ba8ace6..4b2677c 100644 --- 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 @@ -54,6 +54,7 @@ public class MesWorkCellExtendCfgServiceImpl implements IMesWorkCellExtendCfgSer @Override public List queryMesWorkCellExtendCfg(MesWorkCellExtendCfg bean) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(bean.getAreaCode(), "areaCode", packBean); DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(bean.getWorkCellCode(), "workCellCode", packBean); DdlPreparedPack.getStringEqualPack(StringUtil.isEmpty(bean.getExtendType())?"20":bean.getExtendType(), "extendType", packBean);