diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/model/ProdOrgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/model/ProdOrgModel.java new file mode 100644 index 0000000..5df7d8d --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/model/ProdOrgModel.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Entity; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-18-14:16 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("组织模型") +public class ProdOrgModel extends BaseBean { + + @ApiParam("区域名称") + private String areaName; + + @ApiParam("区域代码") + private String areaCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作中心名称") + private String workCenterName; + + @ApiParam("ERP工作中心") + private String erpWorkCenter; + + @ApiParam("工作版本") + private String workVer; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("工作单元名称") + private String workCellName; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("设备名称") + private String equipmentName; + + @ApiParam("设备状态") + private String status; + + @ApiParam("当前级") + private Integer level; +} 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 033dbdb..21fe103 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 @@ -1,13 +1,5 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; -import cn.estsh.i3plus.pojo.andon.bean.AndonPLC; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; -import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import org.apache.commons.lang3.StringUtils; - import cn.estsh.i3plus.pojo.andon.bean.*; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; @@ -183,4 +175,85 @@ public class AndonHqlPack { return result; } + + /** + * 通用查询条件 + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** + * MES区域信息查询条件封装 + * @param mesArea + * @return + */ + public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode); + if (StringUtils.isNotEmpty(mesArea.getAreaCode())) { + DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean); + } + + return packBean; + } + + /** + * MES工作中心信息查询条件封装 + * @param mesWorkCenter + * @return + */ + 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); + } + + return packBean; + } + + /** + * MES工作单元信息查询条件封装 + * @param mesWorkCell + * @return + */ + 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); + } + + return packBean; + } + + /** + * MES设备信息查询条件封装 + * @param mesEquipment + * @return + */ + public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode); + if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())){ + DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean); + } + if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){ + DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean); + } + + return packBean; + } } 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 da0802d..f50b5d1 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 @@ -185,4 +185,42 @@ public class AndonEnumUtil { return tmp; } } + + /** + * 组织模型树形菜单level + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROD_ORG_LEVEL{ + + LEVEL_ONE(1,"一级目录"), + LEVEL_TWO(2,"二级目录"), + LEVEL_THREE(3,"三级目录"), + LEVEL_FOUR(4,"四级目录"); + + private int value; + private String description; + + PROD_ORG_LEVEL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val ) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index ccb818d..9c4f50a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -28,6 +28,10 @@ import javax.persistence.Table; @Table(name="MES_SHIFT") @Api("班次信息") public class MesShift extends BaseBean { + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + @Column(name="SHIFT_CODE") @ApiParam("班次代码") private String shiftCode; @@ -42,5 +46,5 @@ public class MesShift extends BaseBean { @Column(name="WORK_TIMES") @ApiParam("作业时长") - private String workTimes; + private Double workTimes; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java index 56d40ff..b4a23a6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java @@ -22,7 +22,7 @@ import javax.persistence.Entity; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api("生产区域") +@Api("组织模型") public class ProdOrgModel extends BaseBean { @ApiParam("区域名称") 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 d7242d7..7a4c160 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 @@ -265,4 +265,24 @@ public class MesHqlPack { return packBean; } + + /** + * MES班次信息查询条件封装 + * @param shift + * @return + */ + public static DdlPackBean getMesShift(MesShift shift, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode); + if (StringUtils.isNotEmpty(shift.getShiftCode())){ + DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean); + } + if (StringUtils.isNotEmpty(shift.getShiftName())){ + DdlPreparedPack.getStringEqualPack(shift.getShiftName(), "shiftName", packBean); + } + if (StringUtils.isNotEmpty(shift.getWorkCenterCode())){ + DdlPreparedPack.getStringEqualPack(shift.getWorkCenterCode(), "workCenterCode", packBean); + } + + return packBean; + } } diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 7250b00..1374838 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -46,6 +46,10 @@ i3plus.pojo i3plus-pojo-mes + + i3plus.pojo + i3plus-pojo-andon + diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/SysOrganizeModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/SysOrganizeModel.java new file mode 100644 index 0000000..7a9f6e0 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/SysOrganizeModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.model.andon; + +import cn.estsh.i3plus.pojo.andon.bean.MesArea; +import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; +import io.swagger.annotations.ApiParam; + +import javax.persistence.Transient; +import java.util.List; + +public class SysOrganizeModel extends SysOrganize{ + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + public List getChildTreeList() { + return childTreeList; + } + + public void setChildTreeList(List childTreeList) { + this.childTreeList = childTreeList; + } +} diff --git a/pom.xml b/pom.xml index 1ce4f37..8975679 100644 --- a/pom.xml +++ b/pom.xml @@ -123,6 +123,12 @@ ${project.version} + + i3plus.pojo + i3plus-pojo-andon + ${project.version} + + com.fasterxml.jackson.core