diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoard.java new file mode 100644 index 0000000..7893a30 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoard.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 4:49 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD") +@Api("MES_看板") +public class MesBoard extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3932883110518753734L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "BOARD_NAME") + @ApiParam("看板名称") + private String boardName; + + @Column(name = "BOARD_TYPE") + @ApiParam("看板类型") + private String boardType; + + @Column(name = "REFRESH_INTERVAL") + @ApiParam("刷新时间") + private Integer refreshInterval; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java new file mode 100644 index 0000000..8359735 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 5:07 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_EQU_DETAIL") +@Api("MES_看板设备明细") +public class MesBoardEquDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2187463105092165451L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "EQU_CODE") + @ApiParam("设备代码") + private String equCode; + + @Column(name = "EQU_NAME") + @ApiParam("设备名称") + private String equName; + + @Column(name = "X") + @ApiParam("横坐标") + private Double x; + + @Column(name = "Y") + @ApiParam("纵坐标") + private Double y; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java new file mode 100644 index 0000000..acd5675 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 5:01 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_EQU_STATUS") +@Api("MES_看板设备状态") +public class MesBoardEquStatus extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8426698586967483537L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "EQU_CODE") + @ApiParam("设备代码") + private String equCOde; + + @Column(name = "EQU_STATUS_CODE") + @ApiParam("状态代码") + private Integer equStatusCode; + + @Column(name = "EQU_STATUS_DESC") + @ApiParam("状态描述") + private String equStatusDesc; + + @Column(name = "COLOR") + @ApiParam("颜色") + private String color; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMonitorObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMonitorObject.java new file mode 100644 index 0000000..cfca7b3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMonitorObject.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 5:19 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_MONITOR_OBJECT") +@Api("MES_看板监控对象") +public class MesBoardMonitorObject extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4136991652901768961L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "OBJECT_TYPE") + @ApiParam("对象类型") + private String objectType; + + @Column(name = "OBJECT_VALUE") + @ApiParam("对象值") + private String objectValue; + + @Column(name = "OBJECT_VALUE_DESC") + @ApiParam("对象值描述") + private String objectValueDesc; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java new file mode 100644 index 0000000..ae43578 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 4:53 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_PICTURE") +@Api("MES_看板图片") +public class MesBoardPicture extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5784111763887252647L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "PICTURE_URL") + @ApiParam("图片路径") + private String pictureUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java new file mode 100644 index 0000000..5b21418 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 6:49 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_PLAN_CAPACITY") +@Api("MES_看板时段计划产量") +public class MesBoardPlanCapacity extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7355311263972875850L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "PLAN_DATE") + @ApiParam("计划日期") + private String planDate; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name = "PLAN_PEOPLE_NUM") + @ApiParam("计划人数") + private Integer planPeopleNum; + + @Column(name = "ACTUAL_PEOPLE_NUM") + @ApiParam("实际人数") + private Integer actualPeopleNum; + + @Column(name = "PLAN_CAPACITY") + @ApiParam("计划产量") + private Integer planCapacity; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java new file mode 100644 index 0000000..4c1f609 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 5:16 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_SHIFT") +@Api("MES_看板班次") +public class MesBoardShift extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3681747818263404086L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name = "SHIFT_NAME") + @ApiParam("班次名称") + private String shiftName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java new file mode 100644 index 0000000..64f4771 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 5:13 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_SHIFT_SECTION") +@Api("MES_看板班次时段") +public class MesBoardShiftSection extends BaseBean implements Serializable { + + private static final long serialVersionUID = -957301986885952078L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name = "START_TIME") + @ApiParam("开始时段") + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("结束时段") + private String endTime; + + @Column(name = "IS_SPANDAY") + @ApiParam("是否跨天") + private Integer isSpanday; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java new file mode 100644 index 0000000..cdf0482 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 5:24 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_SHIFT_SECTION_CAPACITY") +@Api("MES_看板时段计划产量") +public class MesBoardShiftSectionCapacity extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1184108324734484237L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "PLAN_DATE") + @ApiParam("计划日期") + private String planDate; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name = "START_TIME") + @ApiParam("开始时段") + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("结束时段") + private String endTime; + + @Column(name = "PLAN_CAPACITY") + @ApiParam("计划产量") + private Integer planCapacity; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardType.java new file mode 100644 index 0000000..7ca60bc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardType.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 4:43 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_TYPE") +@Api("MES_看板类型") +public class MesBoardType extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3652595133806144706L; + + @Column(name = "BOARD_TYPE") + @ApiParam("看板类型") + private String boardType; + + @Column(name = "BOARD_TYPE_NAME") + @ApiParam("看板类型名称") + private String boardTypeName; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardTypeBaseCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardTypeBaseCfg.java new file mode 100644 index 0000000..786c128 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardTypeBaseCfg.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 4:47 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_TYPE_BASE_CFG") +@Api("MES_看板类型基础配置") +public class MesBoardTypeBaseCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5405378688706555644L; + + @Column(name = "BOARD_TYPE") + @ApiParam("看板类型") + private String boardType; + + @Column(name = "WINDOW_NO") + @ApiParam("界面编号") + private String windowNo; + + @Column(name = "SEQ") + @ApiParam("顺序") + private Integer seq; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardRepository.java new file mode 100644 index 0000000..8c1822d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoard; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 8:53 下午 + * @Modify: + */ +@Repository +public interface MesBoardRepository extends BaseRepository { +} 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 22d5081..2345cc4 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 @@ -2473,4 +2473,25 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesPartFormula.getIsValid(), "isValid", packBean); return packBean; } + + /** + * 看板 + * + * @param board + * @param organizeCode + * @return + */ + public static DdlPackBean getMesBoard(MesBoard board, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(board, organizeCode); + if (!StringUtils.isEmpty(board.getBoardCode())) { + DdlPreparedPack.getStringLikerPack(board.getBoardCode(), "boardCode", packBean); + } + if (!StringUtils.isEmpty(board.getBoardName())) { + DdlPreparedPack.getStringLikerPack(board.getBoardName(), "boardName", packBean); + } + if (!StringUtils.isEmpty(board.getBoardType())) { + DdlPreparedPack.getStringLikerPack(board.getBoardType(), "boardType", packBean); + } + return packBean; + } }