41404 主工位与子工位【区域 产线 工位】参数校验

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<MesWorkCellExtendCfg> mesWorkCellExtendCfgList= mesWorkCellExtendCfgService.queryMesWorkCellExtendCfg(mesWorkCellExtendCfg);
             return ResultBean.success("查询成功")

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<MesWorkCellExtendCfg>  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);