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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 037f318..00283d0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2908,7 +2908,8 @@ public class MesPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CACHA_QUEUE_STATUS { - CREATE(10, "创建"); + CREATE(10, "创建"), + COMPLETE(20, "完成"); private int value; private String description; @@ -2951,4 +2952,150 @@ public class MesPcnEnumUtil { return description; } } + + /** + * 工位BOM表中的匹配类型 + * 10. + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STATION_BOM_MATCH_RULE { + + BARCODE_RULE_MATCHING(10, "条码规则匹配"), + PROCESS_BARCODE_MATCHING(20, "过程条码匹配"), + BAR_CODE_MATCHING(20, "条码匹配"); + + private int value; + private String description; + + STATION_BOM_MATCH_RULE(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; + } + } + + /** + * 作业模式 + * 10. + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OPERATION_MODE { + SINGLE_SCAN(10, "单个扫描"), + NO_SCAN_DEDUCTION(20, "不扫描后端扣减"); + + private int value; + private String description; + + OPERATION_MODE(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; + } + } + + /** + * 是否完成整箱 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FINISH_FLAG { + + FALSE(0, "未完成"), + TRUE(1, "完成"); + + private int value; + private String description; + + FINISH_FLAG(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; + } + } + + /** + * 换膜信号 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum HM_FLAG { + + NOT_FILM_EXCHANGE(0, "不需换模"), + FILM_EXCHANGE(1, "需换模"); + + private int value; + private String description; + + HM_FLAG(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/MesCachaQueue.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java index 34e21f9..a3b9f8b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java @@ -42,4 +42,8 @@ public class MesCachaQueue extends BaseBean implements Serializable { @ApiParam("缓存类型") private String cachaType; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + } 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/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index bab6d9c..e1599ec 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -78,6 +78,10 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam(value = "是否绑定关键件") private Integer isBindKey; + @Column(name = "MATCH_RULE") + @ApiParam(value = "匹配规则") + private Integer matchRule; + @Transient @ApiParam("是否已绑定") private Boolean isBind; @@ -114,6 +118,14 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam(value = "是否绑定关键件名称") private String isBindKeyName; + @Transient + @ApiParam("是否扫描") + private Boolean isScan = false; + + @Transient + @ApiParam("半成品条码") + private String halfProductSn; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } 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 { +}