diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 0623bce..f3b9ffa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -754,4 +754,53 @@ public class MesHqlPack { return packBean; } + + /** + * MES工作单元参数配置查询条件封装 + * @param workCellParamCfg + * @return + */ + public static DdlPackBean getMesWorkCellParamCfg(MesWorkCellParamCfg workCellParamCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParamCfg, organizeCode); + if (StringUtils.isNotEmpty(workCellParamCfg.getWorkCellCode())){ + DdlPreparedPack.getStringEqualPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean); + } + if (StringUtils.isNotEmpty(workCellParamCfg.getParamCode())){ + DdlPreparedPack.getStringEqualPack(workCellParamCfg.getParamCode(), "paramCode", packBean); + } + + return packBean; + } + + /** + * MES工作单元队列查询条件封装 + * @param workCellPoint + * @return + */ + public static DdlPackBean getMesWorkCellPoint(MesWorkCellPoint workCellPoint, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(workCellPoint, organizeCode); + if (StringUtils.isNotEmpty(workCellPoint.getWorkCellCode())){ + DdlPreparedPack.getStringEqualPack(workCellPoint.getWorkCellCode(), "workCellCode", packBean); + } + return packBean; + } + + /** + * PLC设备信息配置查询条件封装 + * @param plcConfigure + * @return + */ + public static DdlPackBean getMesPLCConfigure(MesPLCConfigure plcConfigure, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(plcConfigure, organizeCode); + if (StringUtils.isNotEmpty(plcConfigure.getAreaCode())){ + DdlPreparedPack.getStringEqualPack(plcConfigure.getAreaCode(), "areaCode", packBean); + } + if (StringUtils.isNotEmpty(plcConfigure.getWorkCenterCode())){ + DdlPreparedPack.getStringEqualPack(plcConfigure.getWorkCenterCode(), "workCenterCode", packBean); + } + if (StringUtils.isNotEmpty(plcConfigure.getWorkCellCode())){ + DdlPreparedPack.getStringEqualPack(plcConfigure.getWorkCellCode(), "workCellCode", packBean); + } + return packBean; + } }