diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java index 6a0a0d2..eddecd7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java @@ -21,4 +21,5 @@ public @interface FieldAnnotation { int pric() default 2; // 对于浮点型，界面显示的精度 boolean mainkey() default false; // 是否为主键 String defaultValue() default ""; // 字段的默认值 + boolean popSearch() default false; // 弹出选择对象时是否显示 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index 12c9683..dd36fb7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -32,6 +32,7 @@ public class BaseOrder extends BaseCode { @Column(name="PRIORITY") @ApiParam(value ="优先级") + @FieldAnnotation(defaultValue = "10") private Integer priority; @Column(name="LET") @@ -40,18 +41,22 @@ public class BaseOrder extends BaseCode { @Column(name="CALC_EST") @ApiParam(value ="最早开始时刻计算值") + @FieldAnnotation(modify = false) private Date calcEst; @Column(name="CALC_LET") @ApiParam(value ="最晚结束时刻计算值") + @FieldAnnotation(modify = false) private Date calcLet; @Column(name="PLAN_BEGIN") @ApiParam(value ="计划开始") + @FieldAnnotation(modify = false) private Date planBegin; @Column(name="PLAN_END") @ApiParam(value ="计划结束") + @FieldAnnotation(modify = false) private Date planEnd; @Column(name="RECEIVE_DATE") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index f302131..aedbbcd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -44,6 +44,10 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="类型名称") private String typeName; + @Column(name="TYPE_FULL_NAME") + @ApiParam(value ="类型全名称包含路径") + private String typeFullName; + @Column(name="CUSTOMIZE") @ApiParam(value ="是否为自定义字段") private Boolean customize; @@ -84,6 +88,10 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="字段默认值") private String defaultValue; + @Column(name="POP_SEARCH") + @ApiParam(value ="弹出选择时是否显示") + private Boolean popSearch; + @ApiParam(value ="枚举项内容") private transient Enum[] enumItems; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index 89699c0..97056fa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -33,10 +34,12 @@ public class Inventory extends BaseOrder { @Column(name="ASSIGN_COUNT") @ApiParam(value ="已分配量") + @FieldAnnotation(modify = false) private Double assignCount; @Column(name="EXCESS_COUNT") @ApiParam(value ="多余量") + @FieldAnnotation(modify = false) private Double excessCount; @JsonIgnore diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 23bcbe8..a006cdf 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -77,14 +77,17 @@ public class ProductOrder extends BaseOrder { @Column(name="CALC_LEAD_TIME") @ApiParam(value ="提前期计算值") + @FieldAnnotation(modify = false) private String calcLeadTime; @Column(name="EXCESS_COUNT") @ApiParam(value ="多余量") + @FieldAnnotation(modify = false) private Double excessCount; @Column(name="LACK_COUNT") @ApiParam(value ="缺少量") + @FieldAnnotation(modify = false) private Double lackCount; @Column(name="AUTO_SUPPLY") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index eab91d2..f784093 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -41,10 +42,12 @@ public class PurchaseOrder extends BaseOrder { @Column(name="CALC_LEAD_TIME") @ApiParam(value ="提前期计算值") + @FieldAnnotation(modify = false) private String calcLeadTime; @Column(name="EXCESS_COUNT") @ApiParam(value ="多余量") + @FieldAnnotation(modify = false) private Double excessCount; @Column(name="AUTO_SUPPLY") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index e74a116..dc63b89 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -42,6 +43,7 @@ public class SalesOrder extends BaseOrder { @Column(name="CALC_LEAD_TIME") @ApiParam(value ="提前期计算值") + @FieldAnnotation(modify = false) private String calcLeadTime; @JsonIgnore diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 70f77de..261164e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -29,4 +30,9 @@ public class SysParam extends BaseAPS { @Column(name="MAX_INTERRUPT_COUNT") @ApiParam(value ="最大中断次数") private Integer maxInterruptCount; + + @Column(name="RULE_GROUP_ID") + @ApiParam(value ="规则组id") + @FieldAnnotation(display = false) + private Long ruleGroupId; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 896eb83..5e68d01 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -31,10 +31,12 @@ import java.util.List; public class Work extends BaseCode { @Column(name="WORK_TYPE") @ApiParam(value ="工作类型") + @FieldAnnotation(modify = false) private WORK_TYPE workType; @Column(name="count") @ApiParam(value ="数量") + @FieldAnnotation(modify = false) private Double count; @Column(name="SPECIFY_COUNT") @@ -75,10 +77,12 @@ public class Work extends BaseCode { @Column(name="CALC_EST") @ApiParam(value ="最早开始时间计算值") + @FieldAnnotation(modify = false) private Date calcEst; @Column(name="CALC_LET") @ApiParam(value ="最晚结束时间计算值") + @FieldAnnotation(modify = false) private Date calcLet; @Column(name="WORK_STATUS") @@ -87,14 +91,17 @@ public class Work extends BaseCode { @Column(name="PLAN_BEGIN") @ApiParam(value ="计划开始时间") + @FieldAnnotation(modify = false) private Date planBegin; @Column(name="PLAN_END") @ApiParam(value ="计划结束时间") + @FieldAnnotation(modify = false) private Date planEnd; @Column(name="PLAN_RESOURCE") @ApiParam(value ="计划主资源") + @FieldAnnotation(modify = false) private String planResource; @Column(name="FIX_SPLIT") @@ -103,14 +110,17 @@ public class Work extends BaseCode { @Column(name="NEED_PREV_COUNT") @ApiParam(value ="需要的前工作数量") + @FieldAnnotation(display = false, modify = false) private Double needPrevCount; @Column(name="SCH_FAILED") @ApiParam(value ="是否排程失败") + @FieldAnnotation(modify = false) private Boolean schFailed; @Column(name="FAILED_REASON") @ApiParam(value ="排程失败原因") + @FieldAnnotation(modify = false) private String failedReason; @Column(name="ORDER_ID") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index c74f140..e690ba2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -29,14 +29,17 @@ import java.util.List; public class WorkInput extends BaseAPS { @Column(name="INPUT_TIME") @ApiParam(value ="输入时间") + @FieldAnnotation(modify = false) private Date inputTime; @Column(name="INPUT_COUNT") @ApiParam(value ="输入数量") + @FieldAnnotation(modify = false) private Double inputCount; @Column(name="SHORT_COUNT") @ApiParam(value ="短缺数量") + @FieldAnnotation(modify = false) private Double shortCount; @Column(name="WORK_ID") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index 49116dd..c947efd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -30,14 +30,17 @@ import java.util.List; public class WorkOutput extends BaseAPS { @Column(name="OUTPUT_TIME") @ApiParam(value ="输出时间") + @FieldAnnotation(modify = false) private Date outputTime; @Column(name="OUTPUT_COUNT") @ApiParam(value ="输出数量") + @FieldAnnotation(modify = false) private Double outputCount; @Column(name="REMAIN_COUNT") @ApiParam(value ="多余数量") + @FieldAnnotation(modify = false) private Double remainCount; @Column(name="WORK_ID") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 95b5a20..ddd9a92 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; @@ -34,66 +35,82 @@ import java.util.List; public class WorkPlan extends BaseAPS { @Column(name="PREV_SET_BEGIN") @ApiParam(value ="前设置开始时间") + @FieldAnnotation(modify = false) private Date prevSetBegin; @Column(name="PREV_SET_END") @ApiParam(value ="前设置结束时间") + @FieldAnnotation(modify = false) private Date prevSetEnd; @Column(name="PREV_SET_TIME") @ApiParam(value ="前设置时间") + @FieldAnnotation(modify = false) private Integer prevSetTime; @Column(name="PRODUCE_BEGIN") @ApiParam(value ="生产开始时间") + @FieldAnnotation(modify = false) private Date produceBegin; @Column(name="PRODUCE_END") @ApiParam(value ="生产结束时间") + @FieldAnnotation(modify = false) private Date produceEnd; @Column(name="PRODUCE_TIME") @ApiParam(value ="生产时间") + @FieldAnnotation(modify = false) private Integer produceTime; @Column(name="POST_SET_BEGIN") @ApiParam(value ="后设置开始时间") + @FieldAnnotation(modify = false) private Date postSetBegin; @Column(name="POST_SET_END") @ApiParam(value ="后设置结束时间") + @FieldAnnotation(modify = false) private Date postSetEnd; @Column(name="POST_SET_TIME") @ApiParam(value ="后设置时间") + @FieldAnnotation(modify = false) private Integer postSetTime; @Column(name="LOCK_BEGIN") @ApiParam(value ="锁定开始时间") + @FieldAnnotation(modify = false) private Date lockBegin; @Column(name="LOCK_END") @ApiParam(value ="锁定结束时间") + @FieldAnnotation(modify = false) private Date lockEnd; @Column(name="LOCK_TIME") @ApiParam(value ="锁定时间") + @FieldAnnotation(modify = false) private Integer lockTime; @Column(name="WORK_ID") @ApiParam(value ="工作对象id") + @FieldAnnotation(property = false) private Long workId; @Column(name="RESOURCE_ID") @ApiParam(value ="资源对象id") + @FieldAnnotation(property = false) private Long resourceId; @Column(name="WORK_RESOURCE_ID") @ApiParam(value ="工作资源对象id") + @FieldAnnotation(property = false) private Long workResourceId; @Column(name="MAIN_PLAN_ID") @ApiParam(value ="主计划对象id") + @FieldAnnotation(property = false) private Long mainPlanId; public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index 8894581..e4d86da 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -29,22 +29,27 @@ import javax.persistence.Table; public class WorkRelation extends BaseAPS { @Column(name="TYPE") @ApiParam(value ="关联类型") + @FieldAnnotation(modify = false) private WORK_RELATION_TYPE type; @Column(name="CONS_TYPE") @ApiParam(value ="接续方式") + @FieldAnnotation(modify = false) private CONSTRAINT_TYPE consType; @Column(name="MAX_SPACE_TIME") @ApiParam(value ="最大间隔时间") + @FieldAnnotation(modify = false) private String maxSpaceTime; @Column(name="MIN_SPACE_TIME") @ApiParam(value ="最小间隔时间") + @FieldAnnotation(modify = false) private String minSpaceTime; @Column(name="COUNT") @ApiParam(value ="关联数量") + @FieldAnnotation(modify = false) private Double count; @Column(name="FIX_RELATION") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index f4266ec..f51f6b1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -28,38 +28,47 @@ import javax.persistence.Table; public class WorkResource extends BaseAPS { @Column(name="USE_TYPE") @ApiParam(value ="使用类型") + @FieldAnnotation(modify = false) private USE_TYPE useType; @Column(name="PREV_TIME") @ApiParam(value ="前设置时间") + @FieldAnnotation(modify = false) private Long prevTime; @Column(name="PRODUCE_TIME") @ApiParam(value ="制造时间") + @FieldAnnotation(modify = false) private Long produceTime; @Column(name="POST_TIME") @ApiParam(value ="后设置时间") + @FieldAnnotation(modify = false) private Long postTime; @Column(name="PRIORITY") @ApiParam(value ="优先级") + @FieldAnnotation(modify = false) private Integer priority; @Column(name="MAX_PREV_SD_TIME") @ApiParam(value ="最大前设置中断时间") + @FieldAnnotation(modify = false) private String maxPrevSdTime; @Column(name="MAX_PRODUCE_SD_TIME") @ApiParam(value ="最大制造中断时间") + @FieldAnnotation(modify = false) private String maxProduceSdTime; @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") + @FieldAnnotation(modify = false) private String maxPostSdTime; @Column(name="USER_MATCH_NUMBER") @ApiParam(value ="资源使用配套号") + @FieldAnnotation(modify = false) private String userMatchNumber; @Column(name="WORK_ID") 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 e61ce60..a300c90 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 @@ -1,10 +1,14 @@ package cn.estsh.i3plus.pojo.aps.common; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import javax.persistence.MappedSuperclass; +import javax.persistence.Transient; import java.util.HashMap; import java.util.Map; @@ -22,6 +26,12 @@ public abstract class BaseAPS extends BaseBean { @JsonIgnore private transient Map customFields = new HashMap<>(); + @Column(name="KEY") + @ApiParam(value ="主键值") + @FieldAnnotation(display = false, modify = false) + @Transient + private String key; + public Object getCustomField(String code) { return customFields.get(code); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java index b434092..5d03f34 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.common; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -18,10 +19,12 @@ import javax.persistence.MappedSuperclass; public abstract class BaseCode extends BaseAPS { @Column(name="CODE") @ApiParam(value ="编码") + @FieldAnnotation(popSearch = true, mainkey = true) private String code; @Column(name="NAME") @ApiParam(value ="名称") + @FieldAnnotation(popSearch = true) private String name; @Column(name="REMARK") 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 c6a96dc..0b2d4a4 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,79 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * mes 工位类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_WORK_CELL_TYPE { + + NORMAL(10, "正常"), + REWORK(20, "返修"); + + private int value; + private String description; + + MES_WORK_CELL_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes 物料绑定记录结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_PRODUCE_SN_RESULT { + + OK(10, "OK"); + + private int value; + private String description; + + MES_PRODUCE_SN_RESULT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** * mes缺陷原因类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java new file mode 100644 index 0000000..84fb49f --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table LacInstructionSetStep( + *
templateId bigint null, + *
templateNameRdd varchar(50) null, + *
templateCode varchar(50) null, + *
stepName varchar(50) null, + *
stepSort int null, + *
stepExecCond double null, + *
stepDescription varchar(255) null + *
); + * + *
comment on table LacInstructionSetStep is'指令集模板步骤'; + *
comment on column LacInstructionSetStep.templateId is'模板id'; + *
comment on column LacInstructionSetStep.templateNameRdd is'模板名称'; + *
comment on column LacInstructionSetStep.templateCode is'模板代码'; + *
comment on column LacInstructionSetStep.stepName is'步骤名称'; + *
comment on column LacInstructionSetStep.stepSort is'步骤顺序'; + *
comment on column LacInstructionSetStep.stepExecCond is'步骤执行条件'; + *
comment on column LacInstructionSetStep.stepDescription is'步骤描述'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午5:53 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_COMMAND_STACK_STEP") +@Api(value="指令集模板",description = "指令集模板信息") +public class LacCommandStackStep extends BaseBean { + + @Column(name="TEMPLATE_ID") + @ApiParam(value ="模板ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long templateId; + + @Column(name="STEP_NAME") + @ApiParam(value ="模板名称") + private String stepName; + + @Column(name="STEP_CODE") + @ApiParam(value ="模板代码") + private String stepCode; + + @Column(name="STEP_SORT") + @ApiParam(value ="步骤顺序") + private Integer stepSort; + + @Column(name="STEP_EXEC_COND") + @ApiParam(value ="步骤执行条件") + private Integer stepExecCond; + + @Column(name="STEP_DESCRIPTION") + @ApiParam(value ="步骤执行条件") + private String stepDescription; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java new file mode 100644 index 0000000..a0aac59 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java @@ -0,0 +1,102 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table LacInstructionSetStepTask( + *
templateId bigint null, + *
templateNameRdd varchar(50) null, + *
templateCode varchar(50) null, + *
stepId bigint null, + *
stepNameRdd varchar(50) null, + *
taskId bigint null, + *
taskNameRdd varchar(50) null, + *
taskCode varchar(50) null, + *
isCrux int null + *
); + * + *
comment on table LacInstructionSetStepTask is'指令集模板步骤任务'; + *
comment on column LacInstructionSetStepTask.templateId is'模板id'; + *
comment on column LacInstructionSetStepTask.templateNameRdd is'模板名称'; + *
comment on column LacInstructionSetStepTask.templateCode is'模板代码'; + *
comment on column LacInstructionSetStepTask.stepId is'步骤id'; + *
comment on column LacInstructionSetStepTask.stepNameRdd is'步骤名称'; + *
comment on column LacInstructionSetStepTask.taskId is'任务id'; + *
comment on column LacInstructionSetStepTask.taskNameRdd is'任务名称'; + *
comment on column LacInstructionSetStepTask.taskCode is'任务代码'; + *
comment on column LacInstructionSetStepTask.isCrux is'是否关键'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午6:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_COMMAND_STACK_STEP_TASK") +@Api(value="步骤任务",description = "步骤任务信息") +public class LacCommandStackStepTask extends BaseBean { + + @Column(name="TEMPLATE_ID") + @ApiParam(value ="模板ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long templateId; + +// @Column(name="TEMPLATE_NAME_RDD") +// @ApiParam(value ="模板名称") +// private String templateNameRdd; +// +// @Column(name="TEMPLATE_CODE_RDD") +// @ApiParam(value ="模板代码") +// private String templateCodeRdd; + + + @Column(name="STEP_ID") + @ApiParam(value ="步骤ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long stepId; +// +// @Column(name="STEP_NAME_RDD") +// @ApiParam(value ="步骤名称") +// private String stepNameRdd; +// +// @Column(name="STEP_CODE_RDD") +// @ApiParam(value ="步骤代码") +// private String stepCodeRdd; + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="STEP_NAME_RDD") + @ApiParam(value ="步骤名称") + private String taskNameRdd; + + @Column(name="STEP_CODE_RDD") + @ApiParam(value ="任务代码") + private String taskCodeRdd; + + + @Column(name="IS_CRUX") + @ApiParam(value ="是否关键") + private Integer isCrux; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java new file mode 100644 index 0000000..11ff867 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java @@ -0,0 +1,80 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table instructionSetTemplate( + *
templateName varchar(50) null, + *
templateCode varchar(50) null, + *
templateTypeId bigint null, + *
templateTypeNameRdd varchar(50) null, + *
templateDescription varchar(50) null, + *
templateStepNum int null + *
); + * + *
comment on table instructionSetTemplate is'指令集模板'; + *
comment on column instructionSetTemplate.templateName is'模板名称'; + *
comment on column instructionSetTemplate.templateCode is'模板代码'; + *
comment on column instructionSetTemplate.templateTypeId is'模板大类id'; + *
comment on column instructionSetTemplate.templateTypeNameRdd is'模板大类名称'; + *
comment on column instructionSetTemplate.templateDescription is'模板描述'; + *
comment on column instructionSetTemplate.templateStepNum is'模板步骤'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午5:45 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_COMMAND_STACK_TEMPLATE") +@Api(value="指令集模板",description = "指令集模板信息") +public class LacCommandStackTemplate extends BaseBean { + + @Column(name="TEMPLATE_NAME") + @ApiParam(value ="模板名称") + private String templateName; + + @Column(name="TEMPLATE_CODE") + @ApiParam(value ="模板代码") + private String templateCode; + + @Column(name="STACK_TYPE_ID") + @ApiParam(value ="指令集类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long stackTypeId; + + @Column(name="STACK_TYPE_NAME_RDD") + @ApiParam(value ="类型名称") + private String stackTypeNameRdd; + + @Column(name="TYPE_DESCRIPTION") + @ApiParam(value ="模板大类名称") + private String typeDescription; + + @Column(name="TEMPLATE_NUM") + @ApiParam(value ="适配器使用数量") + private Integer templateNum; + + @Column(name="TEMPLATE_DESCRIPTION") + @ApiParam(value ="模板描述") + private String templateDescription; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java new file mode 100644 index 0000000..af6e6fb --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table LacSuitCase( + *
sutiCaseId bigint null, + *
sutiCaseNameRdd varchar(50) null, + *
suitCaseCode varchar(50) null, + *
sutiType int null, + *
hardwareType int null, + *
returnMethod int null, + *
timeout int null, + *
retryNum int null, + *
successNum int null, + *
failNum int null, + *
countNum int null, + *
sutiCaseStatus int null + *
); + *
+ *
comment on table LacSuitCase is'适配器'; + *
comment on column LacSuitCase.sutiCaseId is'适配器id'; 不推荐使用ID绑定，数据库调整会有变动，推荐使用Code 绑定 + *
comment on column LacSuitCase.sutiCaseNameRdd is'适配器名称'; + *
comment on column LacSuitCase.suitCaseCode is'适配器代码'; + *
comment on column LacSuitCase.sutiType is'适配器类型（枚举）'; + *
comment on column LacSuitCase.hardwareType is'硬件类型（枚举）'; + *
comment on column LacSuitCase.returnMethod is'返回方式（枚举）'; + *
comment on column LacSuitCase.timeout is'超时时间'; -> 移至 任务当中 + *
comment on column LacSuitCase.retryNum is'重试次数'; -> 移至 任务当中 + *
comment on column LacSuitCase.successNum is'成功次数'; -> 移至 任务当中 + *
comment on column LacSuitCase.failNum is'失败次数'; -> 移至 任务当中 + *
comment on column LacSuitCase.countNum is'总次数'; -> 移至 任务当中 + *
comment on column LacSuitCase.sutiCaseStatus is'适配器状态'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午6:08 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_SUIT_CASE") +@Api(value="适配器",description = "适配器信息") +public class LacSuitCase extends BaseBean { + + @Column(name="SUTI_CASE_NAME_RDD") + @ApiParam(value ="适配器名称") + private String sutiCaseNameRdd; + + @Column(name="SUIT_CASE_CODE_RDD") + @ApiParam(value ="适配器代码") + private String suitCaseCodeRdd; + + @Column(name="SUTI_TYPE") + @ApiParam(value ="适配器类型") + private Integer sutiType; + + @Column(name="HARDWARE_TYPE") + @ApiParam(value ="硬件类型") + private Integer hardwareType; + + @Column(name="RETURN_METHOD") + @ApiParam(value ="返回类型") + private Integer returnMethod; + + @Column(name="SUTI_CASE_STATUS") + @ApiParam(value ="适配器状态") + private Integer sutiCaseStatus; + + @Column(name="SUIT_CASE_DESCRIPTION") + @ApiParam(value ="适配器描述") + private String suitCaseDescription; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java new file mode 100644 index 0000000..d9af1a4 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java @@ -0,0 +1,116 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table LacSuitTask( + *
taskName varchar(50) null, + *
taskCode varchar(50) null, + *
taskTypeId bigint null, + *
taskTypeNameRdd varchar(50) null, + *
suitCaseId bigint null, + *
suitCaseCode varchar(50) null, + *
suitCaseNameRdd varchar(50) null, + *
successNum int null, + *
failNum int null, + *
countNum int null, + *
taskDescription varchar(255) null + *
); + *
comment on table LacSuitTask is'适配任务'; + *
comment on column LacSuitTask.taskName is'任务名称'; + *
comment on column LacSuitTask.taskCode is'任务代码'; + *
comment on column LacSuitTask.taskTypeId is'任务大类id'; + *
comment on column LacSuitTask.taskTypeNameRdd is'任务大类名称'; + *
comment on column LacSuitTask.suitCaseId is'适配器id'; + *
comment on column LacSuitTask.suitCaseCode is'适配器代码'; + *
comment on column LacSuitTask.suitCaseNameRdd is'适配器名称'; + *
comment on column LacSuitTask.successNum is'成功次数'; + *
comment on column LacSuitTask.failNum is'适配次数'; + *
comment on column LacSuitTask.countNum is'总次数'; + *
comment on column LacSuitTask.taskDescription is'任务描述'; + *
comment on column LacSuitCase.timeout is'超时时间'; -> 移至 任务当中 + *
comment on column LacSuitCase.retryNum is'重试次数'; -> 移至 任务当中 + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午6:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_SUIT_TASK") +@Api(value="调度任务",description = "调度任务信息") +public class LacSuitTask extends BaseBean { + + @Column(name="TASK_NAME") + @ApiParam(value ="适配器名称") + private String taskName; + + @Column(name="TASK_CODE") + @ApiParam(value ="适配器代码") + private String taskCode; + + @Column(name="TASK_TIMEOUT") + @ApiParam(value ="超时时间") + private Integer taskTimeout; + + @Column(name="TASK_RETRY_NUM") + @ApiParam(value ="重试次数") + private Integer taskRetryNum; + + @Column(name="TASK_TYPE_ID") + @ApiParam(value ="任务类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskTypeId; + + @Column(name="TASK_TYPE_NAME_RDD") + @ApiParam(value ="任务类型名称") + private String taskTypeNameRdd; + + @Column(name="SUIT_CASE_ID") + @ApiParam(value ="适配器ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; + + @Column(name="SUTI_CASE_NAME_RDD") + @ApiParam(value ="适配器名称") + private String suitCaseNameRdd; + + @Column(name="SUIT_CASE_CODE_RDD") + @ApiParam(value ="适配器代码") + private String suitCaseCodeRdd; + + @Column(name="NUM_SUCCESS") + @ApiParam(value ="执行成功次数") + private Integer numSuccess = 0; + + @Column(name="NUM_FAIL") + @ApiParam(value ="执行失败次数") + private Integer numFail = 0; + + @Column(name="NUM_COUNT") + @ApiParam(value ="执行次数") + private Integer numCount = 0; + + @Column(name="TASK_DESCRIPTION") + @ApiParam(value ="任务描述") + private String taskDescription; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java new file mode 100644 index 0000000..2b4b3af --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table LacSuitTaskParam( + *
suitTaskId bigint null, + *
suitTaskName varchar(50) null, + *
suitTaskCode varchar(50) null, + *
paramName varchar(50) null, + *
paramType int null, + *
paramValueType int null, + *
defaultValue varchar(50) null, + *
paramDescrition varchar(255) null + *
); + *
comment on table LacSuitTaskParam is'适配任务参数'; + *
comment on column LacSuitTaskParam.suitTaskId is'适配任务id'; + *
comment on column LacSuitTaskParam.suitTaskName is'适配任务名称'; + *
comment on column LacSuitTaskParam.suitTaskCode is'适配任务代码'; + *
comment on column LacSuitTaskParam.paramName is'参数名称'; + *
comment on column LacSuitTaskParam.paramType is'参数类型(枚举)'; + *
comment on column LacSuitTaskParam.paramValueType is'参数值类型(枚举)'; + *
comment on column LacSuitTaskParam.defaultValue is'默认值'; + *
comment on column LacSuitTaskParam.paramDescrition is'参数描述'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午6:49 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_SUIT_TASK_PARAM") +@Api(value="调度任务参数",description = "调度任务参数信息") +public class LacSuitTaskParam extends BaseBean { + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="TASK_NAME_RDD") + @ApiParam(value ="任务名称") + private String taskNameRdd; + + @Column(name="TASK_CODE_RDD") + @ApiParam(value ="任务代码") + private String taskCodeRdd; + + @Column(name="PARAM_NAME") + @ApiParam(value ="参数名称") + private String paramName; + + @Column(name="PARAM_CODE") + @ApiParam(value ="参数编码") + private String paramCode; + + @Column(name="PARAM_TYPE") + @ApiParam(value ="参数类型") + private Integer paramType; + + @Column(name="PARAM_VALUE_TYPE") + @ApiParam(value ="参数值类型") + private Integer paramValueType; + + @Column(name="PARAM_DEFAULT_VALUE") + @ApiParam(value ="参数默认值") + private String paramDefaultValue; + + @Column(name="PARAM_DESCRIPTION") + @ApiParam(value ="参数描述") + private String paramDescription; +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java new file mode 100644 index 0000000..b44528b --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java @@ -0,0 +1,100 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table LacSuitTaskParamAdapter( + *
sutiTaskId bigint null, + *
suitTaskCode varchar(50) null, + *
suitTaskNameRdd varchar(50) null, + *
paramId bigint null, + *
paramName varchar(50) null, + *
paramType int null, + *
paramValueType int null, + *
defaultValue varchar(50) null, + *
transferParamName varchar(50) null, + *
transferParamValueType int null + *
); + *
comment on table LacSuitTaskParamAdapter is'适配任务参数转换'; + *
comment on column LacSuitTaskParamAdapter.sutiTaskId is'适配任务id'; + *
comment on column LacSuitTaskParamAdapter.suitTaskCode is'适配任务代码'; + *
comment on column LacSuitTaskParamAdapter.suitTaskNameRdd is'适配任务名称'; + *
comment on column LacSuitTaskParamAdapter.paramId is'参数id'; + *
comment on column LacSuitTaskParamAdapter.paramName is'参数名称'; + *
comment on column LacSuitTaskParamAdapter.paramType is'参数类型(枚举)'; + *
comment on column LacSuitTaskParamAdapter.paramValueType is'参数值类型(枚举)'; + *
comment on column LacSuitTaskParamAdapter.defaultValue is'默认值'; + *
comment on column LacSuitTaskParamAdapter.transferParamName is'转换后参数名称'; + *
comment on column LacSuitTaskParamAdapter.transferParamValueType is'转换后参数值类型'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午1:45 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_SUIT_TASK_PARAM_ADAPTER") +@Api(value="调度任务参数转换",description = "调度任务参数转换信息") +public class LacSuitTaskParamAdapter extends BaseBean { + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="TASK_NAME_RDD") + @ApiParam(value ="任务名称") + private String taskNameRdd; + + @Column(name="TASK_CODE_RDD") + @ApiParam(value ="任务代码") + private String taskCodeRdd; + + @Column(name="PARAM_ID") + @ApiParam(value ="参数ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long paramId; + + @Column(name="PARAM_NAME") + @ApiParam(value ="参数名称") + private String paramName; + + @Column(name="PARAM_TYPE") + @ApiParam(value ="参数类型") + private Integer paramType; + + @Column(name="PARAM_VALUE_TYPE") + @ApiParam(value ="参数值类型") + private Integer paramValueType; + + @Column(name="TRANSFER_PARAM_NAME") + @ApiParam(value ="转换后参数名称") + private String transferParamName; + + @Column(name="TRANSFER_PARAM_VALUE_TYPE") + @ApiParam(value ="转换后参数值类型") + private String transferParamValueType; + + @Column(name="DEFAULT_VALUE") + @ApiParam(value ="参数默认值") + private String defaultValue; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepRepository.java new file mode 100644 index 0000000..8df6834 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStep; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午2:55 + * @Modify: + **/ +public interface LacCommandStackStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepTaskRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepTaskRepository.java new file mode 100644 index 0000000..4db8217 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepTaskRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午2:55 + * @Modify: + **/ +public interface LacCommandStackStepTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTemplateRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTemplateRepository.java new file mode 100644 index 0000000..6aa60e8 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTemplateRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackTemplate; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午2:56 + * @Modify: + **/ +public interface LacCommandStackTemplateRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitCaseRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitCaseRepository.java new file mode 100644 index 0000000..c4d52d5 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitCaseRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitCase; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午2:56 + * @Modify: + **/ +public interface LacSuitCaseRepository extends BaseRepository { +} + diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamAdapterRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamAdapterRepository.java new file mode 100644 index 0000000..887c5b6 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamAdapterRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParamAdapter; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午3:19 + * @Modify: + **/ +public interface LacSuitTaskParamAdapterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamRepository.java new file mode 100644 index 0000000..d1026e0 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParam; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午3:19 + * @Modify: + **/ +public interface LacSuitTaskParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskRepository.java new file mode 100644 index 0000000..c65e6c7 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午3:19 + * @Modify: + **/ +public interface LacSuitTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java index 9dfa3d0..a03c46a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java @@ -95,6 +95,14 @@ public class MesProcessBom extends BaseBean { @ApiParam("显示颜色") private String color; + @Transient + @ApiParam("关键件代码") + private String keyBarCode; + + @Transient + @ApiParam("产品条码") + private String serialNumber; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java index 09fd0cd..4047e39 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java @@ -73,4 +73,15 @@ public class MesQcCheckStandard extends BaseBean { @ApiParam("检测值") private String checkValue; + public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName) { + this.partNo = partNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.checkType = checkType; + this.checkItem = checkItem; + this.checkStandard = checkStandard; + this.checkGuide = checkGuide; + this.checkFrequency = checkFrequency; + this.partName = partName; + } } 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 1928952..c8316cc 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 @@ -50,5 +50,8 @@ public class MesButtonFlagModel implements Serializable { @ApiParam("关闭按钮-提醒") private boolean closeButtonNoticeFlag; + @ApiParam("维修任务按钮") + private boolean repairButton; + }