Merge branch 'test'

yun-zuoyi
crish 6 years ago
commit c4d7a2380c

@ -439,11 +439,10 @@ public class AndonHqlPack {
*/
public static DdlPackBean packHqlAndonConfig(AndonConfig andonConfig){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonConfig.getConfigCode(), "configCode", result);
DdlPreparedPack.getNumEqualPack(andonConfig.getConfigGroup(), "configGroup", result);
DdlPreparedPack.getNumEqualPack(andonConfig.getConfigType(), "configType", result);
getStringBuilderPack(andonConfig, result);
return result;
}

@ -1,5 +1,7 @@
package cn.estsh.i3plus.pojo.aps.annotation;
import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@ -21,4 +23,7 @@ public @interface FieldAnnotation {
int pric() default 2; // 对于浮点型,界面显示的精度
boolean mainkey() default false; // 是否为主键
String defaultValue() default ""; // 字段的默认值
boolean popSearch() default false; // 弹出选择对象时是否显示
EDIT_TYPE editType() default EDIT_TYPE.NONE; // 定义字段的编辑类型
String typeName() default ""; // 定义字段类型的简单名称,对于多选关联对象时有用。
}

@ -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")

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonIgnore;
@ -44,6 +45,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 +89,14 @@ public class FieldInfo extends BaseCode {
@ApiParam(value ="字段默认值")
private String defaultValue;
@Column(name="POP_SEARCH")
@ApiParam(value ="弹出选择时是否显示")
private Boolean popSearch;
@Column(name="EDIT_TYPE")
@ApiParam(value ="字段编辑类型")
private EDIT_TYPE editType;
@ApiParam(value ="枚举项内容")
private transient Enum<?>[] enumItems;

@ -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

@ -70,7 +70,7 @@ public class Material extends BaseCode {
@Column(name="LEVEL")
@ApiParam(value ="低阶码")
@RippleAnnotation(dependence = {"OperOutputs.Operation.ProductRouting.Material"}, method = "calcLevel")
@RippleAnnotation(dependence = {"OperInputs.Operation.ProductRouting.Material.level"}, method = "calcLevel")
@FieldAnnotation(modify = false)
private Integer level;

@ -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")

@ -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")

@ -1,7 +1,9 @@
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.enums.EDIT_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EResCalendar;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
@ -27,6 +29,7 @@ import java.util.List;
public class ResCalendar extends BaseAPS {
@Column(name="RES_CODES")
@ApiParam(value ="资源代码")
@FieldAnnotation(editType = EDIT_TYPE.MULTI_OBJECT, typeName = "Resource")
private String resCodes;
@Column(name="WEEKS")

@ -1,10 +1,13 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_CLASS;
import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_LOCK_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.TIME_ROUND_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EResource;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -12,6 +15,7 @@ import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.List;
/**
* @Description :
@ -96,4 +100,7 @@ public class Resource extends BaseCode {
@Column(name="LOCK_TIME")
@ApiParam(value ="锁定时间长度")
private String lockTime;
@JsonBackReference
public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EResource.WorkPlans); }
}

@ -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

@ -0,0 +1,82 @@
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.EShippingTime;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
@Data
@Entity
@Table(name = "APS_SHIPPING_TIME")
@Api("运输时间")
public class ShippingTime extends BaseAPS {
@Column(name="TIME")
@ApiParam(value ="运输时间")
private String time;
@Column(name="PRIORITY")
@ApiParam(value ="优先级")
private Integer priority;
@Column(name="PREV_RES_CODE")
@ApiParam(value ="前资源对象Id")
@FieldAnnotation(property = false)
private Long prevResId;
@Column(name="POST_RES_CODE")
@ApiParam(value ="后资源对象Id")
@FieldAnnotation(property = false)
private Long postResId;
@Column(name="PREV_STAND_CODE")
@ApiParam(value ="前标准工序对象Id")
@FieldAnnotation(property = false)
private Long prevStandId;
@Column(name="POST_STAND_CODE")
@ApiParam(value ="后标准工序对象Id")
@FieldAnnotation(property = false)
private Long postStandId;
public Resource getPrevRes() {return BeanRelation.get(this, EShippingTime.PrevRes); }
public void setPrevRes(Resource res) {
this.prevResId = res != null ? res.getId() : 0l;
BeanRelation.set(this, EShippingTime.PrevRes, res);
}
public Resource getPostRes() { return BeanRelation.get(this, EShippingTime.PostRes); }
public void setPostRes(Resource res) {
this.postResId = res != null ? res.getId() : 0l;
BeanRelation.set(this, EShippingTime.PostRes, res);
}
public StandOperation getPrevStand() { return BeanRelation.get(this, EShippingTime.PrevStand);}
public void setPrevStand(StandOperation stand) {
this.prevStandId = stand != null ? stand.getId() : 0l;
BeanRelation.set(this, EShippingTime.PrevStand, stand);
}
public StandOperation getPostStand() { return BeanRelation.get(this, EShippingTime.PostStand); }
public void setPostStand(StandOperation stand) {
this.postStandId = stand != null ? stand.getId() : 0l;
BeanRelation.set(this, EShippingTime.PostStand, stand);
}
}

@ -1,6 +1,8 @@
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.enums.ROUTING_VALID_TYPE;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -29,4 +31,13 @@ public class SysParam extends BaseAPS {
@Column(name="MAX_INTERRUPT_COUNT")
@ApiParam(value ="最大中断次数")
private Integer maxInterruptCount;
@Column(name="TYPE")
@ApiParam(value ="工艺路径有效判断类型")
private ROUTING_VALID_TYPE type;
@Column(name="RULE_GROUP_ID")
@ApiParam(value ="规则组id")
@FieldAnnotation(display = false)
private Long ruleGroupId;
}

@ -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")

@ -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")

@ -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")

@ -1,7 +1,10 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.WORK_PLAN_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan;
import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation;
import io.swagger.annotations.Api;
@ -32,68 +35,92 @@ import java.util.List;
@Table(name="APS_WORK_PLAN")
@Api("工作计划")
public class WorkPlan extends BaseAPS {
@Column(name="TYPE")
@ApiParam(value ="工作计划类型")
@FieldAnnotation(modify = false, display = false)
private WORK_PLAN_TYPE type;
@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)
@RippleAnnotation(dependence = {"Work.PrevRelations.PrevWork.WorkPlan.produceBegin",
"PrevPlan.produceBegin"}, method = "calcPositive")
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)
@RippleAnnotation(dependence = {"Work.PostRelations.PostWork.WorkPlan.produceBegin", "produceBegin"}, method = "calcPositiveLock")
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); }

@ -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")

@ -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 ="前设置时间")
private Long prevTime;
@FieldAnnotation(modify = false)
private Integer prevTime;
@Column(name="PRODUCE_TIME")
@ApiParam(value ="制造时间")
private Long produceTime;
@FieldAnnotation(modify = false)
private Integer produceTime;
@Column(name="POST_TIME")
@ApiParam(value ="后设置时间")
private Long postTime;
@FieldAnnotation(modify = false)
private Integer 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")

@ -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<String, Object> 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);
}

@ -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")

@ -229,6 +229,15 @@ public class BeanInfo {
return null;
}
public static List<Class<? extends BaseBean>> getChildClasses(Class<? extends BaseBean> cls) {
List<Class<? extends BaseBean>> beanClasses = new ArrayList<>();
List<BeanInfo> beanInfos = getBeanInfo(cls).childsBeanInfos;
for (BeanInfo beanInfo : beanInfos) {
beanClasses.add(beanInfo.getBeanClass());
}
return beanClasses;
}
public static FIELD_TYPE getFieldType(Class<?> cls) {
FIELD_TYPE type = null;
if (cls == Boolean.class || cls == boolean.class) {

@ -2,10 +2,7 @@ package cn.estsh.i3plus.pojo.aps.common;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Predicate;
@ -51,7 +48,7 @@ public class BeanRelation {
return result;
}
for (Enum<?> holder : beanInfo.getAllHolders()) {
result.put(holder, new ArrayList<>());
result.put(holder, new LinkedList<>());
}
return result;
}
@ -205,36 +202,60 @@ public class BeanRelation {
}
}
public static <T extends BaseBean> List<T> lastList(BaseBean entity, Enum<?>... args) {
List<T> result = new ArrayList<T>();
lastListImpl(result, entity, null, args, 0);
return result;
}
public static <T extends BaseBean> List<T> lastList(BaseBean entity, Predicate<T> filter, Enum<?>... args) {
List<T> result = new ArrayList<T>();
lastListImpl(result, entity, filter, args, 0);
public static <T extends BaseBean> List<T> lastList(BaseBean bean, Enum<?>... holders) {
List<T> result = new ArrayList<>();
lastListImpl(result, bean, bean, holders, 0);
return result;
}
@SuppressWarnings("unchecked")
private final static <T extends BaseBean> boolean lastListImpl(List<T> result, BaseBean entity, Predicate<T> filter,
Enum<?>[] args, int index) {
if (index >= args.length) {
private final static <T extends BaseBean> boolean lastListImpl(List<T> result, BaseBean bean, BaseBean self,
Enum<?>[] holders, int index) {
if (index >= holders.length) {
if (self == bean) {
return false;
}
index = 0;
self = bean;
}
boolean bNotLast = true;
List<BaseBean> relaEntities = list(entity, args[index]);
for (BaseBean relaEntity : relaEntities) {
if (lastListImpl(result, relaEntity, filter, args, index + 1)) {
result.add((T)relaEntity);
List<BaseBean> nextBeans = list(bean, holders[index]);
for (BaseBean nextBean : nextBeans) {
if (lastListImpl(result, nextBean, self, holders, index + 1)) {
result.add((T)nextBean);
bNotLast = false;
}
}
return index == 0 && bNotLast;
}
/**
*
* @param bean
* @param holder
* @param args
* @param <T>
* @return List
*/
public static <T extends BaseBean> Set<T> listUnique(BaseBean bean, Enum<?> holder, Enum<?>... args) {
Set<T> result = new HashSet<>();
List<BaseBean> nextBeans = list(bean, holder);
for (BaseBean nextBean : nextBeans) {
listUniqueImpl(result, nextBean, args, 0);
}
result.remove(bean);
return result;
}
private static <T extends BaseBean> void listUniqueImpl(Set<T> result, BaseBean bean, Enum<?>[] holders, int index) {
if (index >= holders.length) {
result.add((T)bean);
} else {
List<BaseBean> nextBeans = list(bean, holders[index]);
for (BaseBean nextBean : nextBeans) {
listUniqueImpl(result, nextBean, holders, index + 1);
}
}
}
/**
@ -400,4 +421,38 @@ public class BeanRelation {
recursionImpl(relaBean, fun, holders, index + 1);
}
}
/**
* targetbeanholders
* @param bean
* @param target
* @param holders
* @return
*/
public static boolean recursionContains(BaseBean bean, BaseBean target, Enum<?>... holders) {
if (holders.length == 0) {
return false;
}
return recursionContainsImpl(bean, target, holders, 0);
}
private final static boolean recursionContainsImpl(BaseBean bean, BaseBean target,
Enum<?>[] holders, int index) {
if (index >= holders.length) {
if (target == bean) {
return true;
}
index = 0;
}
List<BaseBean> relaBeans = list(bean, holders[index]);
for (BaseBean relaBean : relaBeans) {
if (recursionContainsImpl(relaBean, target, holders, index + 1)) {
return true;
}
}
return false;
}
}

@ -25,7 +25,7 @@ public class DateDuration {
public static final double PRECISION = 0.00001;
private String value;
private long time = 0;
private int time = 0;
private double rate = 0.0;
private boolean bValid = false;
@ -60,7 +60,7 @@ public class DateDuration {
* 0
* @return
*/
public long getTime() {
public int getTime() {
return this.time;
}
@ -68,7 +68,7 @@ public class DateDuration {
*
* @return
*/
public void setTime(long time) {
public void setTime(int time) {
this.time = time;
}
@ -139,12 +139,12 @@ public class DateDuration {
* @param amount
* @return
*/
public long getTime(double amount) {
public int getTime(double amount) {
if (amount < PRECISION)
return getTime();
double result = (amount * this.rate) + this.time;
return (long)Math.ceil(result);
return (int)Math.ceil(result);
}
/**

@ -0,0 +1,28 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum EDIT_TYPE {
NONE,
BOOLEAN, // 布尔, 开关编辑
CHAR, // 字符, 文本框编辑
SHORT, // 短整型, 数字编辑
INTEGER, // 整型, 数字编辑
LONG, // 长整型, 数字编辑
DOUBLE, // 浮点型, 文本框编辑
DATE, // 日期类型(2019-09-16)
TIME, // 时间类型(17:35:30)
DATE_TIME, // 日期时间类型(2019-09-16 17:35:30)
DURATION, // 时间段(1H),文本框编辑
ENUM, // 枚举,下拉选择
MULTI_ENUM, // 多选枚举, 下拉多选
STRING, // 字符串,文本框编辑
OBJECT, // 关联对象下来选择关联对象的Code值
LIST, // 对象集合,不可编辑。
MULTI_OBJECT // 多选对象,弹出框选择,可以选择全部对象,以*表示选择全部
}

@ -8,6 +8,7 @@ package cn.estsh.i3plus.pojo.aps.enums;
* @Modify:
**/
public enum RESOURCE_CLASS {
MAIN, // 主资源
ASS // 副资源
LIMITLESS, // 无限能力
SINGLE, // 单能力
BATCH // 炉资源
}

@ -8,7 +8,6 @@ package cn.estsh.i3plus.pojo.aps.enums;
* @Modify:
**/
public enum RESOURCE_TYPE {
LIMITLESS, // 无限能力
SINGLE, // 单能力
BATCH // 炉资源
MAIN, // 主资源
ASS // 副资源
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-10-29
* @Modify:
**/
public enum ROUTING_VALID_TYPE {
ORDER_CALC_LET, // 与订单的最晚结束时刻计算值做比较
CALC_LET_LT, // 与最晚结束时刻计算值-提前期做比较
BASE_TIME // 与基准时刻做比较
}

@ -0,0 +1,7 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum WORK_PLAN_TYPE {
MAIN_PLAN, // 主资源计划
ASS_PLAN, // 副资源计划
BATCH_PLAN // 炉资源计划
}

@ -1,4 +1,5 @@
package cn.estsh.i3plus.pojo.aps.holders;
public enum EResource {
WorkPlans
}

@ -0,0 +1,8 @@
package cn.estsh.i3plus.pojo.aps.holders;
public enum EShippingTime {
PrevRes, // 前资源
PostRes, // 后资源
PrevStand, // 前标准工序
PostStand // 后标准工序
}

@ -0,0 +1,25 @@
package cn.estsh.i3plus.pojo.aps.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@Data
public class GanttCalendarModel {
@Data
public static class Block {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date beginTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
private Boolean onDuty;
}
private Long resourceId;
private List<Block> timeBlocks = new ArrayList<>();
}

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.model;
import cn.estsh.i3plus.pojo.aps.bean.WorkResource;
import java.util.ArrayList;
import java.util.List;
/**
@ -14,5 +15,5 @@ import java.util.List;
**/
public class ResourceCompose {
public WorkResource resource;
public List<WorkResource> assResource;
public List<WorkResource> assResource = new ArrayList<>();
}

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.aps.repository;
import cn.estsh.i3plus.pojo.aps.bean.ShippingTime;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface ShippingTimeRepository extends CrudRepository<ShippingTime, Long> {
}

@ -1,3 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="Resource">
<Relation field="WorkPlans" name="WorkPlan" reverse="Resource" type="ONE_TO_MULTI" owner="true">
</Relation>
</Class>

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="WorkPlan">
<Relation field="PrevRes" name="Resource" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="PostRes" name="Resource" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="PrevStand" name="StandOperation" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="PostStand" name="StandOperation" type="MULTI_TO_ONE" owner="false">
</Relation>
</Class>

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="WorkPlan">
<Relation field="Resource" name="Resource" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="WorkResource" name="WorkResource" type="ONE_TO_ONE" owner="false">
</Relation>
<Relation field="AssPlans" name="WorkPlan" reverse="MainPlan" type="ONE_TO_MULTI" owner="false">

@ -667,7 +667,7 @@ public class AndonEnumUtil {
QUALITY("QUALITY_ALARM", 111020006, "质量"),
EQUIP("EQUMENT_ALARM", 111020007, "设备"),
PROCESS("ROUTING_ALARM", 111020008, "工艺"),
CHECK("OTHER_ALARM", 111020009, "其他"),
CHECK("OTHER_ALARM", 111020009, "自处理"),
FIX_ERROR("FIX_ERROR", 111020010, "自动报警");
private String value;

@ -33,6 +33,7 @@ public class CommonEnumUtil {
HARDSWITCH(25,"block-hardswitch","硬件适配器"),
LAC(26,"lac","连接适配器"),
ANDON(27,"andon","安灯"),
APS(28,"APS","高级计划与排程"),
CENTER(99,"icloud-server","注册中心"),
SURFACE(98,"i3surface","对外服务"),
CLOUD(97,"i3cloud","微服务"),

@ -0,0 +1,183 @@
package cn.estsh.i3plus.pojo.base.enumutil;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-10-29 13:37
* @Modify:
**/
public class LacEnumUtil {
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SUIT_CASE_TYPE {
SOFTWARE(10, "软件"),
HARDWARE(20, "硬件");
private int value;
private String description;
private SUIT_CASE_TYPE (int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static LacEnumUtil.SUIT_CASE_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum HARDWARE_TYPE {
OPC_READ(10, "读OPC"),
OPC_WRITE(20, "写OPC");
private int value;
private String description;
private HARDWARE_TYPE (int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static LacEnumUtil.HARDWARE_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PARAM_TYPE{
OUT_PARAM(1,"出参"),
IN_PARAM(2,"入参");
private int value;
private String description;
PARAM_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;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STACK_STATUS{
INIT(10,"初始化"),
WAIT(20,"等待中"),
RUNNING(30,"运行中"),
PAUSE(40,"手动暂停"),
FINISH(100,"执行完成"),
RUN_ERROR(101,"运行异常"),
RUN_STOP(102,"手动结束");
private int value;
private String description;
STACK_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;
}
public static boolean isRunning(int val) {
return RUNNING.getValue() == val;
}
}
}

@ -9,8 +9,424 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* @CreateDate : 2018-10-23 15:53
* @Modify:
**/
public class MesEnumUtil {
/**
* Mes
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CUST_ORDER_SOURCE {
MES("MES", "来源于MES"),
SAP("SAP", "来源于SAP");
private String value;
private String description;
CUST_ORDER_SOURCE(String value, String description) {
this.value = value;
this.description = description;
}
public String 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.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesCustOrder
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CUST_ORDER_TYPE {
STANDARD(10, "标准");
private int value;
private String description;
CUST_ORDER_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;
}
}
/**
* MesCustOrderstatus
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CUST_ORDER_STATUS {
CREATE(10, "CREATED", "创建"),
DEAL(20, "DEAL", "已处理"),
CLOSE(30, "CLOSE", "关闭");
private int value;
private String code;
private String description;
CUST_ORDER_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static String 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;
}
}
/**
* MesProductEncodeCfg
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_MATCH_TYPE {
ORGANIZATION("10", "工厂"),
PART("20", "物料"),
CUST_CODE("30", "客户代码"),
CUST_PART_NO("40", "客户物料号"),
WORK_CENTER("50", "产线");
private String value;
private String description;
MES_MATCH_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesProductEncodeCfg
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_CODE_TYPE {
SERIAL_SN("10", "过程条码"),
PRODUCT_SN("20", "产品条码"),
PACK_SN("30", "包装条码");
private String value;
private String description;
MES_CODE_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesDatasource
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_DB_SOURCE_TYPE {
SOURCE_MARIA_DB("SOURCE_MARIA_DB", "MariaDB"),
SOURCE_SQL_SERVER("SOURCE_SQL_SERVER", "SQL Server"),
SOURCE_ORACLE("SOURCE_ORACLE", "Oracle"),
SOURCE_POSTGRE_SQL("SOURCE_POSTGRE_SQL", "PostgreSql");
private String value;
private String description;
MES_DB_SOURCE_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String 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_DATA_OPERATE_TYPE {
INSERT(10, "insert"),
SELECT(20, "select"),
UPDATE(30, "update");
private int value;
private String description;
MES_DATA_OPERATE_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;
}
}
/**
* MesRepair
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_REPAIR_TYPE {
SCRATCH(10, "划痕"),
FRACTURE(20, "破碎"),
SCRAP_TYPE3(30, "缺失");
private int value;
private String description;
MES_REPAIR_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;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum EQUIPMENT_REPORT_TYPE {
TASK(10, "作业任务"),
PLAN(20, "周期计划"),
REPAIR(30, "维修记录"),
CHECK(40, "点检记录"),
MAINTAIN(50, "保养记录");
private int value;
private String description;
EQUIPMENT_REPORT_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;
}
}
/**
* MesScrap
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SCRAP_TYPE {
SCRAP_TYPE(10, "过期"),
SCRAP_TYPE2(20, "不合格"),
SCRAP_TYPE3(30, "缺失");
private int value;
private String description;
SCRAP_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;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_PRODUCE_SN_TYPE {
NORMAL(10, "正常件"),
FIRST_INSPECTION(20, "首检件");
private int value;
private String description;
MES_PRODUCE_SN_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
*/
@ -436,7 +852,8 @@ public class MesEnumUtil {
MES_PLAN_ORDER(10, "生产计划"),
MES_EQUIPMENT(20, "设备台账"),
MES_EQU_TASK_STANDARD(30, "设备作业要求");
MES_EQU_TASK_STANDARD(30, "设备作业要求"),
MES_CUST_ORDER(40, "客户订单");
private int value;
private String description;
@ -736,15 +1153,15 @@ public class MesEnumUtil {
* pcn
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_IS_KEY {
public enum MES_IS_BIND_KEY {
IS_KEY(10, "是"),
NO_KEY(20, "否");
IS_BIND_KEY(1, "是"),
NO_BIND_KEY(2, "否");
private int value;
private String description;
MES_IS_KEY(int value, String description) {
MES_IS_BIND_KEY(int value, String description) {
this.value = value;
this.description = description;
}
@ -758,8 +1175,8 @@ public class MesEnumUtil {
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_IS_KEY getByValue(int value) {
for (MES_IS_KEY mesInsertExcel : values()) {
public static MES_IS_BIND_KEY getByValue(int value) {
for (MES_IS_BIND_KEY mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
return mesInsertExcel;
}
@ -2294,7 +2711,8 @@ public class MesEnumUtil {
PCN_PULL(60, "PCN_PULL"),
PCN_PUSH(70, "PCN_PUSH"),
FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"),
REWORK_REPAIR(90, "REWORK_REPAIR");
REWORK_REPAIR(90, "REWORK_REPAIR"),
PCN_LOGIN(100, "PCN_LOGIN");
private int value;
private String description;

@ -12,6 +12,155 @@ import org.apache.commons.lang3.StringUtils;
**/
public class MesPcnEnumUtil {
/**
* MesScrap
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SCRAP_TYPE {
SCRAP_TYPE(10, "过期"),
SCRAP_TYPE2(20, "不合格"),
SCRAP_TYPE3(30, "缺失");
private int value;
private String description;
SCRAP_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;
}
}
/**
* MesProduceSnqcStatus
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRODUCE_SN_QC_STATUS {
QUALIFIED(10, "合格"),
DEFECTED(20, "不合格"),
SCRAPED(30, "报废"),
DISMANTLED(40, "已拆解");
private int value;
private String description;
PRODUCE_SN_QC_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;
}
}
/**
* 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
*/
@ -1751,4 +1900,73 @@ public class MesPcnEnumUtil {
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ONLINE_SEND_TYPE {
PLC("PLC", "PLC"),
DB("DB", "DB");
private String value;
private String description;
ONLINE_SEND_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SN_TRAVEL_OPERATE {
WORKCELL_SCAN(10, "工位扫描"),
CHECK_QUALITY(20, "质量判定"),
DISASSEMBLE_MATERIAL(30, "物料拆解"),
REWORK(40, "返修作业");
private int value;
private String description;
SN_TRAVEL_OPERATE(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;
}
}
}

@ -25,7 +25,7 @@ public class WmsEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GROUP_COMMIT_CHECK {
DISABLE(1, "禁止提交"), CHECK_MOVE(2, "校验移动单"),
NO_CHECK(3, "不校验"),CHECK_OLD_MOVE_NO(4, "校验是否已产生移动单");
NO_CHECK(3, "不校验"), CHECK_OLD_MOVE_NO(4, "校验是否已产生移动单");
private int value;
private String description;
@ -285,6 +285,7 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -623,7 +624,10 @@ public class WmsEnumUtil {
VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"),
VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库"),
VDA_PICKING_GOODS(270, "VDA_PICKING_GOODS", "VDA生产领料"),
VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料");
VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料"),
VDA_QC(290, "VDA_QC", "VDA质检"),
VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"),
VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并");
private int value;
@ -799,7 +803,12 @@ public class WmsEnumUtil {
VDA_PICKING_GOODS("VDA_PICKING_GOODS", "VDA生产领料"),
VDA_NC_FREEZE("VDA_NC_FREEZE", "VDA_NC冻结"),
VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"),
VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻");
VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"),
VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错"),
VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"),
VDA_SN_("VDA_SN_MERGE", "VDA条码合并"),
VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"),
VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询");
private String value;
private String description;
@ -860,7 +869,7 @@ public class WmsEnumUtil {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].value,value)) {
if (StringUtils.equalsIgnoreCase(values()[i].value, value)) {
return values()[i];
}
}
@ -917,7 +926,7 @@ public class WmsEnumUtil {
INIT(20, "INIT", "初始化"),
IS_GENERAL(30, "IS_GENERAL", "已生成"),
NO_GENERAL(40, "NO_GENERAL", "不生成"),
CANCEL(50,"CANCEL","撤销");
CANCEL(50, "CANCEL", "撤销");
private int value;
private String code;
@ -1098,7 +1107,7 @@ public class WmsEnumUtil {
MONTH_INVENTORY(20, "月度盘点"),
SEASON_INVENTORY(30, "季度盘点"),
YEAR_INVENTORY(40, "年度盘点"),
AJUST_INVENTORY(50, "库存调整盘点");
AJUST_INVENTORY(50, "库存调整盘点");
private int value;
private String description;
@ -2761,8 +2770,47 @@ public class WmsEnumUtil {
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
public enum WMS_PART_TYPE_STR {
RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品");
private String value;
private String description;
WMS_PART_TYPE_STR(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
*/
@ -2916,6 +2964,16 @@ public class WmsEnumUtil {
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
@ -3435,12 +3493,13 @@ public class WmsEnumUtil {
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum REC_STATUS{
public enum REC_STATUS {
UNRECEIVED("UNRECEIVED", "未收货"),
COMPLETE_RECEIPT("COMPLETE_RECEIPT", "完成收货"),
PARTIAL_RECEIPT("PARTIAL_RECEIPT", "部分收货"),
OVER_RECEIVED_GOODS("OVER_RECEIVED_GOODS", "超量收货"),
OTHER("ELSE", "其他"),;
OTHER("ELSE", "其他"),
;
private String value;
private String description;
@ -3476,7 +3535,7 @@ public class WmsEnumUtil {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val) ) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
@ -3523,7 +3582,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ETC_PRINT_STATUS {
NOT_HIT (10, "未打"),
NOT_HIT(10, "未打"),
ALREADY_HIT(20, "已打");
private int value;
@ -3560,7 +3619,8 @@ public class WmsEnumUtil {
public enum PART_ASSOCIATE_TYPE {
LINE(10, "LINE", "产线"),
CUSTOMER(20, "CUSTOMER", "客户"),
VENDOR(30, "VENDOR", "供应商");
VENDOR(30, "VENDOR", "供应商"),
BOXING_ERROR_PROOFING(40, "BOXING_ERROR_PROOFING","装箱防错");
private int value;
private String code;
@ -3681,8 +3741,8 @@ public class WmsEnumUtil {
public enum ROUTING_RULE_MODE {
CREATE_TASK(10, "CREATE_TASK", "生成任务"),
AUTO_OPT(20, "AUTO_OPT", "自动操作"),
MENU_OPT(30, "MENU_OPT", "手工操作"),
AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易");
MENU_OPT(30, "MENU_OPT", "手工操作"),
AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易");
private int value;
private String code;
private String description;
@ -3729,13 +3789,14 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTING_RULE_TYPE {
PROMOTION_TYPE(10, "REPLENISH_TYPE", "推动规则"),
REPLENISH_TYPE(20, "PROMOTION_TYPE", "补货规则");
PROMOTION_TYPE(10, "REPLENISH_TYPE", "推动规则"),
REPLENISH_TYPE(20, "PROMOTION_TYPE", "补货规则");
private int value;
private String code;
private String description;
@ -3782,12 +3843,13 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTING_DELAY_UNIT {
M(10, "M", "分"),
M(10, "M", "分"),
D(20, "D", "天");
private int value;
private String code;
@ -3836,4 +3898,77 @@ public class WmsEnumUtil {
}
}
/**
* MOVE_TO_ERP
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MOVE_TO_ERP_IS_SYNC {
SYNCHRONIZED(1, "已同步"), UN_SYNCHRONIZED(2, "未同步"), NON_SYNCHRONIZED(3, "不同步");
private int value;
private String description;
MOVE_TO_ERP_IS_SYNC(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return 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;
}
}
/**
*
* 10=20=30=BMW40=BMW50=BMW60=
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PART_BOXING_ERROR_PROOFING_TYPE {
PART_NO(10, "零件装箱防错"),
SN(20, "条码装箱防错"),
BMW_TAG(30, "BMW标签防错"),
BMW_PART(40, "BMW零件防错"),
BMW_DISPATCH(50, "BMW发运防错"),
SINGLE_DISPATCH(60, "单件发运防错");
private int value;
private String description;
PART_BOXING_ERROR_PROOFING_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return 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;
}
}
}

@ -9,11 +9,12 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :
@ -82,7 +83,7 @@ public class LacCommandStackRecord extends BaseBean {
@Column(name="STACK_SPEND")
@ApiParam(value ="执行耗时")
private Integer stackSpend;
private Long stackSpend;
@Column(name="STACK_STATUS")
@ApiParam(value ="执行状态")
@ -92,4 +93,12 @@ public class LacCommandStackRecord extends BaseBean {
@ApiParam(value ="执行说明")
private String executionDescription;
@Transient
@ApiParam(value ="指令集模板")
private LacCommandStackTemplate template;
@Transient
@ApiParam(value ="步骤列表")
private List<LacCommandStackStep> stepList;
}

@ -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;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :
* <per>
* <br/> create table LacInstructionSetStep(
* <br/> templateId bigint null,
* <br/> templateNameRdd varchar(50) null,
* <br/> templateCode varchar(50) null,
* <br/> stepName varchar(50) null,
* <br/> stepSort int null,
* <br/> stepExecCond double null,
* <br/> stepDescription varchar(255) null
* <br/> );
*
* <br/> comment on table LacInstructionSetStep is'';
* <br/> comment on column LacInstructionSetStep.templateId is'id';
* <br/> comment on column LacInstructionSetStep.templateNameRdd is'';
* <br/> comment on column LacInstructionSetStep.templateCode is'';
* <br/> comment on column LacInstructionSetStep.stepName is'';
* <br/> comment on column LacInstructionSetStep.stepSort is'';
* <br/> comment on column LacInstructionSetStep.stepExecCond is'';
* <br/> comment on column LacInstructionSetStep.stepDescription is'';
* </per>
* @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 Double stepExecCond;
@Column(name="STEP_DESCRIPTION")
@ApiParam(value ="步骤执行条件")
private String stepDescription;
@Transient
@ApiParam(value ="步骤任务列表")
private List<LacCommandStackStepTask> stepTaskList;
public LacCommandStackStep() {
}
public LacCommandStackStep(Long templateId) {
this.templateId = templateId;
}
}

@ -0,0 +1,124 @@
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;
import javax.persistence.Transient;
/**
* @Description :
* <per>
* <br/> create table LacInstructionSetStepTask(
* <br/> templateId bigint null,
* <br/> templateNameRdd varchar(50) null,
* <br/> templateCode varchar(50) null,
* <br/> stepId bigint null,
* <br/> stepNameRdd varchar(50) null,
* <br/> taskId bigint null,
* <br/> taskNameRdd varchar(50) null,
* <br/> taskCode varchar(50) null,
* <br/> isCrux int null
* <br/> );
*
* <br/> comment on table LacInstructionSetStepTask is'';
* <br/> comment on column LacInstructionSetStepTask.templateId is'id';
* <br/> comment on column LacInstructionSetStepTask.templateNameRdd is'';
* <br/> comment on column LacInstructionSetStepTask.templateCode is'';
* <br/> comment on column LacInstructionSetStepTask.stepId is'id';
* <br/> comment on column LacInstructionSetStepTask.stepNameRdd is'';
* <br/> comment on column LacInstructionSetStepTask.taskId is'id';
* <br/> comment on column LacInstructionSetStepTask.taskNameRdd is'';
* <br/> comment on column LacInstructionSetStepTask.taskCode is'';
* <br/> comment on column LacInstructionSetStepTask.isCrux is'';
* </per>
* @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;
/**
* 使
*/
@Deprecated
@Column(name="TASK_INSTANCE_ID")
@ApiParam(value ="任务实例ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskInstanceId;
//
// @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;
@Transient
@ApiParam(value ="适配任务")
private LacSuitTask lacSuitTask;
@Transient
@ApiParam(value ="适配任务记录")
private LacLogTask logTask;
public LacCommandStackStepTask() {
}
public LacCommandStackStepTask(Long templateId) {
this.templateId = templateId;
}
}

@ -0,0 +1,84 @@
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;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :
* <per>
* <br/> create table instructionSetTemplate(
* <br/> templateName varchar(50) null,
* <br/> templateCode varchar(50) null,
* <br/> templateTypeId bigint null,
* <br/> templateTypeNameRdd varchar(50) null,
* <br/> templateDescription varchar(50) null,
* <br/> templateStepNum int null
* <br/> );
*
* <br/> comment on table instructionSetTemplate is'';
* <br/> comment on column instructionSetTemplate.templateName is'';
* <br/> comment on column instructionSetTemplate.templateCode is'';
* <br/> comment on column instructionSetTemplate.templateTypeId is'id';
* <br/> comment on column instructionSetTemplate.templateTypeNameRdd is'';
* <br/> comment on column instructionSetTemplate.templateDescription is'';
* <br/> comment on column instructionSetTemplate.templateStepNum is'';
* </per>
* @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;
@Transient
@ApiParam(value ="步骤列表")
private List<LacCommandStackStep> stepList;
}

@ -10,10 +10,8 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
import javax.persistence.*;
import java.util.List;
/**
* @Description :
@ -32,6 +30,12 @@ import javax.persistence.Table;
public class LacLogTask extends BaseBean {
private static final long serialVersionUID = 674009105885048131L;
@Column(name="COMMAND_STACK_RECORD_ID")
@ApiParam(value ="指令集记录ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long commandStackRecordId;
@Column(name="commandStackId")
@ApiParam(value ="指令集ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
@ -50,6 +54,10 @@ public class LacLogTask extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long commandStackTypeId;
@Column(name="COMMAND_STACK_TYPE_NAME_RDD")
@ApiParam(value ="指令集类型名称")
private String commandStackTypeNameRdd;
@Column(name="STEP_ID")
@ApiParam(value ="步骤ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
@ -61,7 +69,7 @@ public class LacLogTask extends BaseBean {
@Column(name="STEP_SEQUENCE")
@ApiParam(value ="步骤顺序")
private String stepSequence;
private Integer stepSequence;
@Column(name="TASK_ID")
@ApiParam(value ="任务ID" , example = "-1")
@ -72,16 +80,25 @@ public class LacLogTask extends BaseBean {
@ApiParam(value ="任务名称")
private String taskNameRdd;
@Column(name="TASK_NAME_TYPE")
@Column(name="TASK_TYPE_ID")
@ApiParam(value ="任务类型")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskNameType;
private Long taskTypeId;
@Column(name="TASK_TYPE_NAME_RDD")
@ApiParam(value ="任务类型")
private String taskTypeNameRdd;
@Column(name="adapterId")
@ApiParam(value ="适配器ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long adapterId;
@Column(name="TASK_DETAIL_ID")
@ApiParam(value ="任务执行记录明细" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskDetailId;
@Lob
@Column(name="INPUT_PARAMETER")
@ApiParam(value ="任务入参")
@ -97,10 +114,17 @@ public class LacLogTask extends BaseBean {
@Column(name="TASK_SPEND")
@ApiParam(value ="任务耗时")
private Integer taskSpend;
private Long taskSpend;
@Column(name="TASK_STATUS")
@ApiParam(value ="任务状态")
private Integer taskStatus;
@Column(name="EXECUTION_DESCRIPTION")
@ApiParam(value ="执行说明")
private String executionDescription;
@Transient
@ApiParam(value ="步骤列表")
private List<LacLogTaskDetail> detailList;
}

@ -33,6 +33,12 @@ public class LacLogTaskDetail extends BaseBean {
private static final long serialVersionUID = -4918694502072594064L;
@Column(name="COMMAND_STACK_RECORD_ID")
@ApiParam(value ="指令集记录ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long commandStackRecordId;
@Column(name="commandStackId")
@ApiParam(value ="指令集ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
@ -48,11 +54,21 @@ public class LacLogTaskDetail extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long stepId;
@Column(name="LOG_TASK_ID")
@ApiParam(value ="任务实例ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long logTaskId;
@Column(name="TASK_ID")
@ApiParam(value ="任务ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskId;
@Column(name="TASK_TYPE_ID")
@ApiParam(value ="任务类型")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskTypeId;
@Column(name="TASK_NAME_TYPE")
@ApiParam(value ="任务类型")
@JsonSerialize(using = ToStringSerializer.class)
@ -71,6 +87,10 @@ public class LacLogTaskDetail extends BaseBean {
@ApiParam(value ="任务结束时间")
private String taskEndTime;
@Column(name="TASK_SPEND")
@ApiParam(value ="任务耗时")
private Long taskSpend;
@Lob
@Column(name="INPUT_PARAMETER")
@ApiParam(value ="任务入参")
@ -91,4 +111,9 @@ public class LacLogTaskDetail extends BaseBean {
@ApiParam(value ="任务出参处理后")
private String outputParameterBody;
@Lob
@Column(name="ERROR_MESSAGE")
@ApiParam(value ="任务执行异常信息")
private String errorMessage;
}

@ -0,0 +1,92 @@
package cn.estsh.i3plus.pojo.lac.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 :
* <per>
* <br/> create table LacSuitCase(
* <br/> sutiCaseId bigint null,
* <br/> sutiCaseNameRdd varchar(50) null,
* <br/> suitCaseCode varchar(50) null,
* <br/> sutiType int null,
* <br/> hardwareType int null,
* <br/> returnMethod int null,
* <br/> timeout int null,
* <br/> retryNum int null,
* <br/> successNum int null,
* <br/> failNum int null,
* <br/> countNum int null,
* <br/> sutiCaseStatus int null
* <br/> );
* <br/>
* <br/> comment on table LacSuitCase is'';
* <br/> comment on column LacSuitCase.sutiCaseId is'id'; 使ID使Code
* <br/> comment on column LacSuitCase.sutiCaseNameRdd is'';
* <br/> comment on column LacSuitCase.suitCaseCode is'';
* <br/> comment on column LacSuitCase.sutiType is'';
* <br/> comment on column LacSuitCase.hardwareType is'';
* <br/> comment on column LacSuitCase.returnMethod is'';
* <br/> comment on column LacSuitCase.timeout is''; ->
* <br/> comment on column LacSuitCase.retryNum is''; ->
* <br/> comment on column LacSuitCase.successNum is''; ->
* <br/> comment on column LacSuitCase.failNum is''; ->
* <br/> comment on column LacSuitCase.countNum is''; ->
* <br/> comment on column LacSuitCase.sutiCaseStatus is'';
* </per>
* @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="SOFTWARE_SUIT_CODE")
@ApiParam(value ="软适配代码")
private String softwareSuitCode;
@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;
}

@ -0,0 +1,159 @@
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;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :
* <per>
* <br/> create table LacSuitTask(
* <br/> taskName varchar(50) null,
* <br/> taskCode varchar(50) null,
* <br/> taskTypeId bigint null,
* <br/> taskTypeNameRdd varchar(50) null,
* <br/> suitCaseId bigint null,
* <br/> suitCaseCode varchar(50) null,
* <br/> suitCaseNameRdd varchar(50) null,
* <br/> successNum int null,
* <br/> failNum int null,
* <br/> countNum int null,
* <br/> taskDescription varchar(255) null
* <br/> );
* <br/> comment on table LacSuitTask is'';
* <br/> comment on column LacSuitTask.taskName is'';
* <br/> comment on column LacSuitTask.taskCode is'';
* <br/> comment on column LacSuitTask.taskTypeId is'id';
* <br/> comment on column LacSuitTask.taskTypeNameRdd is'';
* <br/> comment on column LacSuitTask.suitCaseId is'id';
* <br/> comment on column LacSuitTask.suitCaseCode is'';
* <br/> comment on column LacSuitTask.suitCaseNameRdd is'';
* <br/> comment on column LacSuitTask.successNum is'';
* <br/> comment on column LacSuitTask.failNum is'';
* <br/> comment on column LacSuitTask.countNum is'';
* <br/> comment on column LacSuitTask.taskDescription is'';
* <br/> comment on column LacSuitCase.timeout is''; ->
* <br/> comment on column LacSuitCase.retryNum is''; ->
* </per>
* @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;
public int getTaskTimeoutVal(){
return taskTimeout == null ? -1 : taskTimeout.intValue();
}
@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;
/********************************** 虚拟字段 **********************************/
@Transient
@ApiParam(value ="适配套件")
private LacSuitCase lacSuitCase;
@Transient
@ApiParam(value ="任务实例id")
private Long taskInstanceId;
@Transient
@ApiParam(value ="适配原始参数")
private Object orginParam;
@Transient
@ApiParam(value ="适配转换后参数")
private Object transParam;
@Transient
@ApiParam(value ="原始报文")
private Object orginMessage;
@Transient
@ApiParam(value ="转换后报文")
private Object transMessage;
@Transient
@ApiParam(value ="适配参数")
private List<LacSuitTaskParam> lacSuitTaskParamList;
@Transient
@ApiParam(value ="入参适配")
private List<LacSuitTaskParamAdapter> inputParamAdapterList;
@Transient
@ApiParam(value ="出参适配")
private List<LacSuitTaskParamAdapter> outputParamAdapterList;
}

@ -0,0 +1,95 @@
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;
import javax.persistence.Transient;
/**
* @Description :
* <per>
* <br/> create table LacSuitTaskParam(
* <br/> suitTaskId bigint null,
* <br/> suitTaskName varchar(50) null,
* <br/> suitTaskCode varchar(50) null,
* <br/> paramName varchar(50) null,
* <br/> paramType int null,
* <br/> paramValueType int null,
* <br/> defaultValue varchar(50) null,
* <br/> paramDescrition varchar(255) null
* <br/> );
* <br/> comment on table LacSuitTaskParam is'';
* <br/> comment on column LacSuitTaskParam.suitTaskId is'id';
* <br/> comment on column LacSuitTaskParam.suitTaskName is'';
* <br/> comment on column LacSuitTaskParam.suitTaskCode is'';
* <br/> comment on column LacSuitTaskParam.paramName is'';
* <br/> comment on column LacSuitTaskParam.paramType is'()';
* <br/> comment on column LacSuitTaskParam.paramValueType is'()';
* <br/> comment on column LacSuitTaskParam.defaultValue is'';
* <br/> comment on column LacSuitTaskParam.paramDescrition is'';
* </per>
* @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;
@Transient
@ApiParam(value ="参数值")
private Object value;
}

@ -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 :
* <per>
* <br/> create table LacSuitTaskParamAdapter(
* <br/> sutiTaskId bigint null,
* <br/> suitTaskCode varchar(50) null,
* <br/> suitTaskNameRdd varchar(50) null,
* <br/> paramId bigint null,
* <br/> paramName varchar(50) null,
* <br/> paramType int null,
* <br/> paramValueType int null,
* <br/> defaultValue varchar(50) null,
* <br/> transferParamName varchar(50) null,
* <br/> transferParamValueType int null
* <br/> );
* <br/> comment on table LacSuitTaskParamAdapter is'';
* <br/> comment on column LacSuitTaskParamAdapter.sutiTaskId is'id';
* <br/> comment on column LacSuitTaskParamAdapter.suitTaskCode is'';
* <br/> comment on column LacSuitTaskParamAdapter.suitTaskNameRdd is'';
* <br/> comment on column LacSuitTaskParamAdapter.paramId is'id';
* <br/> comment on column LacSuitTaskParamAdapter.paramName is'';
* <br/> comment on column LacSuitTaskParamAdapter.paramType is'()';
* <br/> comment on column LacSuitTaskParamAdapter.paramValueType is'()';
* <br/> comment on column LacSuitTaskParamAdapter.defaultValue is'';
* <br/> comment on column LacSuitTaskParamAdapter.transferParamName is'';
* <br/> comment on column LacSuitTaskParamAdapter.transferParamValueType is'';
* </per>
* @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;
}

@ -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<LacCommandStackStep, Long> {
}

@ -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<LacCommandStackStepTask, Long> {
}

@ -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<LacCommandStackTemplate, Long> {
}

@ -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<LacSuitCase, Long> {
}

@ -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<LacSuitTaskParamAdapter, Long> {
}

@ -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<LacSuitTaskParam, Long> {
}

@ -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<LacSuitTask, Long> {
}

@ -1,8 +1,12 @@
package cn.estsh.i3plus.pojo.lac.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.lac.bean.*;
import java.util.List;
/**
* @Description :
* @Reference :
@ -15,33 +19,113 @@ public class LacHqlPack {
private LacHqlPack() {
}
public static DdlPackBean packHqlLacTaskType(LacTaskType bean){
public static DdlPackBean packHqlLacTaskType(LacTaskType bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
public static DdlPackBean packHqlLacLogTask(LacLogTask bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(),"commandStackRecordId",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlLacCommandStackTemplate(LacCommandStackTemplate bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(),"templateCode",ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlLacCommandStackStep(LacCommandStackStep bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlLacCommandStackStepTask(LacCommandStackStepTask bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean){
public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
public static DdlPackBean packHqlLacLogTask(LacLogTask bean){
public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean, List<Long> idList) {
DdlPackBean ddlPackBean = packHqlLacSuitTask(bean) ;
DdlPreparedPack.getInPackList(idList,"id",ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
public static DdlPackBean packHqlLacCommandStackType(LacCommandStackType bean){
public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean, List<Long> taskIdList) {
DdlPackBean ddlPackBean = packHqlLacSuitTaskParamAdapter(bean);
DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean){
public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean, List<Long> taskIdList) {
DdlPackBean ddlPackBean = packHqlLacSuitTaskParam(bean);
DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlLacCommandStackType(LacCommandStackType bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
public static DdlPackBean packHqlLacCommandStackStepByTemplateId(Long templateId) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(templateId, "templateId", ddlPackBean);
DdlPreparedPack.getOrderByPack(
new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},
new String[]{"stepSort"},
ddlPackBean
);
return ddlPackBean;
}
}

@ -42,7 +42,7 @@ public class MesConfig extends BaseBean {
@Column(name = "CFG_KEY")
@ApiParam("配置key")
private String cfgkey;
private String cfgKey;
@Column(name = "CFG_VALUE")
@ApiParam("配置value")

@ -31,7 +31,6 @@ public class MesDataObject extends BaseBean {
@ApiParam("对象代码")
private String objectCode;
@Column(name = "OBJECT_NAME")
@ApiParam("对象名称")
private String objectName;
@ -43,4 +42,28 @@ public class MesDataObject extends BaseBean {
@Column(name = "OPERATE_TYPE")
@ApiParam("操作类型")
private Integer operateType;
@Column(name = "FIELD_PK")
@ApiParam("主键")
private String fieldPk;
@Column(name = "READ_FLAG_VALUE")
@ApiParam("读取标志值")
private String readFlagValue;
@Column(name = "FEED_FIELD")
@ApiParam("反馈字段")
private String feedField;
@Column(name = "FEED_VALUE")
@ApiParam("反馈值")
private String feedValue;
@Column(name = "SELF_ADDITION")
@ApiParam("自增列")
private String selfAddition;
@Column(name = "SELF_ADDITION_VALUE")
@ApiParam("自增列值")
private Long selfAdditionValue;
}

@ -53,6 +53,10 @@ public class MesDefectRecord extends BaseBean {
@ApiParam("缺陷位置")
private String defectLocation;
@Column(name = "SIDE_LOCATION")
@ApiParam("面位")
private String sideLocation;
@Column(name="REPAIR_STATUS")
@ApiParam("维修状态")
private Integer repairStatus;

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description:
@ -83,4 +84,7 @@ public class MesDismantleRecord extends BaseBean {
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Transient
private String serialNumber;
}

@ -41,5 +41,5 @@ public class MesFiCfg extends BaseBean {
@Column(name = "FI_QTY")
@ApiParam("首检数量")
private String fiQty;
private Double fiQty;
}

@ -27,7 +27,6 @@ import javax.persistence.Table;
@Api("对象结构")
public class MesObjectCfg extends BaseBean {
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@ -48,18 +47,6 @@ public class MesObjectCfg extends BaseBean {
@ApiParam("列长度")
private String fieldLength;
@Column(name = "FIELD_PK")
@ApiParam("主键标记")
private String fieldPk;
@Column(name = "FEED_FIELD")
@ApiParam("反馈字段")
private String feedField;
@Column(name = "FEED_VALUE")
@ApiParam("反馈值")
private String feedValue;
@Column(name = "POJO_ATTR")
@ApiParam("对应的pojo属性")
private String pojoAttr;

@ -27,6 +27,7 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PLC_CONFIGURE")
@Api("PLC设备信息配置表")
@Deprecated
public class MesPLCConfigure extends BaseBean {
@Column(name = "IP")
@ApiParam("设备ip")

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Author: Wynne.Lu
@ -46,9 +47,9 @@ public class MesPackage extends BaseBean {
@ApiParam("包装规格数量")
private Double packSpecQty;
@Column(name = "NUIT")
@Column(name = "UNIT")
@ApiParam("包装规格数量")
private String nuit;
private String unit;
@Column(name = "LOT_NO")
@ApiParam("批号")
@ -62,6 +63,10 @@ public class MesPackage extends BaseBean {
@ApiParam("是否封箱")
private Integer isSealed;
@Transient
@ApiParam("封箱状态")
private String sealStatus;
@Column(name = "PRINT_STATUS")
@ApiParam("打印状态10未打印 20已打印")
private Integer printStatus;
@ -82,6 +87,9 @@ public class MesPackage extends BaseBean {
@ApiParam("备注")
private String memo;
public MesPackage() {
}
public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) {
this.packageNo = packageNo;
this.partNo = partNo;

@ -23,7 +23,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE")
@Table(name = "MES_PACKAGE_DETAIL")
@Api("包装规格")
public class MesPackageDetail extends BaseBean {

@ -10,10 +10,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.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.List;
/**
@ -58,4 +55,13 @@ public class MesPcnSysUserOffline extends BaseBean {
@ApiParam(value = "部门名称", access = "部门名称")
private String organizeName;
@Column(name="USER_TYPE")
@ApiParam(value ="账号类型(枚举,待定)" , example ="-1")
private Integer userType;
@Lob
@Column(name="MENU_LIST")
@ApiParam(value ="菜单" , access ="菜单")
private String menuList;
}

@ -28,7 +28,6 @@ import javax.persistence.Transient;
@Api("PLC配置表")
public class MesPlc extends BaseBean {
@Column(name = "PLC_CODE")
@ApiParam("PLC代码")
private String plcCode;
@ -65,6 +64,10 @@ public class MesPlc extends BaseBean {
@ApiParam("分组名称")
private String groupName;
@Column(name = "DEVICE")
@ApiParam("驱动")
private String device;
@Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;

@ -67,8 +67,12 @@ public class MesProcessBom extends BaseBean {
@ApiParam(value = "子零件数量", example = "0")
private Double qty;
@Transient
@ApiParam(value = "绑定数量")
private Double boundQty;
@Column(name = "IS_REPEAT")
@ApiParam(value = "是否可重复")
@ApiParam(value = "是否可重复")
private Integer isRepeat;
@Column(name = "IS_CHECK")
@ -83,10 +87,6 @@ public class MesProcessBom extends BaseBean {
@ApiParam(value = "是否绑定关键件")
private Integer isBindKey;
@Column(name = "IS_KEY")
@ApiParam(value = "是否关键件")
private Integer isKey;
@Transient
@ApiParam("是否已绑定")
private Boolean isBind;
@ -95,6 +95,17 @@ public class MesProcessBom extends BaseBean {
@ApiParam("显示颜色")
private String color;
@Transient
@ApiParam("关键件代码")
private String keyBarCode;
@Transient
@ApiParam("产品条码")
private String serialNumber;
public double getBoundQtyVal() {
return this.boundQty == null ? 0.0d : this.boundQty;
}
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :
@ -70,11 +71,11 @@ public class MesProdBindRecord extends BaseBean {
private String supplierCode;
@Column(name = "LOT_NO")
@ApiParam
@ApiParam("关联批次")
private String lotNo;
@Column(name = "IS_FEED")
@ApiParam
@ApiParam("是否投料配置")
private Integer isFeed;
@Column(name = "VERSION")
@ -85,9 +86,9 @@ public class MesProdBindRecord extends BaseBean {
@ApiParam(value = "结果")
private String result;
@Column(name = "IS_KEY")
@ApiParam(value = "是否关键件")
private Integer isKey;
@Column(name = "is_BIND_KEY")
@ApiParam(value = "是否绑定关键件")
private Integer isBindKey;
@Column(name = "ACTION_TYPE")
@ApiParam(value = "动作类型")

@ -30,7 +30,7 @@ public class MesProduceCtgyPicture extends BaseBean {
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品类型代码")
private String produceCtgyCode;
private String produceCategoryCode;
@Column(name = "SIDE_LOCATION")
@ApiParam("面位")
@ -43,4 +43,16 @@ public class MesProduceCtgyPicture extends BaseBean {
@Column(name = "PICTURE_NAME")
@ApiParam("图片名称")
private String pictureName;
@Column(name = "FILE_SIZE")
@ApiParam("FILE_SIZE")
private String fileSize;
@Column(name = "FILE_TYPE_ID")
@ApiParam("FILE_TYPE_ID")
private String fileTypeId;
@Column(name = "FILE_TYPE_NAME")
@ApiParam("FILE_TYPE_NAME")
private String fileTypeName;
}

@ -12,6 +12,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description:
@ -27,12 +28,18 @@ import javax.persistence.Transient;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_SN")
@Api("产品条码表")
public class MesProduceSn extends BaseBean {
public class MesProduceSn extends BaseBean implements Serializable {
private static final long serialVersionUID = 6641051790330191326L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "PRODUCT_SN")
@ApiParam("产品条码")
private String productSn;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@ -62,11 +69,11 @@ public class MesProduceSn extends BaseBean {
private Integer printStatus;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
@ApiParam("生产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
@ApiParam("工")
private String workCellCode;
@Column(name = "ROUTE_CODE")
@ -109,13 +116,9 @@ public class MesProduceSn extends BaseBean {
@ApiParam("客户代码")
private String custCode;
@Column(name = "PACKAGE_SN")
@ApiParam("包装条码")
private String packageSn;
@Column(name = "SN_TYPE")
@ApiParam("条码类型 10=正常 20=首检件")
private String snType;
private Integer snType;
@Column(name = "TRAY")
@ApiParam("托盘号")
@ -149,6 +152,10 @@ public class MesProduceSn extends BaseBean {
return this.printStatus == null ? 0 : this.printStatus;
}
public int getSnTypeVal() {
return this.snType == null ? 0 : this.snType;
}
@Override
public String toString() {
return "MesProduceSn{" +
@ -171,7 +178,8 @@ public class MesProduceSn extends BaseBean {
", workOrderNo='" + workOrderNo + '\'' +
", custSn='" + custSn + '\'' +
", custPartNo='" + custPartNo + '\'' +
", packageSn='" + packageSn + '\'' +
", snType='" + snType + '\'' +
", tray='" + tray + '\'' +
", resultMsg='" + resultMsg + '\'' +
'}';
}

@ -108,6 +108,10 @@ public class MesProduceSnTravel extends BaseBean {
@ApiParam("包装条码")
private String packageSn;
@Column(name="OPERATE_TYPE")
@ApiParam("操作类型")
private Integer operateType;
@Transient
@ApiParam("返回信息")
private String resultMsg;

@ -95,6 +95,10 @@ public class MesQcCheckData extends BaseBean {
private String custCode;
@Transient
@ApiParam("产品条码")
private String serialNumber;
@Transient
@ApiParam("过程质量检测数据")
private List<MesQcCheckStandard> mesQcCheckStandardList;

@ -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;
}
}

@ -36,4 +36,8 @@ public class MesScrap extends BaseBean {
@ApiParam("报废名称")
private String scrapName;
@Column(name = "SCRAP_TYPE")
@ApiParam("报废类型")
private String scrapType;
}

@ -60,10 +60,6 @@ public class MesScrapRecord extends BaseBean {
@ApiParam("工位")
private String workCellCode;
@Column(name = "SCRAP_REASON")
@ApiParam("报废原因")
private String scrapReason;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;

@ -139,15 +139,15 @@ public class MesWorkOrder extends BaseBean {
@Column(name = "FI_QTY")
@ApiParam("首检数量")
private Long fiQty;
private Double fiQty;
@Column(name = "FI_COMPLETE_QTY")
@ApiParam("首检完成数量")
private Long fiCompleteQty;
private Double fiCompleteQty;
@Column(name = "FI_GENERATE_QTY")
@ApiParam("首检生成数量")
private Long fiGenerateQty;
private Double fiGenerateQty;
/********************** 冗余字段 *********************************/
@Transient

@ -136,6 +136,18 @@ public class MesWorkOrderLog extends BaseBean {
@ApiParam("客户订单号")
private String custOrderNo;
@Column(name = "FI_QTY")
@ApiParam("首检数量")
private Double fiQty;
@Column(name = "FI_COMPLETE_QTY")
@ApiParam("首检完成数量")
private Double fiCompleteQty;
@Column(name = "FI_GENERATE_QTY")
@ApiParam("首检生成数量")
private Double fiGenerateQty;
/********************** 冗余字段 *********************************/
@Transient
@ApiParam(value = "工作中心名称")

@ -58,4 +58,18 @@ public class MesProcessBomModel {
this.parentPartNo = parentPartNo;
this.parentPartName = parentPartName;
}
public MesProcessBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) {
this.itemPartNo = itemPartNo;
this.itemPartName = itemPartName;
this.qty = qty;
this.isValid = isValid;
this.isDeleted = isDeleted;
this.organizeCode = organizeCode;
this.isFeed = isFeed;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.parentPartNo = parentPartNo;
this.parentPartName = parentPartName;
}
}

@ -36,15 +36,24 @@ public class MesProdBindRecordModel {
private Integer missQty;
@ApiParam("报废数")
private Integer scrapQty;
@ApiParam("创建时间")
private String createUser;
@ApiParam("创建时间")
private String createDatetime;
@ApiParam("修改人")
private String modifyUser;
@ApiParam("修改时间")
private String modifyDatetime;
@ApiParam("产品条码")
private String serialNumber;
public MesProdBindRecordModel() {
}
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty) {
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty) {
this.id = id;
this.itemPartNo = itemPartNo;
this.itemPartName = itemPartName;
this.qty = qty;
this.isValid = isValid;
this.isDeleted = isDeleted;
this.organizeCode = organizeCode;
@ -72,4 +81,39 @@ public class MesProdBindRecordModel {
this.parentPartNo = parentPartNo;
this.parentPartName = parentPartName;
}
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber) {
this.id = id;
this.itemPartNo = itemPartNo;
this.itemPartName = itemPartName;
this.qty = qty;
this.isValid = isValid;
this.isDeleted = isDeleted;
this.organizeCode = organizeCode;
this.isFeed = isFeed;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.kpSn = kpSn;
this.parentPartNo = parentPartNo;
this.parentPartName = parentPartName;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
this.serialNumber = serialNumber;
}
public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber) {
this.itemPartNo = itemPartNo;
this.qty = qty;
this.isValid = isValid;
this.isDeleted = isDeleted;
this.organizeCode = organizeCode;
this.isFeed = isFeed;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.kpSn = kpSn;
this.parentPartNo = parentPartNo;
this.serialNumber = serialNumber;
}
}

@ -0,0 +1,17 @@
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.MesFiCfg;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesFiCfgRepository extends BaseRepository<MesFiCfg, Long> {
}

@ -220,4 +220,64 @@ public class MesHqlPack {
return packBean;
}
/**
* MES PCN
*
* @param mesRepair
* @return
*/
public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesRepair.getRepairCode())) {
DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean);
}
if (StringUtils.isNotEmpty(mesRepair.getRepairName())) {
DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean);
}
if (mesRepair.getRepairType() != null) {
DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean);
}
return packBean;
}
/**
* MES PCN
*
* @param mesScrap
* @return
*/
public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesScrap.getScrapCode())) {
DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean);
}
if (StringUtils.isNotEmpty(mesScrap.getScrapName())) {
DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean);
}
if (StringUtils.isNotEmpty(mesScrap.getScrapType())) {
DdlPreparedPack.getStringLikerPack(mesScrap.getScrapType(), "scrapType", packBean);
}
return packBean;
}
/**
* MES PCN
*
* @param mesDefectCause
* @return
*/
public static DdlPackBean getMesDefectCause(MesDefectCause mesDefectCause, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesDefectCause.getDcCode())) {
DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcCode(), "dcCode", packBean);
}
if (StringUtils.isNotEmpty(mesDefectCause.getDcName())) {
DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcName(), "dcName", packBean);
}
if (mesDefectCause.getDcType() != null) {
DdlPreparedPack.getNumEqualPack(mesDefectCause.getDcType(), "dcType", packBean);
}
return packBean;
}
}

@ -42,7 +42,7 @@ public class MesConfig extends BaseBean {
@Column(name = "CFG_KEY")
@ApiParam("配置key")
private String cfgkey;
private String cfgKey;
@Column(name = "CFG_VALUE")
@ApiParam("配置value")

@ -0,0 +1,83 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\6 11:45
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CUST_ORDER")
@Api("客户信息")
public class MesCustOrder extends BaseBean {
@Column(name = "ORDER_NO")
@ApiParam("订单号")
private String orderNo;
@Column(name = "ORDER_TYPE")
@ApiParam("订单类型")
private Integer orderType;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "QTY")
@ApiParam("数量")
private Integer qty;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "ORDER_DATE")
@ApiParam("订单日期")
private String orderDate;
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name = "CUST_ORDER_NO")
@ApiParam("客户订单号")
private String custOrderNo;
@Column(name = "SOURCE")
@ApiParam("计划来源")
private String source;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Transient
@ApiParam(value = "订单日期查询用,查询开始日期", example = "2019-01-31 23:59:59")
public String orderTimeStart;
@Transient
@ApiParam(value = "订单日期查询用,查询结束日期", example = "2019-12-31 23:59:59")
public String orderTimeEnd;
}

@ -31,7 +31,6 @@ public class MesDataObject extends BaseBean {
@ApiParam("对象代码")
private String objectCode;
@Column(name = "OBJECT_NAME")
@ApiParam("对象名称")
private String objectName;
@ -43,4 +42,28 @@ public class MesDataObject extends BaseBean {
@Column(name = "OPERATE_TYPE")
@ApiParam("操作类型")
private Integer operateType;
@Column(name = "FIELD_PK")
@ApiParam("主键")
private String fieldPk;
@Column(name = "READ_FLAG_VALUE")
@ApiParam("读取标志值")
private String readFlagValue;
@Column(name = "FEED_FIELD")
@ApiParam("反馈字段")
private String feedField;
@Column(name = "FEED_VALUE")
@ApiParam("反馈值")
private String feedValue;
@Column(name = "SELF_ADDITION")
@ApiParam("自增列")
private String selfAddition;
@Column(name = "SELF_ADDITION_VALUE")
@ApiParam("自增列值")
private Long selfAdditionValue;
}

@ -60,7 +60,7 @@ public class MesDatasource extends BaseBean {
@ApiParam("设备代码")
private String equipmentCode;
@Column(name = "DS_DB_NAME")
@Column(name = "DS_DB_NAMsE")
@ApiParam("数据库名称")
private String dsDbName;

@ -41,6 +41,10 @@ public class MesEquNotifyObjectCfg extends BaseBean {
@ApiParam("对象值")
private String notifyObjectValue;
@Column(name="NOTIFY_OBJECT_VALUE_RDD")
@ApiParam("对象值")
private String notifyObjectValueRdd;
@Column(name="NOTIFY_OBJECT_TYPE")
@ApiParam("对象类型")
private Integer notifyObjectType;

@ -83,4 +83,8 @@ public class MesEquTaskDetail extends BaseBean {
@ApiParam(value = "处理方法")
private String fmCode;
@Transient
@ApiParam(value = "任务类型")
private Integer taskType;
}

@ -53,6 +53,10 @@ public class MesEquTaskPlan extends BaseBean {
@ApiParam("创建提前天数")
private Integer daysInAdvance;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Transient
@ApiParam(value = "生产线")
private String workCenterCode;

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :
@ -65,4 +66,24 @@ public class MesEquTaskRepairRecord extends BaseBean {
@ApiParam("备注")
private String memo;
@Transient
@ApiParam("故障现象")
private String fpName;
@Transient
@ApiParam("故障原因")
private String fcName;
@Transient
@ApiParam("处理方法")
private String fmName;
@Transient
@ApiParam("作业类型")
private String taskTypeName;
@Transient
@ApiParam("整体结果")
private String finalResultName;
}

@ -74,4 +74,16 @@ public class MesEquTaskStandardRecord extends BaseBean {
@ApiParam("备注")
private String memo;
@Transient
@ApiParam("作业类型")
private String taskTypeName;
@Transient
@ApiParam("整体结果")
private String finalResultName;
@Transient
@ApiParam("判定结果")
private String checkResultName;
}

@ -41,5 +41,5 @@ public class MesFiCfg extends BaseBean {
@Column(name = "FI_QTY")
@ApiParam("首检数量")
private String fiQty;
private Double fiQty;
}

@ -27,7 +27,6 @@ import javax.persistence.Table;
@Api("对象结构")
public class MesObjectCfg extends BaseBean {
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@ -48,19 +47,6 @@ public class MesObjectCfg extends BaseBean {
@ApiParam("列长度")
private String fieldLength;
@Column(name = "FIELD_PK")
@ApiParam("主键标记")
private String fieldPk;
@Column(name = "FEED_FIELD")
@ApiParam("反馈字段")
private String feedField;
@Column(name = "FEED_VALUE")
@ApiParam("反馈值")
private String feedValue;
@Column(name = "POJO_ATTR")
@ApiParam("对应的pojo属性")
private String pojoAttr;

@ -27,6 +27,7 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PLC_CONFIGURE")
@Api("PLC设备信息配置表")
@Deprecated
public class MesPLCConfigure extends BaseBean {
@Column(name = "IP")
@ApiParam("设备ip")

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save