From 126440c9762ad4a418bffff27be405884f4950ea Mon Sep 17 00:00:00 2001 From: joke lin Date: Thu, 19 Mar 2020 15:49:22 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1435=20=E5=AE=A2?= =?UTF-8?q?=E6=88=B7JIT=E5=AF=BC=E5=85=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 6 ++- .../i3plus/pojo/mes/bean/MesEncodeRuleMap.java | 48 ++++++++++++++++++++++ .../pojo/mes/bean/MesQueueJitActualDetail.java | 4 ++ .../estsh/i3plus/pojo/mes/bean/MesWorkModule.java | 4 ++ .../i3plus/pojo/mes/model/ButtonDynamicModel.java | 35 ++++++++++++++++ .../i3plus/pojo/mes/model/StationRequestBean.java | 2 + .../mes/repository/MesEncodeRuleMapRepository.java | 13 ++++++ 7 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEncodeRuleMap.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEncodeRuleMapRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 80c65f6..691da86 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3566,7 +3566,8 @@ public class MesEnumUtil { QUALIFIED(10, "number", "数字"), DEFECTED(20, "text", "字符串"), - SCRAPED(30, "select", "可选值"); + SCRAPED(30, "select", "可选值"), + BUTTON(40, "button", "按钮"); private int value; private String code; @@ -4425,7 +4426,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_CELL_MONITOR_TYPE { MONITOR(10, "监听组件"), - SHOW(20, "展示组件"); + SHOW(20, "展示组件"), + BUTTON(30, "按钮组件"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEncodeRuleMap.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEncodeRuleMap.java new file mode 100644 index 0000000..67b5bdd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEncodeRuleMap.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/3/18 7:33 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ENCODE_RULE_MAP") +@Api("MES_编码规则映射表") +public class MesEncodeRuleMap extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4668354179377433538L; + + @Column(name = "TYPE_CODE") + @ApiParam("编码类型代码") + private String typeCode; + + @Column(name = "TYPE_NAME") + @ApiParam("编码类型名称") + private String typeName; + + @Column(name = "BUSINESS_CODE") + @ApiParam("业务代码") + private String businessCode; + + @Column(name = "BUSINESS_VALUE") + @ApiParam("业务值") + private String businessValue; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index 832419c..89cf68d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -58,4 +58,8 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @Column(name = "GROUP_NO") @ApiParam("组内编号") private Integer groupNo; + + @Column(name = "GROUP_SEQ") + @ApiParam("分组序号") + private String groupSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModule.java index 3f7e4cc..37f87bf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModule.java @@ -51,5 +51,9 @@ public class MesWorkModule extends BaseBean implements Serializable { @ApiParam("触发类型") private Integer triggerType; + @Column(name = "SEQ") + @ApiParam("顺序号") + private Integer seq; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java new file mode 100644 index 0000000..c98a3f4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/3/17 3:47 下午 + * @Modify: + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ButtonDynamicModel { + + private Long id; + + @ApiParam("按钮名称") + private String buttonName; + + @ApiParam("按钮代码") + private String buttonCode; + + @ApiParam("调用类") + private String callClass; + + public ButtonDynamicModel(Long id, String buttonName, String buttonCode) { + this.id = id; + this.buttonName = buttonName; + this.buttonCode = buttonCode; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 98829d0..6fcf819 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -63,6 +63,8 @@ public class StationRequestBean implements Serializable { @ApiParam("工步代码") private String stepCode; + @ApiParam("强制执行工步代码") + private String forceSpecStepCode; /** * doScan-扫描，doModule-处理组件,initModule-初始化组件 */ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEncodeRuleMapRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEncodeRuleMapRepository.java new file mode 100644 index 0000000..b44aad6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEncodeRuleMapRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEncodeRuleMap; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/3/18 7:36 下午 + * @Modify: + */ +public interface MesEncodeRuleMapRepository extends BaseRepository { +}