diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index 18d4ace..26e9d6c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -8,10 +8,10 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; +import javax.persistence.Lob; import javax.persistence.MappedSuperclass; import javax.persistence.Transient; import java.util.HashMap; -import java.util.Map; /** * @Description :APS基类 @@ -26,7 +26,9 @@ import java.util.Map; @ExcludeImportExport public abstract class BaseAPS extends BaseBean { @JsonIgnore - private transient Map customFields = new HashMap<>(); + @Lob + @FieldAnnotation(property = false) + private HashMap customFields = new HashMap<>(); @Column(name="KEY") @ApiParam(value ="主键值") diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java new file mode 100644 index 0000000..2e2b0a2 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.base.annotation; + +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; + +import java.lang.annotation.*; + +/** + * 字段类型属性注解 + */ +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +public @interface FieldAnnotation { + // Web前端字段数据类型 + WmsEnumUtil.FIELD_TYPE webFieldType(); + // 条件表达式:>,<,>=等 + String conditionExpre() default "="; + // 条件连接符:and/or + String conditionConnector() default "and"; + // 排序序号 + int seq() default 0; + // 字段列宽度 + double width() default 0d; + // 排序规则:默认0-不排序，1-升序2-降序 + int sort() default 0; + // 是否标题字段加粗 是否加粗:默认1-加粗，2-非加粗 + int isWider() default 2; + // 是否勾选:默认1-勾选，2-非勾选 + int isSelect() default 1; + // 是否必选:默认1-必选，2-非必选 + int isRequire() default 1; + // 是否表单字段展示:默认1-显示，2-隐藏 + int isShow() default 1; +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index f2ef95b..9c10c6c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -39,6 +41,7 @@ public abstract class BaseBean implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) public Long id; //get单独处理 @@ -61,16 +64,19 @@ public abstract class BaseBean implements Serializable { @Column(name="ORGANIZE_CODE") @ApiParam(value ="组织代码") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) // @AnnoOutputColumn(hidden = true) public String organizeCode; @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) @ApiParam(value = "有效性",example = "1") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) @ApiParam(value = "是否已删除",example = "2") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @AnnoOutputColumn(hidden = true) //逻辑删除，软删除 public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA @@ -83,15 +89,18 @@ public abstract class BaseBean implements Serializable { @Indexed(direction = IndexDirection.DESCENDING) @Column(name="CREATE_DATE_TIME",updatable = false) @ApiParam(value = "创建日期") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) public String createDatetime; @Column(name="MODIFY_USER") @ApiParam(value = "修改人") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) public String modifyUser; @Column(name="MODIFY_DATE_TIME") @ApiParam(value = "修改日期") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) public String modifyDatetime; @Transient @@ -126,6 +135,7 @@ public abstract class BaseBean implements Serializable { @Transient @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc public transient Integer ascOrDesc = 1; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index bc924e2..873e21d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -1259,6 +1259,15 @@ public class CommonEnumUtil { return tmp; } + public static LOG_DETAIL_SHOW_TYPE valueOfEnum(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 13b076e..f8581ff 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1190,4 +1190,47 @@ public class ImppEnumUtil { return tmp; } } + + /** + * 日志存储 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOG_STORAGE { + MONGO(1, "MongoDB"), + ELASTICSEARCH(2, "Elasticsearch"); + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private LOG_STORAGE(int value, String description) { + this.value = value; + this.description = description; + } + + 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 LOG_STORAGE valueOfEnum(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } } 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 0bb09ea..2a7e925 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 @@ -48,17 +48,17 @@ public class MesEnumUtil { } /** - * JIS发运产品组扫描顺序类型 + * JIS发运是否按主队列顺序扫描 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_JIS_SCAN_SEQ_TYPE { - ONE_PROD(10, "整发"), - MANY_PROD(20, "单发"); + public enum MES_JIS_SCAN_TYPE { + TRUE(10, "是"), + FALSE(20, "否"); private int value; private String description; - MES_JIS_SCAN_SEQ_TYPE(int value, String description) { + MES_JIS_SCAN_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -187,15 +187,6 @@ public class MesEnumUtil { return tmp; } - public static String valueOfDescription2(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; - } - } - return tmp; - } } @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -2620,6 +2611,7 @@ public class MesEnumUtil { PUBLIC(10, "公用"), JIT(20, "JIT生产"), WORK_ORDER(30, "工单生产"), + JIS(40, "JIS发运"), OTHER(99, "其他"); private int value; @@ -2888,8 +2880,7 @@ public class MesEnumUtil { STANDARD_ORDER(10, "标准工单"), BTS_ORDER(20, "BTS工单"), ATTEMPT_ORDER(30, "试制工单"), - BH_ORDER(40, "B&H工单"), - JIT_ORDER(50, "JIT工单"); + BH_ORDER(40, "B&H工单"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index d6154b5..5c3308e 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 @@ -13,6 +13,112 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * JIS发运模式类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_JIS_PATTERN_TYPE { + ONE_PROD(10, "单产品发运"), + MANY_PROD(20, "多产品发运"); + + private int value; + private String description; + + MES_JIS_PATTERN_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; + } + } + + /** + * JIS发运是否按主队列顺序扫描 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_JIS_SCAN_TYPE { + TRUE(10, "是"), + FALSE(20, "否"); + + private int value; + private String description; + + MES_JIS_SCAN_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; + } + } + + /** + * JIS发运队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QUEUE_JIS_STATUS { + + TRUE(10, "已发运"), + FALSE(20, "未发运"); + + private int value; + private String description; + + MES_QUEUE_JIS_STATUS(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; + } + } + + /** * MesMethod实体对应的methodType值 * 10. */ @@ -132,7 +238,9 @@ public class MesPcnEnumUtil { PCN_MODULE(180, "PCN_MODULE", ""), PCN_LOGOUT(190, "PCN_LOGOUT", ""), UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"), - PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""); + PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""), + PCN_SYS_ALL_LANGUAGE(220,"PCN_SYS_ALL_LANGUAGE","PCN_SYS_ALL_LANGUAGE"), + PCN_SYS_RESOURCE_KEY_LANGUAGE(230,"PCN_SYS_RESOURCE_KEY_LANGUAGE","PCN_SYS_RESOURCE_KEY_LANGUAGE"); private int value; private String code; 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 665cbcb..e618c9d 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 @@ -4792,5 +4792,76 @@ public class WmsEnumUtil { } } + /** + * WEB页面字段类型 + * 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FIELD_TYPE { + TEXT(10, "text"), NUMBER(20, "number"), + SELECT(30, "select"), DATETIME(40, "datetime"), + LIST(50, "list"); + + private int value; + private String description; + + FIELD_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; + } + } + + /** + * 推送类型 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PUSH_TYPE { + EMAIL(10, "邮件"), SMS(20, "短信"); + + private int value; + private String description; + + PUSH_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; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java index 95bfee7..6a7a274 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java @@ -33,58 +33,4 @@ public class StringUtil { } return fieldNames; } - - /** - * 获取对象所有属性名 - * @param clazz - * @return - */ - public static List getFieldList(Class clazz) { - Field[] fields = clazz.getDeclaredFields(); - Field[] superFields = clazz.getSuperclass().getDeclaredFields(); - List fieldNames = new ArrayList<>(); - for(int i = 0;i < fields.length; i++){ - fieldNames.add(fields[i].getName()); - } - for(int i = 0;i < superFields.length; i++){ - fieldNames.add(superFields[i].getName()); - } - return fieldNames; - } - - /** - * 根据属性名和对象获取属性对应的值 - * @param fieldName - * @param o - * @return - */ - public static Object getFieldValueByName(String fieldName, Object o) { - try { - String firstLetter = fieldName.substring(0, 1).toUpperCase(); - String getter = "get" + firstLetter + fieldName.substring(1); - Method method = o.getClass().getMethod(getter, new Class[] {}); - Object value = method.invoke(o, new Object[] {}); - return value; - } catch (Exception e) { - return null; - } - } - - private static Pattern linePattern = Pattern.compile("_(\\w)"); - - /** 驼峰转下划线 */ - public static Map humpToLine(Map map) { - Map resultMap = new HashMap<>(); - for (String str : map.keySet()) { - str = str.toLowerCase(); - Matcher matcher = linePattern.matcher(str); - StringBuffer sb = new StringBuffer(); - while (matcher.find()) { - matcher.appendReplacement(sb, matcher.group(1).toUpperCase()); - } - matcher.appendTail(sb); - resultMap.put(sb.toString(), map.get(str)); - } - return resultMap; - } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java index 1859025..78b1e77 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java @@ -69,9 +69,9 @@ public class MesPart extends BaseBean { @ApiParam("默认工作中心") private String defaultWorkCenter; - @Column(name = "PRODUCE_CATEGORY") - @ApiParam("产品类型") - private String produceCategory; + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; @Column(name = "PROCESS_MATCH_TYPE") @ApiParam("过程编码匹配类型") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java new file mode 100644 index 0000000..09b331d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java @@ -0,0 +1,64 @@ +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; + +/** + * @Description :JIS发运模式 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PATTERN_JIS") +@Api("JIS发运模式") +public class MesPatternJis extends BaseBean { + + @Column(name = "PATTERN_NO") + @ApiParam("模式编号") + private String patternNo; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式名称") + private String patternName; + + @Column(name = "RULE") + @ApiParam("规则") + private String rule; + + @Column(name = "PATTERN_DESC") + @ApiParam("描述") + private String patternDesc; + + @Column(name = "TOP_NO") + @ApiParam("一次显示TOP数") + private Integer topNo; + + @Column(name = "HANDLE_NO") + @ApiParam("一次处理套数") + private Integer handleNo; + + @Column(name = "PATTERN_TYPE") + @ApiParam("模式类型") + private Integer patternType; + + @Column(name = "SCAN_TYPE") + @ApiParam("是否按主队列顺序扫描") + private Integer scanType; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java new file mode 100644 index 0000000..cbb3f3d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java @@ -0,0 +1,51 @@ +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 javax.persistence.Transient; + +/** + * @Description :产品配置明细 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_CFG_DETAIL") +@Api("产品配置明细") +public class MesProdCfgDetail extends BaseBean { + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "IS_VIRTUAL") + @ApiParam("是否虚零件") + private Integer isVirtual; + + @Transient + @ApiParam("零件名称") + private String partName; + + public int getIsVirtualVal() { + return this.isVirtual == null ? 0 : this.isVirtual; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java new file mode 100644 index 0000000..131674e --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java @@ -0,0 +1,38 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-26-10:25 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_CATEGORY") +@Api("系统业务动作") +public class MesProduceCategory extends BaseBean { + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @Column(name = "PRODUCE_CTGY_NAME") + @ApiParam("产品类型名称") + private String produceCategoryName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java index 532ec2a..5bd3895 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java @@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description :生产数据 @@ -102,4 +99,9 @@ public class MesProductData extends BaseBean { @ApiParam("数据组号") private String groupNo; + @Lob + @Column(name = "TEST_DATA") + @ApiParam("测试json数据") + private String testData; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java new file mode 100644 index 0000000..b833dfc --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java @@ -0,0 +1,64 @@ +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; + +/** + * @Description :JIS发运队列 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIS") +@Api("JIS发运队列") +public class MesQueueJis extends BaseBean { + + @Column(name = "JIS_NO") + @ApiParam("主队列编号") + private String jisNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CAR_NO") + @ApiParam("车号") + private String carNo; + + @Column(name = "SEQ") + @ApiParam("排序") + private Double seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java new file mode 100644 index 0000000..e8243ed --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java @@ -0,0 +1,56 @@ +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; + +/** + * @Description :JIS发运队列明细 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIS_DETAIL") +@Api("JIS发运队列明细") +public class MesQueueJisDetail extends BaseBean { + + @Column(name = "JIS_NO") + @ApiParam("主队列编号") + private String jisNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java new file mode 100644 index 0000000..7a32f8b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class QueueJisModel implements Serializable { + + @ApiParam("主队列编号") + private String jisNo; + + @ApiParam("vin") + private String vinCode; + + @ApiParam("车号") + private String carNo; + + @ApiParam("排序") + private Double seq; + + @ApiParam("状态") + private Integer status; + + @ApiParam("产品配置代码") + private String prodCfgCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @ApiParam("明细状态") + private Integer detailStatus; + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("状态名称") + private String statusName; + + @ApiParam("明细状态名称") + private String detailStatusName; + + public String getStatusName() { + return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.status); + } + + public String getDetailStatusName() { + return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.detailStatus); + } + + public QueueJisModel() { + } + + public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber) { + this.jisNo = jisNo; + this.vinCode = vinCode; + this.carNo = carNo; + this.seq = seq; + this.status = status; + this.prodCfgCode = prodCfgCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.produceCategoryCode = produceCategoryCode; + this.detailStatus = detailStatus; + this.serialNumber = serialNumber; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java index b7f831b..a3f4547 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java @@ -17,6 +17,7 @@ import java.io.Serializable; @Data @Api("JIT队列列表Model") public class QueueOrderModel implements Serializable { + private Long id; @ApiParam("队列序号") public Double queueSeq; @ApiParam("队列明细序号") @@ -52,8 +53,9 @@ public class QueueOrderModel implements Serializable { public QueueOrderModel() { } - public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + 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; this.queDetailSeq = queDetailSeq; this.custFlagNo = custFlagNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java new file mode 100644 index 0000000..87029c6 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPatternJis; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesPatternJisRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java new file mode 100644 index 0000000..c93700b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdCfgDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdCfgDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java new file mode 100644 index 0000000..50602d5 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceCategory; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-26-10:28 + * @Modify: + **/ +@Repository +public interface MesProduceCategoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java new file mode 100644 index 0000000..bd19fef --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueJisDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesQueueJisDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java new file mode 100644 index 0000000..8a08948 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueJis; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesQueueJisRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/ElasticSearch.java similarity index 87% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/ElasticSearch.java index e4d90a6..93e0ba9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/ElasticSearch.java @@ -11,5 +11,5 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) @Documented -public @interface UseMongoDb { +public @interface ElasticSearch { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java new file mode 100644 index 0000000..3921f97 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.annotation; + + +import java.lang.annotation.*; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/25 1:45 下午 + * @Description: + **/ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@Documented +public @interface Json4Es { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index 20a1b79..e358ca6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -37,7 +37,7 @@ public class MesPackageDetail extends BaseBean { private String serialNumber; @Column(name = "PART_NO") - @ApiParam("产品条码") + @ApiParam("物料号") private String partNo; @Column(name = "PART_NAME_RDD") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java similarity index 80% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index f3c9f89..b7a7b64 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -25,9 +26,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_JIS_PATTERN") +@Table(name = "MES_PATTERN_JIS") @Api("JIS发运模式") -public class MesJisPattern extends BaseBean { +public class MesPatternJis extends BaseBean { @Column(name = "PATTERN_NO") @ApiParam("模式编号") @@ -37,13 +38,14 @@ public class MesJisPattern extends BaseBean { @ApiParam("模式名称") private String patternName; + @Lob @Column(name = "RULE") @ApiParam("规则") private String rule; - @Column(name = "DESC") + @Column(name = "PATTERN_DESC") @ApiParam("描述") - private String desc; + private String patternDesc; @Column(name = "TOP_NO") @ApiParam("一次显示TOP数") @@ -57,8 +59,8 @@ public class MesJisPattern extends BaseBean { @ApiParam("模式类型") private Integer patternType; - @Column(name = "SCAN_SEQ_TYPE") - @ApiParam("产品组扫描顺序类型") - private Integer scanSeqType; + @Column(name = "SCAN_TYPE") + @ApiParam("是否按主队列顺序扫描") + private Integer scanType; } 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 602bb21..fc86e50 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 @@ -2,7 +2,8 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.mes.annotation.UseMongoDb; +import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch; +import cn.estsh.i3plus.pojo.mes.annotation.Json4Es; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -10,11 +11,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description :生产数据 @@ -34,7 +31,7 @@ import javax.persistence.Transient; @Index(columnList = "OBJECT_CODE"), @Index(columnList = "MODIFY_DATE_TIME") }) -//@UseMongoDb +@ElasticSearch @Api("生产数据") public class MesProductData extends BaseBean { @Column(name = "WORK_CENTER_CODE") @@ -109,6 +106,12 @@ public class MesProductData extends BaseBean { @ApiParam("数据组号") private String groupNo; + @Json4Es + @Column(name = "TEST_DATA") + @ApiParam("测试json数据") + private String testData; + + @Lob @Transient @ApiParam("字段总数") private Integer fieldNum; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java index 6f65fce..87f6946 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java @@ -53,4 +53,12 @@ public class MesQueueJis extends BaseBean { @ApiParam("状态") private Integer status; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java index a67a223..d3ab791 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java @@ -23,8 +23,8 @@ public class MesButtonFlagModel implements Serializable { @ApiParam("修改按钮") private boolean updateButton; -// @ApiParam("按配置修改按钮") -// private boolean updateButtonConfig; + @ApiParam("按配置修改按钮") + private boolean updateButtonConfig; @ApiParam("下达按钮") private boolean transmitButton; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java deleted file mode 100644 index be4145b..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java +++ /dev/null @@ -1,100 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class QueueJisModel implements Serializable { - @ApiParam("id") - private Long id; - - @ApiParam("作业任务编号") - private String taskNo; - - @ApiParam("作业类型") - private Integer taskType; - - @ApiParam("作业状态") - private Integer taskStatus; - - @ApiParam(value="生产线") - private String workCenterCode; - - @ApiParam("计划日期") - private String planTime; - - @ApiParam("任务来源") - private Integer taskSource; - - @ApiParam("备注") - private String memo; - - @ApiParam("通知标识") - private Integer notifyFlag; - - @ApiParam("关联任务") - private String relateTask; - - @ApiParam("组织代码") - public String organizeCode; - - @ApiParam("有效性") - public Integer isValid; - - @ApiParam("是否已删除") - public Integer isDeleted; - - @ApiParam("创建用户") - public String createUser; - - @ApiParam("创建日期") - public String createDatetime; - - @ApiParam("修改人") - public String modifyUser; - - @ApiParam("修改日期") - public String modifyDatetime; - - @ApiParam("作业类型") - private String taskTypeName; - - @ApiParam("作业状态") - private String taskStatusName; - - @ApiParam("任务来源") - private String taskSourceName; - - @ApiParam("通知标识") - private String notifyFlagName; - - @ApiParam("mes设备作业任务页面按钮控制") - private MesButtonFlagModel mesButtonFlagModel; - - - public QueueJisModel() { - - } - - public QueueJisModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { - this.id = id; - this.taskNo = taskNo; - this.taskType = taskType; - this.taskStatus = taskStatus; - this.workCenterCode = workCenterCode; - this.planTime = planTime; - this.taskSource = taskSource; - this.memo = memo; - this.notifyFlag = notifyFlag; - this.relateTask = relateTask; - this.organizeCode = organizeCode; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.createUser = createUser; - this.createDatetime = createDatetime; - this.modifyUser = modifyUser; - this.modifyDatetime = modifyDatetime; - } -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPatternJisRepository.java similarity index 66% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPatternJisRepository.java index 11e0ba0..59da062 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPatternJisRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesJisPattern; +import cn.estsh.i3plus.pojo.mes.bean.MesPatternJis; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesJisPatternRepository extends BaseRepository { +public interface MesPatternJisRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 5fa2569..93083c2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -1388,7 +1388,7 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean); } - if (null == mesQcCheckStandard.getCheckType()) { + if (mesQcCheckStandard.getCheckType() != null) { DdlPreparedPack.getNumberBiggerEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean); } if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItem())) { @@ -1483,7 +1483,7 @@ public class MesHqlPack { public static DdlPackBean getMesTypeCfg(MesTypeCfg mesTypeCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesTypeCfg, organizeCode); if (!StringUtils.isEmpty(mesTypeCfg.getTypeCode())) { - DdlPreparedPack.getStringLikerPack(mesTypeCfg.getTypeCode(), "typeCode", packBean); + DdlPreparedPack.getStringEqualPack(mesTypeCfg.getTypeCode(), "typeCode", packBean); } if (!StringUtils.isEmpty(mesTypeCfg.getBusinessTypeCode())) { DdlPreparedPack.getStringLikerPack(mesTypeCfg.getBusinessTypeCode(), "businessTypeCode", packBean); @@ -2100,26 +2100,23 @@ public class MesHqlPack { /** * JIS发运模式 - * @param jisPattern + * @param patternJis * @param organizeCode * @return */ - public static DdlPackBean getJisPatternCondition(MesJisPattern jisPattern, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(jisPattern, organizeCode); - if (!StringUtils.isEmpty(jisPattern.getPatternNo())) { - DdlPreparedPack.getStringLikerPack(jisPattern.getPatternNo(), "patternNo", packBean); + public static DdlPackBean getPatternJisCondition(MesPatternJis patternJis, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(patternJis, organizeCode); + if (!StringUtils.isEmpty(patternJis.getPatternNo())) { + DdlPreparedPack.getStringLikerPack(patternJis.getPatternNo(), "patternNo", packBean); } - if (!StringUtils.isEmpty(jisPattern.getTopNo())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getTopNo(), "topNo", packBean); + if (!StringUtils.isEmpty(patternJis.getTopNo())) { + DdlPreparedPack.getNumEqualPack(patternJis.getTopNo(), "topNo", packBean); } - if (!StringUtils.isEmpty(jisPattern.getHandleNo())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getHandleNo(), "handleNo", packBean); + if (!StringUtils.isEmpty(patternJis.getHandleNo())) { + DdlPreparedPack.getNumEqualPack(patternJis.getHandleNo(), "handleNo", packBean); } - if (!StringUtils.isEmpty(jisPattern.getPatternType())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean); - } - if (!StringUtils.isEmpty(jisPattern.getScanSeqType())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getScanSeqType(), "scanSeqType", packBean); + if (!StringUtils.isEmpty(patternJis.getPatternType())) { + DdlPreparedPack.getNumEqualPack(patternJis.getPatternType(), "patternType", packBean); } return packBean; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java new file mode 100644 index 0000000..ecbf355 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : Wms实体字段Model信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-01-08 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class WmsFieldInfoModel implements Serializable { + + private static final long serialVersionUID = -6376845639646427495L; + + @ApiParam(value = "字段信息列表") + public List wmsFieldInfoList; + + @ApiParam(value = "新增数据操作类") + private String baseRepository; + + public WmsFieldInfoModel (String baseRepository, List wmsFieldInfoList) { + this.baseRepository = baseRepository; + this.wmsFieldInfoList = wmsFieldInfoList; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java index b84e932..6bfdd58 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java @@ -19,4 +19,9 @@ public class WmsJobParamModel implements Serializable { private List zonesNoList;//存储区编号 private Integer snType;//条码类型（虚拟，实物） private String devOpsEmail;//运维人员邮箱 + private Integer minuteDiff;//处理周期(分钟) + + public int getMinuteDiffVal() { + return this.minuteDiff == null ? 0 : this.minuteDiff.intValue(); + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java new file mode 100644 index 0000000..0a11f26 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElement; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : WMS列表菜单model + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 14:33 + * @Modify: + **/ +@Data +@Api("WMS列表菜单model") +public class WmsListElementModel extends BaseBean { + + @ApiParam(value = "功能菜单ID") + private Long functionId; + + @ApiParam(value = "用户编号") + private String userCode; + + @ApiParam(value = "是否默认配置") + private Integer isDefault; + + List wmsListElementList; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java new file mode 100644 index 0000000..0056ba7 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : WMS列表搜索model + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 14:33 + * @Modify: + **/ +@Data +@Api("WMS列表搜索model") +public class WmsSearchElementModel extends BaseBean { + + @ApiParam(value = "功能菜单ID") + private Long functionId; + + @ApiParam(value = "组名称") + private String groupName; + + @ApiParam(value = "组条件连接符") + private String groupConnector; + + @ApiParam(value = "用户编号") + private String userCode; + + @ApiParam(value = "是否共享") + private Integer isShare; + + @ApiParam(value = "Wms查询元素列表") + private List searchElementList; +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java index fa78d8b..20d9181 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java @@ -77,6 +77,14 @@ public class BrPojoFilterAttr extends BaseBean { @ApiParam(value ="属性显示名称") private String attrName; + @Column(name = "VIEW_ATTR_CONTROL_TYPE") + @ApiParam(value = "控件类型") + private Integer viewAttrControlType; + + @Column(name = "VIEW_ATTR_CONTROL_REF_KEY") + @ApiParam(value = "控件引用RefKey") + private String viewAttrControlRefKey; + @Column(name="ATTR_SHOW") @ApiParam(value ="属性是否显示") private Integer attrShow; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 9d502de..41e57d1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -75,6 +75,12 @@ public class WmsActionGroup extends BaseBean { @AnnoOutputColumn private Integer isCommitRefMove; + // 1=true, 2 = false + @Column(name = "IS_AUTO_COMMIT", nullable = false) + @ApiParam(value = "是否自动提交", example = "1") + @AnnoOutputColumn + private Integer isAutoCommit; + @Lob @Column(name = "POSITION") @ApiParam(value = "GOJS位置") @@ -96,6 +102,14 @@ public class WmsActionGroup extends BaseBean { return this.endAmId == null ? 0 : this.endAmId.longValue(); } + public int getIsCommitRefMoveVal() { + return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue(); + } + + public int getIsAutoCommitVal() { + return this.isAutoCommit == null ? 0 : this.isAutoCommit.intValue(); + } + public int getAutoInitVal() { return this.autoInit == null ? 0 : this.autoInit.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java new file mode 100644 index 0000000..9038989 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.wms.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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : WMS数据迁移配置表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-08 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_DATA_MIGRATION_CONFIG") +@Api("WMS数据迁移配置表") +public class WmsDataMigrationConfig extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592777L; + + @Column(name="MIG_NAME") + @ApiParam("名称") + private String migName; + + @Column(name="REMARK") + @ApiParam("描述") + private String remark; + + @Column(name="MIGRATION_CYCLE") + @ApiParam("迁移周期") + private String migrationCycle; + + @Column(name="LAST_EXECUTION_TIME") + @ApiParam("末次迁移时间") + private String lastExecutionTime; + + @Column(name="LAST_MRGRATION_QTY") + @ApiParam(value = "末次迁移记录数", example = "0") + private Integer LastmMigrationQty; + + @Column(name="NEXT_EXECUTION_TIME") + @ApiParam("下次执行时间") + private String nextExecutionTime; + + @Column(name="SRC_TABLE_NAME") + @ApiParam("来源表名") + private String srcTableName; + + @Column(name="SRC_QUERY_CONDITIONS") + @ApiParam("来源表查询条件") + private String srcQueryConditions; + + @Column(name="PROCESS_QTY") + @ApiParam(value = "每次处理行数", example = "0") + private Integer processQty; + + @Column(name="DEST_TABLE_NAME") + @ApiParam("目标表名") + private String destTableName; + + @Column(name="IS_PHYSICAL_DELETE") + @ApiParam(value = "是否物理删除", example = "0") + private Integer isPhysicalDelete; + + @Column(name="ERROR_MESSAGE") + @ApiParam("执行错误日志") + private String errorMessage; + + @Transient + @ApiParam(value ="开始时间") + private String mcStartTime; + + @Transient + @ApiParam(value ="结束时间") + private String mcEndTime; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index f3c25d0..d812406 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -118,8 +118,4 @@ public class WmsDocMovementSn extends BaseBean { @Transient @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer itemStatus; - - @Transient - @ApiParam("打印模板名称") - private String templateName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 335aac9..a4405ea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -156,6 +157,10 @@ public class WmsMoveMaster extends BaseBean { @Transient private Integer isSnapshot; + @Transient + @ApiParam("总行数") + private Integer itemQty; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") @@ -220,6 +225,12 @@ public class WmsMoveMaster extends BaseBean { this.modifyDatetime = modifyDatetime; } + public WmsMoveMaster(Integer itemQty , String transTypeCode , Integer itemStatus){ + this.itemQty = itemQty; + this.transTypeCode = transTypeCode; + this.itemStatus = itemStatus; + } + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 0f31d20..748e194 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; @@ -34,154 +35,191 @@ public class WmsPart extends BaseBean { private static final long serialVersionUID = 4849044986767609346L; @Column(name = "PART_NO") @ApiParam(value = "物料编码") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME") @ApiParam(value = "物料名称") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partName; @Column(name = "PART_SPEC") @ApiParam(value = "物料规格") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partSpec; @Column(name = "PART_TYPE") @ApiParam(value = "物料类型") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description") private String partType; @Column(name = "PART_TYPE_DESC") @ApiParam(value = "物料类型描述") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partTypeDesc; @Column(name = "GRAPHI_NO") @ApiParam(value = "图号") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String graphiNo; @Column(name = "VERSION") @ApiParam(value = "版本") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String version; @Column(name = "COLOR") @ApiParam(value = "颜色") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String color; @Column(name = "STOCK_UNIT") @ApiParam(value = "库存单位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String stockUnit; @Column(name = "ABC") @ApiParam(value = "分类") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String abc; @Column(name = "BUY_UNIT") @ApiParam(value = "采购单位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String buyUnit; @Column(name = "BU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率1", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double bu2su; @Column(name = "PRICE_UNIT") @ApiParam(value = "计价单位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String priceUnit; @Column(name = "PU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率2", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double pu2su; @Column(name = "SNP", columnDefinition = "decimal(18,8)") @ApiParam(value = "标包", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double snp; @ColumnDefault("2") @Column(name = "IQC") @ApiParam(value = "是否免检", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) private Integer iqc; @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最低库存", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double min; @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最高库存", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double max; @Column(name = "PART_GROUP") @ApiParam(value = "物料组") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partGroup; @Column(name = "LOT_CHECK_RULE") @ApiParam(value = "批次校验规则") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String lotCheckRule; @Column(name = "SN_CONTROL") @ApiParam(value = "是否条码管理", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) private Integer snControl; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商代码") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String vendorNo; @Column(name = "IN_LOCATE_NO") @ApiParam(value = "默认入库库位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String inLocateNo; @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String prodCfgTypeCode; @Column(name = "PROD_CFG_TYPE_NAME") @ApiParam("项目名称") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String prodCfgTypeName; @Column(name = "OUT_CLOSE_FLAG") @ApiParam("項目结算标识") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String outCloseFlag = "2"; @Column(name = "OUT_CLOSE_TYPE") @ApiParam("结算方式") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String outCloseType; @Column(name = "OUT_CLOSE_VENDOR") @ApiParam("结算供应商") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String outCloseVendor; @Column(name = "QUALITY_DAYS") @ApiParam("保质期天数") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer qualityDays; @Column(name = "IS_REPORT_PARTNO") @ApiParam("是否报工零件") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) private Integer isReportPartNo; @Column(name = "REPORT_LOCATE_NO") @ApiParam("报工库位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String reportLocateNo; @Column(name = "REPORT_ZONE_NO") @ApiParam("报工存储区") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String reportZoneNo; @Column(name = "PRODUCT_LINES") @ApiParam("报工产线") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String productLines; @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)") @ApiParam(value = "待质检比例", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double proportion; @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") private Integer isValuable; @Transient @ApiParam("总数量") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double qty; @Transient @ApiParam("库存水平") @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String stockLevelStatus; @Column(name="verb_num") @@ -189,19 +227,23 @@ public class WmsPart extends BaseBean { private Double verbNum; @Column(name = "IS_PROD_LOT") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2; @Column(name = "PULL_WAY") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @ApiParam(value = "拉动方式", example = "0") private Integer pullWay = 0; @Column(name = "CYCLE_RQUEST_PERIOD") @ApiParam(value = "循环补货周期", example = "0") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer cycleRquestPeriod = 0; @Column(name = "CYCLE_RQUEST_QTY") @ApiParam(value = "循环补货数量", example = "0") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double cycleRquestQty = 0d; public int getIqcVal(){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java new file mode 100644 index 0000000..374abd7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -0,0 +1,92 @@ +package cn.estsh.i3plus.pojo.wms.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; + +/** + * @Description : 推送信息配置 + * @Reference : + * @Author : gcj + * @CreateDate : 2020-01-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PUSH_CONFIG") +@Api("推送配置") +public class WmsPushConfig extends BaseBean{ + + private static final long serialVersionUID = 2701710669030092153L; + @ApiParam("推送名称") + @Column(name = "PUSH_NAME") + private String pushName; + + @ApiParam("规则类型") + @Column(name = "QUARTZ_CRON") + private String quartzCron; + + @ApiParam("末次执行时间") + @Column(name = "LAST_EXE_TIME") + private String lastExeTime; + + @ApiParam("下次执行时间") + @Column(name = "NEXT_EXE_TIME") + private String nextExeTime; + + @ApiParam("序号") + @Column(name = "SERIAL_NUMBER") + private Integer serialNumber; + + @ApiParam("查询Hql") + @Column(name = "HQL_STR") + private String hqlStr; + + @ApiParam("查询Sql") + @Column(name = "SQL_STR") + private String sqlStr; + + @ApiParam("脚本编号") + @Column(name = "SCRIPT_NO") + private String scriptNo; + + @ApiParam("标题模板") + @Column(name = "TITLE_TEMPLATE") + private String titleTemplate; + + @ApiParam("消息体模板") + @Column(name = "CONTENT_TEMPLATE") + private String contentTemplate; + + @ApiParam("推送类型") + @Column(name = "PUSH_TYPE") + private Integer pushType; + + @ApiParam("描述") + @Column(name = "REMARK") + private String remark; + + @ApiParam("推送地址") + @Column(name ="PATH_URL") + private String pathUrl; + + @ApiParam("头标签") + @Column(name = "TITLE_LABEL") + private String titleLabel; + + @ApiParam("内容标签") + @Column(name = "CONTENT_LABEL") + private String contentLabel; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java new file mode 100644 index 0000000..6a57625 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.wms.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; + +/** + * @Description : 推送信息配置 + * @Reference : + * @Author : gcj + * @CreateDate : 2020-01-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PUSH_LOG") +@Api("推送日志") +public class WmsPushLog extends BaseBean{ + + private static final long serialVersionUID = -1708833666516164845L; + @Column(name = "EXE_HQL") + @ApiParam("执行Hql") + private String exeHql; + + @Column(name = "PUSH_TITLE") + @ApiParam("推送标题") + private String pushTitle; + + @Column(name = "PUSH_CONTENT") + @ApiParam("推送内容") + private String pushContent; + + @Column(name = "PUSH_TYPE") + @ApiParam("推送类型") + private String pushType; + + @Column(name = "PUSH_RESULT") + @ApiParam("推送结果") + private String pushResult; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 422cf79..0e5b1f3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -282,6 +282,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "是否最早批次") public String isFifo; + @Transient + @ApiParam("打印模板名称") + private String templateName; + public WmsStockSn() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java new file mode 100644 index 0000000..b1f3e68 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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.Index; +import javax.persistence.Table; + +/** + * @Description : WMS字段信息表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_FIELDINFO", indexes = { + @Index(columnList = "FIELD_NAME"), + @Index(columnList = "ENTITY_NAME") +}) +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS字段信息表",description = "WMS字段信息表") +public class WmsFieldInfo extends BaseBean { + + private static final long serialVersionUID = 3903166651913139064L; + + @Column(name = "FIELD_NAME") + @ApiParam(value = "字段名称") + private String fieldName; + + @Column(name = "FIELD_DESC") + @ApiParam(value = "字段描述") + private String fieldDesc; + + @Column(name = "FIELD_TYPE") + @ApiParam(value = "字段类型") + private String fieldType; + + @Column(name = "ENTITY_NAME") + @ApiParam(value = "实体名称") + private String entityName; + + @Column(name = "ENTITY_DESC") + @ApiParam(value = "实体描述") + private String entityDesc; + + @Column(name = "SEQ") + @ApiParam(value = "序列号:字段标题排序使用默认0（不排序）") + private Integer seq; + + @Column(name = "IS_REQUIRE") + @ApiParam(value = "是否必选:默认1-必选，2-非必选") + private Integer isRequire; + + @Column(name = "WIDTH", columnDefinition = "decimal(18,8)") + @ApiParam(value = "宽度", example = "0") + private Double width; + + @Column(name = "SORT") + @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序") + private Integer sort; + + @Column(name = "IS_WIDER") + @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗") + private Integer isWider; + + @Column(name = "IS_SELECT") + @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选") + private Integer isSelect; + + @Column(name = "IS_SHOW") + @ApiParam(value = "是否表单字段展示:默认1-显示，2-隐藏") + private Integer isShow; + + @Column(name = "CONDITION_EXPRE") + @ApiParam(value = "条件表达式:>,<,>=等") + private String conditionExpre; + + @Column(name = "CONDITION_CONNECTOR") + @ApiParam(value = "条件连接符:and/or") + private String conditionConnector; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java new file mode 100644 index 0000000..d654c64 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java @@ -0,0 +1,80 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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.Index; +import javax.persistence.Table; + +/** + * @Description : WMS列表元素表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_LISTELEMENT", indexes = { + @Index(columnList = "FIELD_NAME"), + @Index(columnList = "USER_CODE") +}) +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS列表元素表",description = "WMS列表元素表") +public class WmsListElement extends BaseBean { + + private static final long serialVersionUID = 3903166651913139060L; + + @Column(name = "FIELD_NAME") + @ApiParam(value = "字段名称") + private String fieldName; + + @Column(name = "TITLE_NAME") + @ApiParam(value = "标题名称") + private String titleName; + + @Column(name = "SEQ") + @ApiParam(value = "序列号:字段标题排序使用默认0（不排序）") + private Integer seq; + + @Column(name = "IS_REQUIRE") + @ApiParam(value = "是否必选:默认1-必选，2-非必选") + private Integer isRequire; + + @Column(name = "WIDTH", columnDefinition = "decimal(18,8)") + @ApiParam(value = "宽度", example = "0") + private Double width; + + @Column(name = "SORT") + @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序") + private Integer sort; + + @Column(name = "IS_WIDER") + @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗") + private Integer isWider; + + @Column(name = "IS_SELECT") + @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选") + private Integer isSelect; + + @Column(name = "ISSHOW") + @ApiParam(value = "是否表单字段展示:默认1-显示，2-隐藏") + private Integer isShow; + + @Column(name = "DEFAULT_VALUE") + @ApiParam(value = "表单字段默认值") + private String defaultValue; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号") + private String userCode; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java new file mode 100644 index 0000000..dc94f0a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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.Index; +import javax.persistence.Table; + +/** + * @Description : WMS列表元素菜单关系表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_LISTELEMENT_FUNCTION", indexes = { + @Index(columnList = "FUNCTION_ID"), + @Index(columnList = "ELEMENT_ID"), + @Index(columnList = "USER_CODE") +}) +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS列表元素菜单关系表",description = "WMS列表元素菜单关系表") +public class WmsListElementFunction extends BaseBean { + + private static final long serialVersionUID = 3903166651913139061L; + @Column(name = "FUNCTION_ID") + @ApiParam(value = "功能菜单ID") + private Long functionId; + + @Column(name = "ELEMENT_ID") + @ApiParam(value = "元素ID") + private Long elementId; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号") + private String userCode; + + @Column(name = "IS_DEFAULT") + @ApiParam(value = "是否默认配置") + private Integer isDefault; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java new file mode 100644 index 0000000..8ffe833 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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.Index; +import javax.persistence.Table; + +/** + * @Description : WMS搜索元素表 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_SEARCHELEMENT", indexes = { + @Index(columnList = "FIELD_NAME"), + @Index(columnList = "SEARCH_NAME"), + @Index(columnList = "USER_CODE") +}) +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS搜索元素表",description = "WMS搜索元素表") +public class WmsSearchElement extends BaseBean { + + private static final long serialVersionUID = 3903166651913139062L; + + @Column(name = "FIELD_NAME") + @ApiParam(value = "字段名称") + private String fieldName; + + @Column(name = "TITLE_NAME") + @ApiParam(value = "标题名称") + private String titleName; + + @Column(name = "CONDITION_EXPRE") + @ApiParam(value = "条件表达式:>,<,>=等") + private String conditionExpre; + + @Column(name = "VALUE") + @ApiParam(value = "检索值") + private String value; + + @Column(name = "CONDITION_CONNECTOR") + @ApiParam(value = "条件连接符:and/or") + private String conditionConnector; + + @Column(name = "SEARCH_NAME") + @ApiParam(value = "搜索名称") + private String searchName; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号") + private String userCode; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java new file mode 100644 index 0000000..43cbb23 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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.Index; +import javax.persistence.Table; + +/** + * @Description : WMS搜索元素菜单关系表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_SEARCHELEMENT_FUNCTION", indexes = { + @Index(columnList = "FUNCTION_ID"), + @Index(columnList = "SEARCH_ELEMENT_ID"), + @Index(columnList = "IS_SHARE"), + @Index(columnList = "USER_CODE") +}) +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS搜索元素菜单关系表",description = "WMS搜索元素菜单关系表") +public class WmsSearchElementFunction extends BaseBean { + + private static final long serialVersionUID = 3903166651913139063L; + + @Column(name = "FUNCTION_ID") + @ApiParam(value = "功能菜单ID") + private Long functionId; + + @Column(name = "GROUP_NAME") + @ApiParam(value = "组名称") + private String groupName; + + @Column(name = "SEARCH_ELEMENT_ID") + @ApiParam(value = "搜索元素ID") + private Long searchElementId; + + @Column(name = "GROUP_CONNECTOR") + @ApiParam(value = "组条件连接符") + private String groupConnector; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号") + private String userCode; + + @Column(name = "IS_SHARE") + @ApiParam(value = "是否共享") + private Integer isShare; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java new file mode 100644 index 0000000..6667a49 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import lombok.Data; + +import java.util.Map; + +@Data +public class MailMessageModel extends PushMessageModel { + + + //附加，value 文件的绝对地址/动态模板数据 + private Map attachment; + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java new file mode 100644 index 0000000..1e2ff26 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +@Data +public class PushMessageModel { + + + //标题 + public String title; + //内容 + public String content; + + //推送类型 + public String pushType; + + //推送地址 + public String pathUrl; + + //推送数据 + List> dataList; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataMigrationConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataMigrationConfigRepository.java new file mode 100644 index 0000000..080bf9d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataMigrationConfigRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.BasVendor; +import cn.estsh.i3plus.pojo.wms.bean.WmsDataMigrationConfig; +import org.springframework.stereotype.Repository; + +/** + * @Description :WMS数据迁移配置实体 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-08 14:49 + * @Modify: + **/ +@Repository +public interface WmsDataMigrationConfigRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java new file mode 100644 index 0000000..f1e59d0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS字段信息表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsFieldInfoRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java new file mode 100644 index 0000000..5b724e6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElementFunction; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS列表元素菜单关系表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsListElementFunctionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java new file mode 100644 index 0000000..9433e7d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElement; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS列表元素表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsListElementRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java new file mode 100644 index 0000000..65de6a6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPushConfig; +import cn.estsh.i3plus.pojo.wms.bean.WmsPushLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : 推送日志配置信息 + * @Reference : + * @Author : gcj + * @CreateDate : 2020-01-06 9:47 + * @Modify: + **/ +@Repository +public interface WmsPushConfigRepository extends BaseRepository { + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.java new file mode 100644 index 0000000..209b9a7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsPushLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : 推送日志保存对象 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2020-01-06 9:47 + * @Modify: + **/ +@Repository +public interface WmsPushLogRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java new file mode 100644 index 0000000..1746d7e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElementFunction; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS搜索元素菜单关系表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsSearchElementFunctionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java new file mode 100644 index 0000000..028586d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS搜索元素表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsSearchElementRepository 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 215fb1b..65c25de 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 @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo; 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; @@ -2692,4 +2693,38 @@ public class WmsHqlPack { return result; } + /** + * 数据迁移配置信息分页查询条件 + * + * @param wmsDataMigrationConfig + * @return + */ + public static DdlPackBean packHqlWmsDataMigrationConfig(WmsDataMigrationConfig wmsDataMigrationConfig) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsDataMigrationConfig.getMigName(), "migName", result); + DdlPreparedPack.getStringLikerPack(wmsDataMigrationConfig.getRemark(), "remark", result); + DdlPreparedPack.getStringLikerPack(wmsDataMigrationConfig.getSrcTableName(), "srcTableName", result); + DdlPreparedPack.getNumEqualPack(wmsDataMigrationConfig.getIsPhysicalDelete(), "isPhysicalDelete", result); + DdlPreparedPack.getStringBiggerPack(wmsDataMigrationConfig.getMcStartTime(), "nextExecutionTime", result); + DdlPreparedPack.getStringSmallerPack(wmsDataMigrationConfig.getMcEndTime(), "nextExecutionTime", result); + + getStringBuilderPack(wmsDataMigrationConfig, result); + + return result; + } + + /** + * WMS实体字段信息分页查询条件 + * + * @param wmsFieldInfo + * @return + */ + public static DdlPackBean packHqlWmsFieldInfo(WmsFieldInfo wmsFieldInfo) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getFieldName(), "fieldName", result); + DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "entityName", result); + getStringBuilderPack(wmsFieldInfo, result); + return result; + } }