From a3ecc3132fdbd1795b9fa0fad0da0de8b27974f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 12 Mar 2020 18:00:44 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=BA=A6=E6=9D=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 214 ++++++++++++++++++++- .../cn/estsh/i3plus/pojo/form/bean/BfElement.java | 4 + .../i3plus/pojo/form/bean/BfElementConstraint.java | 61 ++++++ .../form/bean/BfElementConstraintProperty.java | 56 ++++++ .../BfElementConstraintPropertyRepository.java | 14 ++ .../repository/BfElementConstraintRepository.java | 14 ++ .../i3plus/pojo/form/sqlpack/FormHqlPack.java | 31 +++ 7 files changed, 391 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java create mode 100644 modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraintProperty.java create mode 100644 modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java create mode 100644 modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index ef96546..af0d7e3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -1,9 +1,6 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.StringUtils; - -import java.math.BigDecimal; /** * @Description : 模块表单枚举类 @@ -825,6 +822,170 @@ public class BlockFormEnumUtil { /** + * 元素软删状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ELEMENT_DELETE_WEAK_STATUS { + ON(1, "ON", "开启"), + OFF(2, "OFF", "关闭"); + + private int value; + private String code; + private String description; + + private ELEMENT_DELETE_WEAK_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + 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; + } + + public static ELEMENT_DELETE_WEAK_STATUS valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + + /** + * 元素软删状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ELEMENT_VALID_STATUS { + ON(1, "ON", "开启"), + OFF(2, "OFF", "关闭"); + + private int value; + private String code; + private String description; + + private ELEMENT_VALID_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + 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; + } + + public static ELEMENT_VALID_STATUS valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + + /** * 属性字段排序规则 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -1925,4 +2086,51 @@ public class BlockFormEnumUtil { } } + /** + * 元素约束类型枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ELEMENT_CONSTRAINT_TYPE { + UNIQUE(10, "唯一约束"); + // 后续扩展联合主键 +// PRIMARY_KEY(20, "主键约束") + + private int value; + private String description; + + private ELEMENT_CONSTRAINT_TYPE (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; + } + + public static ELEMENT_CONSTRAINT_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index ee72ad6..96c8901 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -142,4 +142,8 @@ public class BfElement extends BaseBean { @Transient @ApiParam(value = "元素虚拟属性信息") private List propertyVirtualList; + + @Transient + @ApiParam(value = "元素约束信息") + private List constraintList; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java new file mode 100644 index 0000000..3afd628 --- /dev/null +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.form.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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; + +/** + * @Description : 元素约束 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-03-12 13:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BF_ELEMENT_CONSTRAINT") +@Api(value = "元素约束", description = "元素约束") +public class BfElementConstraint extends BaseBean { + + @Column(name = "ELEMENT_ID") + @ApiParam(value = "对象元素ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long elementId; + + @Column(name = "CONSTRAINT_NAME") + @ApiParam(value = "约束名称") + private String constraintName; + + @Column(name = "CONSTRAINT_TYPE") + @ApiParam(value = "约束类型") + @AnnoOutputColumn(refClass = BlockFormEnumUtil.ELEMENT_CONSTRAINT_TYPE.class) + private Integer constraintType; + + @Column(name = "CONSTRAIN_PROPERTY_NAME_RDD") + @ApiParam(value = "约束属性") + private String constrainPropertyNameRdd; + + @Column(name = "CONSTRAIN_PROPERTY_IDS") + @ApiParam(value = "约束属性ids") + private String constrainPropertyIds; + +// @Transient +// @ApiParam(value = "元素约束属性信息") +// private List constraintPropertyList; + +} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraintProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraintProperty.java new file mode 100644 index 0000000..839099e --- /dev/null +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraintProperty.java @@ -0,0 +1,56 @@ +//package cn.estsh.i3plus.pojo.form.bean; +// +//import cn.estsh.i3plus.pojo.base.bean.BaseBean; +//import com.fasterxml.jackson.databind.annotation.JsonSerialize; +//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +//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; +// +///** +// * @Description : 元素约束属性 +// * @Reference : +// * @Author : yunhao +// * @CreateDate : 2020-03-12 13:36 +// * @Modify: +// **/ +//@Data +//@Entity +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Table(name = "BF_ELEMENT_CONSTRAINT_PROPERTY") +//@Api(value = "元素约束属性", description = "元素约束属性") +//public class BfElementConstraintProperty extends BaseBean { +// +// @Column(name = "CONSTRAINT_ID") +// @ApiParam(value = "约束ID", example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long constraintId; +// +// @Column(name = "ELEMENT_PROPERTY_ID") +// @ApiParam(value = "元素属性ID", example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long elementPropertyId; +// +// @Column(name = "DATA_OBJECT_PROPERTY_ID") +// @ApiParam(value = "数据对象属性ID", example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long dataObjectPropertyId; +// +// @Column(name="PROPERTY_NAME") +// @ApiParam(value ="元素属性名称") +// private String propertyName; +// +// @Column(name="PROPERTY_CODE_RDD") +// @ApiParam(value ="元素属性代码") +// private String propertyCodeRdd; +// +//} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java new file mode 100644 index 0000000..b3de0fb --- /dev/null +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java @@ -0,0 +1,14 @@ +//package cn.estsh.i3plus.pojo.form.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.form.bean.BfElementConstraintProperty; +// +///** +// * @Description : 元素约束属性 +// * @Reference : +// * @Author : yunhao +// * @CreateDate : 2019-03-21 20:27 +// * @Modify: +// **/ +//public interface BfElementConstraintPropertyRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintRepository.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintRepository.java new file mode 100644 index 0000000..35e7647 --- /dev/null +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.form.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.form.bean.BfElementConstraint; + +/** + * @Description : 元素约束 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-03-21 20:27 + * @Modify: + **/ +public interface BfElementConstraintRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index ed8e820..0d1249d 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -352,4 +352,35 @@ public final class FormHqlPack { return result; } + + /** + * 元素约束复杂查询 + * @param bfElementConstraint 查询条件 + * @return DdlPackBean + */ + public static DdlPackBean packHqlBfElementConstraint(BfElementConstraint bfElementConstraint){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bfElementConstraint.getConstraintName(), "constraintName", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfElementConstraint.getElementId(), "elementId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfElementConstraint.getConstraintType(), "constraintType", ddlPackBean); + + return ddlPackBean; + } + + /** + * 元素约束检查重复 + * @param bfElementConstraint 查询条件 + * @return DdlPackBean + */ + public static DdlPackBean packHqlBfElementConstraintOnly(BfElementConstraint bfElementConstraint){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumNOEqualPack(bfElementConstraint.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bfElementConstraint.getConstraintName(), "constraintName", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfElementConstraint.getElementId(), "elementId", ddlPackBean); + + return ddlPackBean; + } + } From b0a4eccca4e7f08add2c6925d4b874f202512929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 17 Mar 2020 14:29:08 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=90=AF=E7=94=A8?= =?UTF-8?q?=EF=BC=8C=E8=BD=AF=E5=88=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index 54b9201..6ea46e8 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java @@ -120,6 +120,10 @@ public class BfDataObjectProperty extends BaseBean { private transient Integer isDeleteWeaklyProperty; @Transient + @ApiParam(value ="是否为唯一约束字段") + private transient Integer isUniqueProperty; + + @Transient @ApiParam(value ="元素值") private transient Object propertyFormValue; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java index 3afd628..7a6ee13 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -47,9 +48,10 @@ public class BfElementConstraint extends BaseBean { private Integer constraintType; @Column(name = "CONSTRAIN_PROPERTY_NAME_RDD") - @ApiParam(value = "约束属性") + @ApiParam(value = "约束属性名称") private String constrainPropertyNameRdd; + @Lob @Column(name = "CONSTRAIN_PROPERTY_IDS") @ApiParam(value = "约束属性ids") private String constrainPropertyIds; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index 0ca9d53..569c3ed 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -144,6 +144,11 @@ public class BfElementProperty extends BaseBean { @AnnoOutputColumn(hidden = true) private BfDataObjectProperty objectProperty; + @Transient + @ApiParam(value ="是否为唯一约束字段") + private transient Integer isUniqueProperty; + + // public Object getFormValue() { // return propertyFormValue == null ? propertyDefaultValue : propertyFormValue; // } From b3e38170e604a12388c6aa6136b1d7951efc8d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 17 Mar 2020 18:17:47 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E3=80=901440=20PLC=E9=87=87=E9=9B=86?= =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E3=80=90=E7=94=9F=E4=BA=A7=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E3=80=91=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 74 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesStationBom.java | 8 +++ 2 files changed, 82 insertions(+) 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..0aa02da 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 @@ -2951,4 +2951,78 @@ 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; + } + } } 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..71fb641 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,10 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam(value = "是否绑定关键件名称") private String isBindKeyName; + @Transient + @ApiParam("是否扫描") + private Boolean isScan; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From 608a1d1e514609a9f2153908f4e9d8d6edbbdb48 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 18 Mar 2020 12:19:56 +0800 Subject: [PATCH 04/25] ptl --- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java index cb738fd..b07a2d9 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java @@ -92,4 +92,8 @@ public class PtlAreaTask extends BaseBean implements Serializable { @Column(name = "qty") @ApiParam("数量") private Integer qty; + + @Column(name = "TRAY_NO") + @ApiParam("托盘号") + private String trayNo; } From 26bf62fbe7235a60c8da21a42b162efd3ec20c6e Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 18 Mar 2020 18:44:06 +0800 Subject: [PATCH 05/25] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E9=87=87=E9=9B=86=E5=B7=A5=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java index f9c2852..9c36828 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java @@ -41,4 +41,12 @@ public class MesFaultPhenomenon extends BaseBean implements Serializable { @Column(name = "PARENT_FP_CODE") @ApiParam("父阶现象代码") private String parentFpCode; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name = "FP_TYPE") + @ApiParam("故障现象类型") + private Integer fpType; } From 327af15040d588b383e3bd8390cfb178128d9acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 18 Mar 2020 19:32:18 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E5=BC=80=E5=8F=91WMS=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=8F=92=E4=BB=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/plugin/BasPlugin.java | 83 ++++++++++++++++++++++ .../pojo/wms/bean/plugin/BasPluginClass.java | 47 ++++++++++++ .../wms/repository/BasPluginClassRepository.java | 15 ++++ .../pojo/wms/repository/BasPluginRepository.java | 15 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 15 ++++ 5 files changed, 175 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPluginClass.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasPluginClassRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasPluginRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java new file mode 100644 index 0000000..fc71899 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java @@ -0,0 +1,83 @@ +package cn.estsh.i3plus.pojo.wms.bean.plugin; + +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; + +/** + * @Description : 插件信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-03-17 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BAS_PLUGIN") +@Api("插件信息") +public class BasPlugin extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592779L; + @Column(name="PLUGIN_NAME") + @ApiParam("插件名称") + private String pluginName; + + @Column(name="PLUGIN_IMAGE") + @ApiParam("插件图片") + private String pluginImage; + + @Column(name="PLUGIN_URL") + @ApiParam("插件URL地址") + private String pluginUrl; + + @Column(name="PLUGIN_PATH") + @ApiParam("插件文件地址") + private String pluginPath; + + @Column(name="PLUGIN_FILE_ID") + @ApiParam(value = "插件文件ID", example = "0") + private Long pluginFileId; + + @Column(name="PLUGIN_DESC") + @ApiParam("插件描述") + private String vendorAddr; + + @Column(name="SERVICE_NAME") + @ApiParam("服务名称") + private String serviceName; + + @Column(name="REQUEST_URL") + @ApiParam("请求路径") + private String requestUrl; + + @Column(name = "COPYRIGHT") + @ApiParam(value = "版权") + private Integer copyRight; + + @Column(name = "AUTHOR") + @ApiParam(value = "作者") + private String author; + + @Column(name = "PLUGIN_STATUS") + @ApiParam(value = "插件状态", example = "1") + private Integer pluginStatus; + + @Column(name = "PLUGIN_DIRECTORY") + @ApiParam(value = "本地插件文件夹") + private String pluginDirectory; + + @Column(name = "PLUGIN_PACKAGE_NAME") + @ApiParam(value = "插件项目包名称") + private String pluginPackName; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPluginClass.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPluginClass.java new file mode 100644 index 0000000..d2f97fd --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPluginClass.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.wms.bean.plugin; +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.Lob; +import javax.persistence.Table; + +/** + * @Description : 插件类信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-03-17 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BAS_PLUGIN_CLASS") +@Api("插件类信息") +public class BasPluginClass extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592779L; + @Column(name="PLUGIN_ID") + @ApiParam(value = "插件编号", example = "0") + private Long pluginId; + + @Column(name="BEAN_NAME") + @ApiParam("Bean名称") + private String beanName; + + @Column(name="CLASS_NAME") + @ApiParam("插件类名称") + private String className; + + @Lob + @Column(name="CLASS_BYTE", length = 100000) + @ApiParam("插件类字节码") + private byte[] classByte; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasPluginClassRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasPluginClassRepository.java new file mode 100644 index 0000000..f253eb2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasPluginClassRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPluginClass; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-03-17 15:17 + * @Modify: + **/ +@Repository +public interface BasPluginClassRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasPluginRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasPluginRepository.java new file mode 100644 index 0000000..c9d9ce0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasPluginRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPlugin; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-03-17 15:17 + * @Modify: + **/ +@Repository +public interface BasPluginRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index abff614..aa19693 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -9,6 +9,7 @@ import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo; import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction; +import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPlugin; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; @@ -2852,4 +2853,18 @@ public class WmsHqlPack { return result; } + /** + * 插件信息分页查询条件 + * @param plugin + * @return + */ + public static DdlPackBean packHqlBasPlugin(BasPlugin plugin) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(plugin.getPluginName(), "pluginName", result); + DdlPreparedPack.getStringLikerPack(plugin.getAuthor(), "author", result); + DdlPreparedPack.getNumEqualPack(plugin.getPluginStatus(), "pluginStatus", result); + getStringBuilderPack(plugin, result); + return result; + } + } From 779b9d209ce032c313210bf54ddc1b4bea3c6c97 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 19 Mar 2020 09:57:57 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=20DEV-pom.xml?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index f8fa98e..ebd53c3 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 1414885..4fa7c5a 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d790ef1..e97c0bb 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c6141da..90e744d 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 23e5bee..0ba3645 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index c1e2cb9..6706323 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 856da5f..ffcac19 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 09f2c4a..e388a1d 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 82fdbe8..62ebe64 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index b7b2dfc..39d9423 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ec9e100..e310bfd 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 0db7b7d..92de049 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index bd09726..e36fcf7 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 4c96781..81fb02b 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 2c24e41..1f622d9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 18c811c..bc41914 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 1171f4e..93f9732 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index bca9cbb..2ffb2ae 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From f5e4bba7617ea4ab053b6542ef8b447cd4d6c8ec Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 19 Mar 2020 10:19:36 +0800 Subject: [PATCH 08/25] ptlpcnenum --- .../java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 614df60..86e527d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -292,11 +292,12 @@ public class PtlPcnEnumUtil { public enum SIGNAL_CHILD_CMD { CHILD_CMD_06H("06", 6, "正常"), CHILD_CMD_07H("07", 7, "缺货"), - CHILD_CMD_09H("09", 9, "标签自检"), - CHILD_CMD_0AH("0A", 10, "亮灯错误"), + CHILD_CMD_09H("09", 9, "连接的现场设备的返回状态"), + CHILD_CMD_FFH("FF", 255, "无效消息"), + CHILD_CMD_0AH("0A", 10, "现场设备超时"), CHILD_CMD_0BH("0B", 11, "查询设备故障，返回设备故障"), CHILD_CMD_0CH("0C", 12, "设备无法执行命令,用错命令"), - CHILD_CMD_0DH("0D", 13, "卡键,按键卡住"), + CHILD_CMD_0DH("0D", 13, "返回按钮锁定消息,卡键,按键卡住"), CHILD_CMD_0FH("0F", 15, "返回库存模式下的缺货量"), CHILD_CMD_64H("64", 100, "熄灭情况下返回"), CHILD_CMD_FAH("FA", 250, "设备的 F/W 模型信息"), From b08d20fdb66c6d9955203ac6534155917d732f19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 19 Mar 2020 11:46:55 +0800 Subject: [PATCH 09/25] =?UTF-8?q?=E5=BC=80=E5=8F=91WMS=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=8F=92=E4=BB=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java index fc71899..876fd8e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java @@ -51,7 +51,7 @@ public class BasPlugin extends BaseBean{ @Column(name="PLUGIN_DESC") @ApiParam("插件描述") - private String vendorAddr; + private String pluginDesc; @Column(name="SERVICE_NAME") @ApiParam("服务名称") @@ -69,6 +69,9 @@ public class BasPlugin extends BaseBean{ @ApiParam(value = "作者") private String author; + /** + * 插件安装状态 1-安装，2-卸载 + */ @Column(name = "PLUGIN_STATUS") @ApiParam(value = "插件状态", example = "1") private Integer pluginStatus; From 6bdf8153294cff5bd7ae0411d89d090a114bd14a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 19 Mar 2020 15:30:13 +0800 Subject: [PATCH 10/25] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=8F=82=E6=95=B0=E5=AE=9E=E4=BD=93=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0(=E7=8A=B6=E6=80=81=E4=BB=A3=E7=A0=81statusCode)?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java index e879275..9eec664 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java @@ -61,4 +61,8 @@ public class PtlAreaRouteModuleParam extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("参数值") private String paramValue; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; } From 22788f1c4413b718087156709d9c07542a9d2615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 19 Mar 2020 15:42:14 +0800 Subject: [PATCH 11/25] =?UTF-8?q?=E8=BF=98=E5=8E=9FPOM=E6=96=87=E4=BB=B6TE?= =?UTF-8?q?ST-DEV?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index f8fa98e..ebd53c3 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 1414885..4fa7c5a 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d790ef1..e97c0bb 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c6141da..90e744d 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 23e5bee..0ba3645 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index c1e2cb9..6706323 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 856da5f..ffcac19 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 09f2c4a..e388a1d 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 82fdbe8..62ebe64 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index b7b2dfc..39d9423 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ec9e100..e310bfd 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 0db7b7d..92de049 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index bd09726..e36fcf7 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 4c96781..81fb02b 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 2c24e41..1f622d9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 18c811c..bc41914 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 1171f4e..93f9732 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index bca9cbb..2ffb2ae 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 310bf49af603cc8317171e2d2d57d7314f572cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 19 Mar 2020 15:43:09 +0800 Subject: [PATCH 12/25] =?UTF-8?q?=E3=80=90MES=5F=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=8D=A2=E8=86=9C=E5=B9=B6=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=8D=A2=E6=A8=A1=E4=BF=A1=E5=8F=B7=20=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 72 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesStationBom.java | 6 +- 2 files changed, 77 insertions(+), 1 deletion(-) 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 0aa02da..ea58f6e 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 @@ -3025,4 +3025,76 @@ public class MesPcnEnumUtil { 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/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 71fb641..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 @@ -120,7 +120,11 @@ public class MesStationBom extends BaseBean implements Serializable { @Transient @ApiParam("是否扫描") - private Boolean isScan; + private Boolean isScan = false; + + @Transient + @ApiParam("半成品条码") + private String halfProductSn; public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; From 126440c9762ad4a418bffff27be405884f4950ea Mon Sep 17 00:00:00 2001 From: joke lin Date: Thu, 19 Mar 2020 15:49:22 +0800 Subject: [PATCH 13/25] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1435=20?= =?UTF-8?q?=E5=AE=A2=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 { +} From 9f8e51830ee0921905a541f575051c491baca5b9 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 19 Mar 2020 17:19:42 +0800 Subject: [PATCH 14/25] mes enum --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 ea58f6e..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; 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; + } From 1690c9567bc7e2c2191128c2c1ae5cddde29cff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 19 Mar 2020 17:44:25 +0800 Subject: [PATCH 15/25] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B0=83=E7=94=A8MES?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=91=E9=80=81=E5=AE=8C=E6=88=90=E4=BF=A1?= =?UTF-8?q?=E5=8F=B7=20=E5=92=8C=20=E6=A0=B9=E6=8D=AE=E4=B8=BB=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=BC=96=E5=8F=B7=E7=94=9F=E6=88=90=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ptl/repository/PtlAreaRouteModuleParamRepository.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaRouteModuleParamRepository.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaRouteModuleParamRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaRouteModuleParamRepository.java new file mode 100644 index 0000000..b0a00de --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaRouteModuleParamRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaRouteModuleParam; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlAreaRouteModuleParamRepository extends BaseRepository { + +} From bacab3fb88a7fdba2ea0fb182f74148016502f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 20 Mar 2020 10:54:17 +0800 Subject: [PATCH 16/25] =?UTF-8?q?=E3=80=90MES=5F=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=B7=A5=E8=A3=85=E5=85=B3=E7=B3=BB=E5=92=8C?= =?UTF-8?q?=E5=B7=A5=E8=A3=85=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95pojo?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 74 ++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesEquipmentTooling.java | 74 ++++++++++++++++++++ .../pojo/mes/bean/MesToolingActionRecord.java | 79 ++++++++++++++++++++++ .../repository/MesEquipmentToolingRepository.java | 17 +++++ .../MesToolingActionRecordRepository.java | 17 +++++ 5 files changed, 261 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentToolingRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingActionRecordRepository.java 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 ea58f6e..94d1b28 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 @@ -3097,4 +3097,78 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * mes_设备工装类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EQUIPMENT_TOOLING_TOOLING_TYPE { + + WORK_CLOTHES(10, "工装"), + CHECKING_TOOL(20, "检具"), + MOULD(30, "模具"); + + private int value; + private String description; + + EQUIPMENT_TOOLING_TOOLING_TYPE(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; + } + } + + /** + * mes_工装操作记录表的操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ACTION_TYPE { + + REPLACE(10, "更换"), + WAREHOUSING(20, "入库"), + RECEIVE(30, "领用"); + + private int value; + private String description; + + ACTION_TYPE(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/MesEquipmentTooling.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java new file mode 100644 index 0000000..2df7f2e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java @@ -0,0 +1,74 @@ +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 :MES_设备工装关系 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-03-19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQUIPMENT_TOOLING") +@Api("MES_设备工装关系") +public class MesEquipmentTooling extends BaseBean implements Serializable { + private static final long serialVersionUID = 1947971369479107711L; + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name = "TOOLING_NO") + @ApiParam("工装编号") + private String toolingNo; + + @Column(name = "TOOLING_CODE") + @ApiParam("工装代码") + private String toolingCode ; + + @Column(name = "TOOLING_NAME") + @ApiParam("工装名称") + private String toolingName; + + @Column(name = "TOOLING_TYPE") + @ApiParam("工装类型") + private Integer toolingType; + + @Column(name = "USE_COUNT") + @ApiParam("使用次数") + private Integer useCount; + + @Column(name = "START_TIME") + @ApiParam("更换开始时间") + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("更换结束时间") + private String endTime; + + + public Integer getToolingType() { + return this.toolingType == null ? 0 : this.toolingType; + } + + public Integer getUseCount() { + return this.useCount == null ? 0 : this.useCount; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java new file mode 100644 index 0000000..ee236fc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java @@ -0,0 +1,79 @@ +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 :MES_工装操作记录 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-03-20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TOOLING_ACTION_RECORD") +@Api("MES_工装操作记录") +public class MesToolingActionRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 1947971369479107712L; + + @Column(name = "TOOLING_NO") + @ApiParam("工装编号") + private String toolingNo; + + @Column(name = "ACTION_TYPE") + @ApiParam("操作类型") + private Integer actionType; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name = "TOOLING_CODE") + @ApiParam("工装代码") + private String toolingCode ; + + @Column(name = "TOOLING_NAME") + @ApiParam("工装名称") + private String toolingName; + + @Column(name = "TOOLING_TYPE") + @ApiParam("工装类型") + private Integer toolingType; + + @Column(name = "USE_COUNT") + @ApiParam("使用次数") + private Integer useCount; + + @Column(name = "START_TIME") + @ApiParam("更换开始时间") + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("更换结束时间") + private String endTime; + + + public Integer getToolingType() { + return this.toolingType == null ? 0 : this.toolingType; + } + + public Integer getUseCount() { + return this.useCount == null ? 0 : this.useCount; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentToolingRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentToolingRepository.java new file mode 100644 index 0000000..173e73a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentToolingRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesArea; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentTooling; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEquipmentToolingRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingActionRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingActionRecordRepository.java new file mode 100644 index 0000000..54ae9a0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingActionRecordRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentTooling; +import cn.estsh.i3plus.pojo.mes.bean.MesToolingActionRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesToolingActionRecordRepository extends BaseRepository { +} From 74e4aa953b5fa672d18159ac410b8a7515f88fe6 Mon Sep 17 00:00:00 2001 From: zcg Date: Fri, 20 Mar 2020 15:14:14 +0800 Subject: [PATCH 17/25] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=201480=20=20?= =?UTF-8?q?=E7=85=A7=E7=89=87=E9=87=87=E9=9B=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/bean/MesSnPhotoRelation.java | 45 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesSnPhotoRelation.java | 45 ++++++++++++++++++++++ .../repository/MesSnPhotoRelationRepository.java | 16 ++++++++ 3 files changed, 106 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSnPhotoRelationRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java new file mode 100644 index 0000000..b29fae0 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 : + * @Reference : + * @Author : zcg + * @Date : 2020/3/18 0018 - 9:07 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SN_PHOTO_RELATION") +@Api("条码照片关系") +public class MesSnPhotoRelation extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7732648131003455681L; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("条码") + private String serialNumber; + + @Column(name = "PHOTO_PATH") + @ApiParam("照片路径") + private String photoPath; + + @Column(name = "PHOTO_NAME") + @ApiParam("照片名称") + private String photoName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java new file mode 100644 index 0000000..d54028c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java @@ -0,0 +1,45 @@ +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 : + * @Reference : + * @Author : zcg + * @Date : 2020/3/18 0018 - 9:02 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SN_PHOTO_RELATION") +@Api("条码照片关系") +public class MesSnPhotoRelation extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3062206473345277360L; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("条码") + private String serialNumber; + + @Column(name = "PHOTO_PATH") + @ApiParam("照片路径") + private String photoPath; + + @Column(name = "PHOTO_NAME") + @ApiParam("照片名称") + private String photoName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSnPhotoRelationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSnPhotoRelationRepository.java new file mode 100644 index 0000000..4d8dd72 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSnPhotoRelationRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesShiftRest; +import cn.estsh.i3plus.pojo.mes.bean.MesSnPhotoRelation; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/18 0018 - 9:18 + */ +@Repository +public interface MesSnPhotoRelationRepository extends BaseRepository { +} From 564ba1e1168e0c44c73ef870e0010924752c6cbe Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 20 Mar 2020 18:46:04 +0800 Subject: [PATCH 18/25] =?UTF-8?q?=E3=80=901472=20=E5=B7=A5=E6=AD=A5-?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81=E9=87=87=E9=9B=86=EF=BC=88?= =?UTF-8?q?=E5=8E=9FPLC=E9=87=87=E9=9B=86=E3=80=90=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E3=80=91=EF=BC=89=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 66 ++++++++++++++++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 +- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 4 ++ .../i3plus/pojo/mes/bean/MesEquipmentTooling.java | 14 +++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 4 ++ .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 ++ .../cn/estsh/i3plus/pojo/mes/bean/MesTooling.java | 52 +++++++++++++++++ .../pojo/mes/bean/MesWorkCellModuleParam.java | 2 +- .../i3plus/pojo/mes/model/QueueOrderModel.java | 25 ++++++++ .../pojo/mes/repository/MesToolingRepository.java | 14 +++++ 11 files changed, 187 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingRepository.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 691da86..e42d084 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 @@ -148,6 +148,72 @@ public class MesEnumUtil { return valueOf(val); } } + + /** + * 排序校验模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TOOLING_ACTION_RECORD_TYPE { + REPLACE(10, "REPLACE", "更换"), + WAREHOUSE(20, "WAREHOUSE", "入库"), + Use(30, "Use", "领用"); + + private int value; + private String code; + private String description; + + TOOLING_ACTION_RECORD_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } /** * JIS发运是否按主队列顺序扫描 */ 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 aa19e20..371e3aa 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 @@ -2482,7 +2482,8 @@ public class MesPcnEnumUtil { FILE("file", "定制内容文件"), IMAGE("image", "图片"), BUTTON("button", "按钮"), - TABLES("tables", "多个表格"); + TABLES("tables", "多个表格"), + DATA("data", "表格"); private String value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 44f3039..06d99fb 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -5150,4 +5150,4 @@ public class WmsEnumUtil { return tmp; } } -} \ No newline at end of file +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java index cb03681..5d5a48c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java @@ -105,4 +105,8 @@ public class MesPlc extends BaseBean implements Serializable { @Transient @ApiParam("设备名称") private String equipmentName; + + @Column(name = "TOOLING_CODE ") + @ApiParam("工装代码") + private String toolingCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java index 2df7f2e..9353299 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -62,6 +63,9 @@ public class MesEquipmentTooling extends BaseBean implements Serializable { @ApiParam("更换结束时间") private String endTime; + @Transient + @ApiParam("最大次数") + private Integer useCountMax; public Integer getToolingType() { return this.toolingType == null ? 0 : this.toolingType; @@ -71,4 +75,14 @@ public class MesEquipmentTooling extends BaseBean implements Serializable { return this.useCount == null ? 0 : this.useCount; } + public MesEquipmentTooling(){ + + } + + public MesEquipmentTooling(MesTooling tooling, Integer useCount) { + this.toolingCode = tooling.getToolingCode(); + this.toolingName = tooling.getToolingName(); + this.useCount = useCount; + this.useCountMax = tooling.getUseCountMax(); + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 6c6aeec..4075384 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -128,4 +128,8 @@ public class MesPlc extends BaseBean implements Serializable { @Transient @ApiParam("OPC值") private List opcValue; + + @Column(name = "TOOLING_CODE ") + @ApiParam("工装代码") + private String toolingCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 04517c5..f8cb85f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -88,6 +88,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("队列序号") private Double queueSeq; + @Column(name = "FINSIH_QTY") + @ApiParam("已生产数量") + private Double finsihQty; + public double getQueueSeqVal() { return this.queueSeq == null ? 0.0d : this.queueSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java new file mode 100644 index 0000000..cf099ca --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.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 :MES工装类型 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TOOLING") +@Api("MES工装类型") +public class MesTooling extends BaseBean implements Serializable { + private static final long serialVersionUID = -5033127912658757665L; + + @Column(name = "TOOLING_CODE ") + @ApiParam("工装代码") + private String toolingCode ; + + @Column(name = "TOOLING_NAME") + @ApiParam("工装名称") + private String toolingName; + + @Column(name = "TOOLING_TYPE") + @ApiParam("工装类型") + private Integer toolingType; + + @Column(name = "USE_COUNT_MAX") + @ApiParam("最大使用次数") + private Integer useCountMax; + + @Column(name = "USE_TIME_MAX") + @ApiParam("最大使用时间") + private String useTimeMax; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java index 535c59a..32e1908 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java @@ -15,7 +15,7 @@ import javax.persistence.Table; import java.io.Serializable; /** - * @Description : + * @Description :工作单元组件参数配置 * @Reference : * @Author :QianHuaSheng * @CreateDate : 2020-03-12 7:45 下午 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 9acf8a7..4e6fc54 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -49,6 +49,14 @@ public class QueueOrderModel implements Serializable { private String workCenterCode; @ApiParam("工位") private String workCellCode; + @ApiParam("队列类型") + private Integer queueType; + + @ApiParam("已生产数量") + private Double finsihQty; + + @ApiParam("包装数量") + private Double qty; public QueueOrderModel() { } @@ -68,6 +76,23 @@ public class QueueOrderModel implements Serializable { } public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType,Double finsihQty,Double qty) { + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.snStatus = snStatus; + this.workType = workType; + this.finsihQty=finsihQty; + this.qty=qty; + } + + public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { this.id = id; this.queueSeq = queueSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingRepository.java new file mode 100644 index 0000000..915b295 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesTooling; + +/** + * @Description :MES工装类型 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-19 + * @Modify: + **/ +public interface MesToolingRepository extends BaseRepository { +} From 2a0204ad991788dda39923b7d3149f55f24f428b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 20 Mar 2020 19:32:50 +0800 Subject: [PATCH 19/25] =?UTF-8?q?=E5=BC=80=E5=8F=91WMS=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=8F=92=E4=BB=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 61 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/plugin/BasPlugin.java | 9 +++- 2 files changed, 69 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 44f3039..309bdcc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -5150,4 +5150,65 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 插件类型 10-PDA插件，20-交易处理插件 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLUGIN_TYPE { + PDA_PLUGIN(10, "PDA_PLUGIN", "PDA插件"), + TRANS_PLUGIN(20, "TRANS_PLUGIN", "交易处理插件"); + + private int value; + private String code; + private String description; + + PLUGIN_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static PLUGIN_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java index 876fd8e..6942fee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java @@ -63,7 +63,7 @@ public class BasPlugin extends BaseBean{ @Column(name = "COPYRIGHT") @ApiParam(value = "版权") - private Integer copyRight; + private String copyRight; @Column(name = "AUTHOR") @ApiParam(value = "作者") @@ -83,4 +83,11 @@ public class BasPlugin extends BaseBean{ @Column(name = "PLUGIN_PACKAGE_NAME") @ApiParam(value = "插件项目包名称") private String pluginPackName; + + /** + * 插件类型 10-PDA功能插件，20-交易处理插件 + */ + @Column(name="PLUGIN_TYPE") + @ApiParam(value = "插件类型", example = "10") + private Integer pluginType; } \ No newline at end of file From ab794aab0baab4c3abc5cbe2f55dcf6053459bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 23 Mar 2020 11:58:04 +0800 Subject: [PATCH 20/25] =?UTF-8?q?=E5=BC=80=E5=8F=91WMS=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=8F=92=E4=BB=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/BasPluginLoggerModel.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasPluginLoggerModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasPluginLoggerModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasPluginLoggerModel.java new file mode 100644 index 0000000..ff7ca90 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasPluginLoggerModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; + +/** + * @Description : 插件日志 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-03-23 11:18 + * @Modify: + **/ +@Data +@AllArgsConstructor +@Api("插件日志") +public class BasPluginLoggerModel { + + @ApiParam("插件名称") + private String pluginName; + + @ApiParam("插件实例类名称") + private String className; + + @ApiParam("插件调用方法名称") + private String methodName; + + @ApiParam("插件日志内容") + private String loggerContext; + + @ApiParam("日志打印日期") + private String printDate; +} From f3b7ae8bc565d48f108a8b24325b6a4d06b55f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 23 Mar 2020 18:57:23 +0800 Subject: [PATCH 21/25] =?UTF-8?q?=E4=BC=98=E5=8C=96WmsPDA=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E5=AE=9E=E4=BD=93=EF=BC=8C=E5=8E=BB=E6=8E=89=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E6=96=87=E4=BB=B6=E5=A4=B9=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java index 6942fee..af83020 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java @@ -76,10 +76,6 @@ public class BasPlugin extends BaseBean{ @ApiParam(value = "插件状态", example = "1") private Integer pluginStatus; - @Column(name = "PLUGIN_DIRECTORY") - @ApiParam(value = "本地插件文件夹") - private String pluginDirectory; - @Column(name = "PLUGIN_PACKAGE_NAME") @ApiParam(value = "插件项目包名称") private String pluginPackName; From f578311f55bb243647d1739c7a48003f3838ef28 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 23 Mar 2020 19:06:52 +0800 Subject: [PATCH 22/25] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=8D=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesPartCheck.java | 59 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/DataReviewStepModel.java | 29 +++++++++++ .../pojo/mes/model/ProductDataCacheModel.java | 24 +++++++++ .../mes/repository/MesPartCheckRepository.java | 14 +++++ 4 files changed, 126 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartCheckRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java new file mode 100644 index 0000000..13e8069 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java @@ -0,0 +1,59 @@ +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 :物料校验项 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_CHECK") +@Api("物料校验项") +public class MesPartCheck extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7706120594398072630L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "CHECK_SPEL_EXPRESS") + @ApiParam("校验表达式") + private String checkSpelExpress; + + @Column(name = "TYPE_SPEL_EXPRESS") + @ApiParam("类型表达式") + private String typeSpelExpress; + + @Column(name = "RECORD_NUM_SPEL_EXPRESS") + @ApiParam("记录数量表达式") + private String recordNumSpelExpress; + + @Column(name = "RECORD_NUM_DESC") + @ApiParam("校验表达式") + private String recordNumDesc; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java new file mode 100644 index 0000000..22a3440 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("数据复核model") +public class DataReviewStepModel { + + @ApiParam("关键件") + private String itemPartNo; + + @ApiParam("需要数量") + private String needNum; + + @ApiParam("实际数量") + private String realNum; + + @ApiParam("对象代码") + private String objectCode; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java new file mode 100644 index 0000000..16d5f94 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("生产数据缓存model") +public class ProductDataCacheModel { + + @ApiParam("对象代码") + private String objectCode; + + @ApiParam("字段名称") + private List productDataModelList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartCheckRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartCheckRepository.java new file mode 100644 index 0000000..ca12e5b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartCheckRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartCheck; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesPartCheckRepository extends BaseRepository { +} From 045dc01479509e76b0ce8ee0a8156c6f752427a4 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 23 Mar 2020 23:24:50 +0800 Subject: [PATCH 23/25] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1479=20?= =?UTF-8?q?=E6=96=99=E6=9E=B6=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java | 4 + .../estsh/i3plus/pojo/mes/bean/MesProductData.java | 3 +- .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 6 +- .../estsh/i3plus/pojo/mes/model/EsProductData.java | 87 ++++++++++++++++++++++ .../pojo/mes/model/QueueJitActualModule.java | 37 +++++++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 18 +++++ .../i3plus/pojo/mes/model/StepPrintSnModel.java | 20 +++++ 8 files changed, 173 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 6c6aeec..6a49f5e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -127,5 +127,5 @@ public class MesPlc extends BaseBean implements Serializable { @Transient @ApiParam("OPC值") - private List opcValue; + private String opcValue; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java index 34389f0..6a40ee7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java @@ -42,4 +42,8 @@ public class MesProdCfg extends BaseBean implements Serializable { @Column(name = "PROD_CFG_Type_CODE") @ApiParam("产品配置类型代码") private String prodCfgTypeCode; + + @Column(name = "PROD_CFG_TYPE") + @ApiParam("产品配置类型") + private String prodCfgType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 8590fbb..cd951ae 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; -import java.util.List; /** * @Description :生产数据 @@ -113,7 +112,7 @@ public class MesProductData extends BaseBean implements Serializable { @Lob @Column(name = "LINE_DATA") @ApiParam("生产数据") - private List lineData; + private String lineData; @Lob @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 04517c5..5d43571 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -76,7 +76,7 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品类型名称") private String pptCode; - @Column(name = "QUEUE_GROUP_NO") + @Column(name = "QUEUE_GROUP_NO") @ApiParam("分组队列编号") private String queueGroupNo; @@ -84,6 +84,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("组内编号") private Integer groupNo; + @Column(name = "IS_GROUP_PRINTED") + @ApiParam("料架是否已打印") + private Integer isGroupPrinted; + @Transient @ApiParam("队列序号") private Double queueSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java new file mode 100644 index 0000000..eaba2fa --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java @@ -0,0 +1,87 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch; +import cn.estsh.i3plus.pojo.mes.annotation.Json4Es; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/3/20 5:51 下午 + * @Modify: + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@ElasticSearch +public class EsProductData extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4514407617515827040L; + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工作中心名称") + private String workCenterName; + + @ApiParam("工作单元") + private String workCellCode; + + @ApiParam("工作单元名称") + private String workCellName; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("产品条码") + private String productSn; + + @ApiParam("工单号") + private String orderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partDesc; + + @ApiParam("设备代码") + private String equCode; + + @ApiParam("设备名称") + private String equName; + + @ApiParam("对象代码") + private String objectCode; + + @ApiParam("对象名称") + private String objectName; + + @ApiParam("字段代码") + private String fieldCode; + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("字段值") + private String fieldValue; + + @ApiParam("数据行号") + private String rowNo; + + @ApiParam("数据组号") + private String groupNo; + + @Json4Es + @ApiParam("生产数据") + private String lineData; + + @ApiParam("字段总数") + private Integer fieldNum; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java new file mode 100644 index 0000000..5ae7b20 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/3/20 9:02 下午 + * @Modify: + */ +@Data +public class QueueJitActualModule { + + private Long id; + @ApiParam("vin") + private String vinCode; + @ApiParam("排序号") + private Double seq; + @ApiParam("分组队列编号") + private String queueGroupNo; + @ApiParam("组内编号") + private Integer groupNo; + + public QueueJitActualModule() { + + } + + public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo) { + this.id = id; + this.vinCode = vinCode; + this.seq = seq; + this.queueGroupNo = queueGroupNo; + this.groupNo = groupNo; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 9acf8a7..fc9173f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -50,6 +50,15 @@ public class QueueOrderModel implements Serializable { @ApiParam("工位") private String workCellCode; + @ApiParam("生产组代码") + private String pgCode; + @ApiParam("分组队列编号") + private String queueGroupNo; + @ApiParam("组内编号") + private Integer groupNo; + @ApiParam("产品配置代码") + private String prodCfgCode; + public QueueOrderModel() { } @@ -81,4 +90,13 @@ public class QueueOrderModel implements Serializable { this.snStatus = snStatus; this.workType = workType; } + + public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode) { + this.id = id; + this.queDetailSeq = queDetailSeq; + this.pgCode = pgCode; + this.queueGroupNo = queueGroupNo; + this.groupNo = groupNo; + this.prodCfgCode = prodCfgCode; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 2004603..91cd118 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -72,4 +72,24 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") private Integer packLevel; + @ApiParam("生产组代码") + private String pgCode; + @ApiParam("分组队列编号") + private String queueGroupNo; + @ApiParam("组内编号") + private Integer groupNo; + @ApiParam("产品配置代码") + private String prodCfgCode; + @ApiParam("队列生产明细序号") + private Double queDetailSeq; + + @ApiParam("vin") + private String vinCode; + @ApiParam("客户JIT生产队列排序号") + private Double seq; + @ApiParam("jit车号") + private String jitCarNo; + @ApiParam("车型代码") + private String carModuleCode; + } From 9d55a2a8b357dba777abcd6ccb1c57cc4bdbf837 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 23 Mar 2020 23:49:15 +0800 Subject: [PATCH 24/25] =?UTF-8?q?[=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=811]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 6a49f5e..b71bdbd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -128,4 +128,8 @@ public class MesPlc extends BaseBean implements Serializable { @Transient @ApiParam("OPC值") private String opcValue; + + @Column(name = "TOOLING_CODE ") + @ApiParam("工装代码") + private String toolingCode; } From f2c41fc0a6c6e99700258e708fa2a146f7a24c35 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 24 Mar 2020 20:07:29 +0800 Subject: [PATCH 25/25] =?UTF-8?q?bug7800=E3=80=907800=20=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=87=BA=E6=97=B6=E6=8A=A5=E9=94=99=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=A4=B1=E8=B4=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index ce7e75b..c86fb74 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -139,6 +139,15 @@ public class WmsEnumUtil { } return tmp; } + 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; + } } @@ -2977,6 +2986,15 @@ public class WmsEnumUtil { } return tmp; } + 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; + } } /**