diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java index 2241c79..09c6388 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java @@ -48,6 +48,10 @@ public class MesArea extends BaseBean { @ApiParam(value ="名称") private String name; + public String getName(){ + return areaName; + } + // 默认值 -1 @Transient @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java index 7959144..1933b6e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java @@ -17,7 +17,7 @@ import javax.persistence.Table; import javax.persistence.Transient; /** - * @Description :生产区域 + * @Description :生产设备 * @Reference : * @Author : jack.jia * @CreateDate : 2019-04-02 @@ -59,6 +59,10 @@ public class MesEquipment extends BaseBean { @ApiParam(value ="名称") private String name; + public String getName(){ + return this.equipmentName; + } + // 默认值 -1 @Transient @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java index 112dc97..25f802f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java @@ -55,6 +55,10 @@ public class MesWorkCell extends BaseBean { @ApiParam(value ="名称") private String name; + public String getName(){ + return this.workCellName; + } + // 默认值 -1 @Transient @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java index 2fc7aec..575fd1c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java @@ -59,6 +59,10 @@ public class MesWorkCenter extends BaseBean { @ApiParam(value ="名称") private String name; + public String getName(){ + return this.workCenterName; + } + // 默认值 -1 @Transient @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 42f5639..cd7d4e5 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.base.tool.HqlPack; import org.apache.commons.lang3.StringUtils; /** @@ -286,9 +287,8 @@ public class AndonHqlPack { */ public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode); - if (StringUtils.isNotEmpty(mesArea.getAreaCode())) { - DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean); - } + DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean); + packBean.setOrderByStr(mesArea.orderBy()); return packBean; } @@ -300,12 +300,10 @@ public class AndonHqlPack { */ public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode); - if (StringUtils.isNotEmpty(mesWorkCenter.getWorkCenterCode())) { - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); - } - if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())){ - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); - } + + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); + packBean.setOrderByStr(mesWorkCenter.orderBy()); return packBean; } @@ -317,15 +315,12 @@ public class AndonHqlPack { */ public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode); - if (StringUtils.isNotEmpty(mesWorkCell.getWorkCenterCode())) { - DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean); - } - if (StringUtils.isNotEmpty(mesWorkCell.getAreaCode())){ - DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean); - } - if (StringUtils.isNotEmpty(mesWorkCell.getWorkCellCode())){ - DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); - } + + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); + + packBean.setOrderByStr(mesWorkCell.orderBy()); return packBean; } @@ -343,6 +338,7 @@ public class AndonHqlPack { if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){ DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean); } + packBean.setOrderByStr(mesEquipment.orderBy()); return packBean; } @@ -555,4 +551,90 @@ public class AndonHqlPack { getStringBuilderPack(andonManageRecord, result); return result; } + + /** + * 区域唯一校验 + * @param mesArea + * @return + */ + public static DdlPackBean packHqlCheckMesAreaOnlyByAreaCode(MesArea mesArea){ + DdlPackBean result = new DdlPackBean(); + if (mesArea != null && mesArea.getId() != null && mesArea.getId().longValue() > 0) { + DdlPreparedPack.getNumNOEqualPack(mesArea.getId(),"id",result); + } + + DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(),"areaCode",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + + return result; + } + + /** + * 工作中心唯一校验 + * @param mesWorkCenter + * @return + */ + public static DdlPackBean packHqlCheckMesWorkCenterOnlyByWorkCenterCode(MesWorkCenter mesWorkCenter){ + DdlPackBean result = new DdlPackBean(); + if (mesWorkCenter != null && mesWorkCenter.getId() != null && mesWorkCenter.getId().longValue() > 0) { + DdlPreparedPack.getNumNOEqualPack(mesWorkCenter.getId(),"id",result); + } + + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(),"workCenterCode",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + + return result; + } + + /** + * 工作单元唯一校验 + * @param mesWorkCell + * @return + */ + public static DdlPackBean packHqlCheckMesWorkCellOnlyByWorkCellCode(MesWorkCell mesWorkCell){ + DdlPackBean result = new DdlPackBean(); + if (mesWorkCell != null && mesWorkCell.getId() != null && mesWorkCell.getId().longValue() > 0) { + DdlPreparedPack.getNumNOEqualPack(mesWorkCell.getId(),"id",result); + } + + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(),"workCellCode",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + + return result; + } + + /** + * 设备唯一校验 + * @param mesEquipment + * @return + */ + public static DdlPackBean packHqlCheckMesEquipmentOnlyByEquipmentCode(MesEquipment mesEquipment){ + DdlPackBean result = new DdlPackBean(); + if (mesEquipment != null && mesEquipment.getId() != null && mesEquipment.getId().longValue() > 0) { + DdlPreparedPack.getNumNOEqualPack(mesEquipment.getId(),"id",result); + } + + DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(),"equipmentCode",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + + return result; + } + + /** + * 班次唯一校验 + * @param mesShift + * @return + */ + public static DdlPackBean packHqlCheckMesShiftOnlyByShiftCode(MesShift mesShift){ + DdlPackBean result = new DdlPackBean(); + if (mesShift != null && mesShift.getId() != null && mesShift.getId().longValue() > 0) { + DdlPreparedPack.getNumNOEqualPack(mesShift.getId(),"id",result); + DdlPreparedPack.getStringNoEqualPack(mesShift.getWorkCenterCode(),"workCenterCode",result); + } + + DdlPreparedPack.getStringEqualPack(mesShift.getShiftCode(),"shiftCode",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + + return result; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 041554b..a00d90e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -660,4 +660,56 @@ public class AndonEnumUtil { return tmp; } } + + + /** + * 设备状态： + * 10=备用， + * 20=运行， + * 30=故障， + * 40=检修 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ANDON_EQUIPMENT_STATUS{ + SPARE("10","备用"), + RUN("20","运行"), + ERROR("30","故障"), + OVERHAUL("40","检修"); + + private String value; + private String description; + + ANDON_EQUIPMENT_STATUS(String value,String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 1b6d43a..fca7f7d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -237,6 +237,18 @@ public class DdlPreparedPack { } /** + * 封装String对象成不等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNoEqualPack(String val, String columnName, DdlPackBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(columnName," and model." + columnName + " <> :m_" + columnName, val); + } + } + + /** * 封装String对象成equal语句 * * @param columnName 列名