Merge remote-tracking branch 'origin/dev' into dev

yun-zuoyi
crish 6 years ago
commit 6567b30178

@ -1,6 +1,6 @@
package cn.estsh.i3plus.pojo.aps.annotation;
import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@ -24,7 +24,7 @@ public @interface FieldAnnotation {
boolean mainkey() default false; // 是否为主键
String defaultValue() default ""; // 字段的默认值
boolean popSearch() default false; // 弹出选择对象时是否显示
EDIT_TYPE editType() default EDIT_TYPE.NONE; // 定义字段的编辑类型
ApsEnumUtil.EDIT_TYPE editType() default ApsEnumUtil.EDIT_TYPE.NONE; // 定义字段的编辑类型
Class<?> multiEnumClass() default Object.class; // 多选枚举的类型。
String typeName() default ""; // 定义字段类型的简单名称,对于多选关联对象时有用。
}

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -28,7 +28,7 @@ public class AssistResourceSetTime extends BaseAPS {
@Column(name="TYPE")
@ApiParam(value ="副资源使用类型")
private USE_TYPE type;
private ApsEnumUtil.USE_TYPE type;
@Column(name="PREV_RESOURCE")
@ApiParam(value ="前资源编码")

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -21,5 +22,6 @@ import javax.persistence.MappedSuperclass;
public class BaseRule extends BaseAPS {
@Column(name="CODE")
@ApiParam(value ="规则编码")
@FieldAnnotation(popSearch = true, mainkey = true)
private String code;
}

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description :BOM
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
@Data
@Api("BOM树")
public class BomTree extends BaseAPS {
@ApiParam(value ="物料类型")
private ApsEnumUtil.MATERIAL_TYPE type;
@ApiParam(value ="备料类型")
private ApsEnumUtil.PREPARE_TYPE prepareType;
@ApiParam(value ="补充类型")
private ApsEnumUtil.REPLENISHMENT_TYPE replType;
@ApiParam(value ="采购提前期")
private String purchaseLeadTime;
@ApiParam(value ="制造提前期")
private String manufLeadTime;
@ApiParam(value ="配送提前期")
private String shipmentLeadTime;
@ApiParam(value ="单位采购量")
private Integer unitPurchase;
@ApiParam(value ="单位制造量")
private Integer unitManuf;
@ApiParam(value ="单位配送量")
private Integer unitShipment;
}

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.enums.DATA_LINK_TYPE;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -22,13 +22,13 @@ import javax.persistence.Table;
@Table(name = "APS_DATA_LINK")
@Api("数据集成数据连接信息")
public class DataLink extends BaseAPS {
@Column(name="NAME")
@Column(name="CODE")
@ApiParam(value ="编码")
private String name;
private String code;
@Column(name="TYPE")
@ApiParam(value ="链接类型")
private DATA_LINK_TYPE type;
private ApsEnumUtil.DATA_LINK_TYPE type;
@Column(name="PATH")
@ApiParam(value ="IP/文件路径")

@ -1,8 +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.DYNAMIC_SET_CALC;
import cn.estsh.i3plus.pojo.aps.enums.DYNAMIC_SET_TYPE;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -29,7 +29,8 @@ public class DynamicSetTime extends BaseAPS {
@Column(name="TYPE")
@ApiParam(value ="应用工作计划类型")
private DYNAMIC_SET_TYPE type;
@FieldAnnotation(defaultValue = "ALL")
private ApsEnumUtil.DYNAMIC_SET_TYPE type;
@Column(name="CONSIDER_ASS_RES")
@ApiParam(value ="是否启用副资源动态设置时间")
@ -41,17 +42,21 @@ public class DynamicSetTime extends BaseAPS {
@Column(name="ASS_RES_CALC")
@ApiParam(value ="副资源动态设置计算方式")
private DYNAMIC_SET_CALC assResCalc;
@FieldAnnotation(defaultValue = "MAX")
private ApsEnumUtil.DYNAMIC_SET_CALC assResCalc;
@Column(name="MATERIAL_CALC")
@ApiParam(value ="物料动态设置时间计算方式")
private DYNAMIC_SET_CALC materialCalc;
@FieldAnnotation(defaultValue = "MAX")
private ApsEnumUtil.DYNAMIC_SET_CALC materialCalc;
@Column(name="STATIC_CALC")
@ApiParam(value ="与静态设置时间计算方式")
private DYNAMIC_SET_CALC staticCalc;
@FieldAnnotation(defaultValue = "MAX")
private ApsEnumUtil.DYNAMIC_SET_CALC staticCalc;
@Column(name="PRIORITY")
@ApiParam(value ="优先级")
@FieldAnnotation(defaultValue = "10")
private int priority;
}

@ -1,9 +1,8 @@
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 cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -39,7 +38,7 @@ public class FieldInfo extends BaseCode {
@Column(name="TYPE")
@ApiParam(value ="类型")
private FIELD_TYPE type;
private ApsEnumUtil.FIELD_TYPE type;
@Column(name="TYPE_NAME")
@ApiParam(value ="类型名称")
@ -73,9 +72,9 @@ public class FieldInfo extends BaseCode {
@ApiParam(value ="表达式")
private String expression;
@Column(name="POSITION")
@ApiParam(value ="位置")
private Integer position;
@Column(name="ORDER_NUMBER")
@ApiParam(value ="序号")
private Integer orderNumber;
@Column(name="MAIN_KEY")
@ApiParam(value ="主键标识")
@ -95,7 +94,7 @@ public class FieldInfo extends BaseCode {
@Column(name="EDIT_TYPE")
@ApiParam(value ="字段编辑类型")
private EDIT_TYPE editType;
private ApsEnumUtil.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.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -20,9 +21,9 @@ import javax.persistence.Table;
@Table(name = "APS_FIELD_SET_RULE")
@Api("属性赋值规则")
public class FieldSetRule extends BaseRule {
@Column(name="BEAN_NAME")
@Column(name="BEAN")
@ApiParam(value ="实体名")
private String beanName;
private ApsEnumUtil.FIELD_SET_BEAN bean;
@Column(name="FILTER")
@ApiParam(value ="筛选")

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-10-22
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="APS_FURNACE_CAPACITY")
@Api("炉容量")
public class FurnaceCapacity extends BaseAPS {
@Column(name="RES_CODES")
@ApiParam(value ="资源编码")
private String resCodes;
@Column(name="STAND_CODE")
@ApiParam(value ="标准工序编码")
private String standCode;
@Column(name="MATERIAL_CODE")
@ApiParam(value ="物料编码")
private String materialCode;
@Column(name="CAPACITY")
@ApiParam(value ="容量限制")
private Double capacity;
}

@ -1,14 +1,20 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EFurnacePlan;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.List;
/**
* @Description :
@ -25,4 +31,11 @@ import javax.persistence.Table;
@Table(name="APS_FURNACE_PLAN")
@Api("炉资源计划")
public class FurnacePlan extends BaseAPS {
@Column(name="CAPACITY")
@ApiParam(value ="已占用的能力")
private Double capacity;
@JsonBackReference
public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EFurnacePlan.WorkPlans); }
}

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-10-22
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="APS_FURNACE_SETTING")
@Api("组炉设置")
public class FurnaceSetting extends BaseAPS {
@Column(name="RES_CODES")
@ApiParam(value ="资源编码")
private String resCodes;
@Column(name="SAME_MATERIAL")
@ApiParam(value ="相同物料组炉")
private Boolean sameMaterial;
@Column(name="SAME_STAND_OPERATION")
@ApiParam(value ="相同标准工序组炉")
private Boolean sameStandOperation;
}

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -34,6 +35,7 @@ public class HeuristicRule extends BaseRule {
@Column(name="INSERT_IDLE")
@ApiParam(value ="是否插入空闲")
@FieldAnnotation(defaultValue = "true")
private Boolean insertIdle;
@Column(name="BATCH_PERIOD")

@ -3,8 +3,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.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.IMPORT_DETAIL_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EImportDetail;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -27,7 +27,8 @@ import javax.persistence.Table;
public class ImportDetail extends BaseAPS {
@Column(name="TYPE")
@ApiParam(value ="导入类型")
private IMPORT_DETAIL_TYPE type;
@FieldAnnotation(defaultValue = "REPLACE")
private ApsEnumUtil.IMPORT_DETAIL_TYPE type;
@Column(name="OUT_NAME")
@ApiParam(value ="外部表名")

@ -1,12 +1,10 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.ORDER_DEL_LIMIT;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.hibernate.annotations.Fetch;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -38,12 +36,13 @@ public class MatCalcRule extends BaseRule {
@Column(name="DEL_AUTO")
@ApiParam(value ="自动删除补充订单")
@FieldAnnotation(defaultValue = "true")
private Boolean delAuto;
@Column(name="DEL_LIMIT")
@ApiParam(value ="删除补充订单限制条件")
@FieldAnnotation(defaultValue = "NONE")
private ORDER_DEL_LIMIT delLimit;
private ApsEnumUtil.ORDER_DEL_LIMIT delLimit;
@Column(name="KEEP_RELATION")
@ApiParam(value ="保持关联")
@ -59,7 +58,7 @@ public class MatCalcRule extends BaseRule {
@Column(name="ASSIGN_LIMIT")
@ApiParam(value ="物料分配制约")
@FieldAnnotation(editType = EDIT_TYPE.MULTI_ENUM, defaultValue = "NONE")
@FieldAnnotation(multiEnumClass = ApsEnumUtil.MATERIAL_ASSIGN_LIMIT.class)
private Integer assignLimit;
}

@ -4,10 +4,8 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.MATERIAL_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.PREPARE_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.REPLENISHMENT_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EMaterial;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -31,18 +29,19 @@ import java.util.List;
@Api("物料")
public class Material extends BaseCode {
@Column(name="TYPE")
@ApiParam(value ="类型")
@ApiParam(value ="物料类型")
@FieldAnnotation(defaultValue = "PRODUCT")
private MATERIAL_TYPE type;
private ApsEnumUtil.MATERIAL_TYPE type;
@Column(name="PREPARE_TYPE")
@ApiParam(value ="备料类型")
@FieldAnnotation(defaultValue = "SELF_MAKE")
private PREPARE_TYPE prepareType;
private ApsEnumUtil.PREPARE_TYPE prepareType;
@Column(name="REPL_TYPE")
@ApiParam(value ="补充类型")
private REPLENISHMENT_TYPE replType;
@FieldAnnotation(defaultValue = "ONEBYONE")
private ApsEnumUtil.REPLENISHMENT_TYPE replType;
@Column(name="PURCHASE_LEAD_TIME")
@ApiParam(value ="采购提前期")

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -39,5 +40,6 @@ public class MaterialSetTime extends BaseAPS {
@Column(name="PRIORITY")
@ApiParam(value ="优先级")
@FieldAnnotation(defaultValue = "10")
private int priority;
}

@ -3,8 +3,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.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EOperInput;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -41,7 +41,8 @@ public class OperInput extends BaseAPS {
@Column(name="CONS_TYPE")
@ApiParam(value ="接续方式")
private CONSTRAINT_TYPE consType;
@FieldAnnotation(defaultValue = "ES")
private ApsEnumUtil.CONSTRAINT_TYPE consType;
@Column(name="MAX_SPACE_TIME")
@ApiParam(value ="最大时间间隔")

@ -3,8 +3,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.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EOperResource;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -29,7 +29,8 @@ import java.util.List;
public class OperResource extends BaseAPS {
@Column(name="USE_TYPE")
@ApiParam(value ="使用类型")
private USE_TYPE useType;
@FieldAnnotation(defaultValue = "MAIN")
private ApsEnumUtil.USE_TYPE useType;
@Column(name="PREV_TIME")
@ApiParam(value ="前设置时间")

@ -3,9 +3,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.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.TAIL_DEAL;
import cn.estsh.i3plus.pojo.aps.holders.EOperation;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -59,7 +58,8 @@ public class Operation extends BaseAPS {
@Column(name="CONS_TYPE")
@ApiParam(value ="接续方式")
private CONSTRAINT_TYPE consType;
@FieldAnnotation(defaultValue = "ES")
private ApsEnumUtil.CONSTRAINT_TYPE consType;
@Column(name="MAX_SPACE_TIME")
@ApiParam(value ="最大时间间隔")

@ -0,0 +1,52 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import java.util.Date;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
@Data
@Api("订单树")
public class OrderTree extends BaseAPS {
@ApiParam(value ="物料编码")
private String material;
@ApiParam(value ="数量")
private Double count;
@ApiParam(value ="最晚结束时刻")
private Date let;
@ApiParam(value ="最早开始时刻计算值")
private Date calcEst;
@ApiParam(value ="最晚结束时刻计算值")
private Date calcLet;
@ApiParam(value ="计划开始")
private Date planBegin;
@ApiParam(value ="计划结束")
private Date planEnd;
@ApiParam(value ="接单日期")
private Date receiveDate;
@ApiParam(value ="优先级")
private Integer priority;
@ApiParam(value ="专料号")
private String specifyMaterialNum;
}

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.enums.CALENDAR_TYPE;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -37,5 +37,5 @@ public class OvertimeCalendar extends BaseAPS {
@Column(name="TYPE")
@ApiParam(value ="类型")
private CALENDAR_TYPE type;
private ApsEnumUtil.CALENDAR_TYPE type;
}

@ -40,11 +40,11 @@ public class ProductOrder extends BaseOrder {
private Date specifyLet;
@Column(name="LOW_EST")
@ApiParam(value ="阶最早开始时间")
@ApiParam(value ="阶最早开始时间")
private Date lowEst;
@Column(name="SPECIFY_LOW_EST")
@ApiParam(value ="指定阶最早开始时间")
@ApiParam(value ="指定阶最早开始时间")
private Date specifyLowEst;
@Column(name="SPECIFY_ROUTING")
@ -53,10 +53,12 @@ public class ProductOrder extends BaseOrder {
@Column(name="RESYNCHRONIZE")
@ApiParam(value ="是否同步")
@FieldAnnotation(defaultValue = "true")
private Boolean resynchronize;
@Column(name="RECALC_COUNT")
@ApiParam(value ="是否重新计算数量")
@FieldAnnotation(defaultValue = "true")
private Boolean recalcCount;
@Column(name="SPECIFY_TOP_ORDER")
@ -92,6 +94,7 @@ public class ProductOrder extends BaseOrder {
@Column(name="AUTO_SUPPLY")
@ApiParam(value ="物料计算时自动补充")
@FieldAnnotation(defaultValue = "true")
private Boolean autoSupply;
@Column(name="PRODUCT_ROUTING_ID")

@ -37,6 +37,7 @@ public class ProductRouting extends BaseCode {
@Column(name="PRIORITY")
@ApiParam(value ="优先级")
@FieldAnnotation(defaultValue = "10")
private Integer priority;
@Column(name="MATERIAL_ID")

@ -52,6 +52,7 @@ public class PurchaseOrder extends BaseOrder {
@Column(name="AUTO_SUPPLY")
@ApiParam(value ="物料计算时自动补充")
@FieldAnnotation(defaultValue = "true")
private Boolean autoSupply;
@JsonIgnore

@ -3,9 +3,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.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.CALENDAR_WEEK;
import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EResCalendar;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -30,12 +29,12 @@ import java.util.List;
public class ResCalendar extends BaseAPS {
@Column(name="RES_CODES")
@ApiParam(value ="资源代码")
@FieldAnnotation(editType = EDIT_TYPE.MULTI_OBJECT, typeName = "Resource")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource")
private String resCodes;
@Column(name="WEEKS")
@ApiParam(value ="星期")
@FieldAnnotation(multiEnumClass = CALENDAR_WEEK.class)
@FieldAnnotation(multiEnumClass = ApsEnumUtil.CALENDAR_WEEK.class)
private Integer weeks;
@Column(name="DATES")
@ -48,6 +47,7 @@ public class ResCalendar extends BaseAPS {
@Column(name="PRIORITY")
@ApiParam(value ="优先级")
@FieldAnnotation(defaultValue = "10")
private Integer priority;
@JsonBackReference

@ -1,12 +1,11 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
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.enums.*;
import cn.estsh.i3plus.pojo.aps.holders.EResource;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -35,14 +34,17 @@ public class Resource extends BaseCode {
@Column(name="TYPE")
@ApiParam(value ="资源类型")
private RESOURCE_TYPE type;
@FieldAnnotation(defaultValue = "MAIN")
private ApsEnumUtil.RESOURCE_TYPE type;
@Column(name="RES_CLASS")
@ApiParam(value ="资源区分")
private RESOURCE_CLASS resClass;
@FieldAnnotation(defaultValue = "SINGLE")
private ApsEnumUtil.RESOURCE_CLASS resClass;
@Column(name="EFFICIENCY")
@ApiParam(value ="生产效率")
@FieldAnnotation(defaultValue = "1.0")
private Double efficiency;
@Column(name="PREV_BUFFER")
@ -79,23 +81,28 @@ public class Resource extends BaseCode {
@Column(name="ROUND_TYPE")
@ApiParam(value ="时间与时间尾数圆整类型")
private TIME_ROUND_TYPE roundType;
@FieldAnnotation(defaultValue = "ROUNDING")
private ApsEnumUtil.TIME_ROUND_TYPE roundType;
@Column(name="EFFICIENCY_EFFECT")
@ApiParam(value ="效率影响类型")
@FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class)
private Integer EfficiencyEffect;
@Column(name="TIME_ROUND")
@ApiParam(value ="时间圆整影响")
@FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class)
private Integer timeRound;
@Column(name="TIME_TAIL_ROUND")
@ApiParam(value ="时间尾数影响")
@FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class)
private Integer timeTailRound;
@Column(name="LOCK_TYPE")
@ApiParam(value ="锁定类型")
private RESOURCE_LOCK_TYPE lockType;
@FieldAnnotation(defaultValue = "NONE")
private ApsEnumUtil.RESOURCE_LOCK_TYPE lockType;
@Column(name="LOCK_TIME")
@ApiParam(value ="锁定时间长度")

@ -3,8 +3,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.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.RULE_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.ERuleDetail;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -28,7 +28,11 @@ public class RuleDetail extends BaseAPS {
@Column(name="TYPE")
@ApiParam(value ="规则类型")
private RULE_TYPE type;
private ApsEnumUtil.RULE_TYPE type;
@Column(name="ORDER_NUMBER")
@ApiParam(value ="序号")
private Integer orderNumber;
@Column(name="RULE_GROUP_ID")
@ApiParam(value ="规则组合ID")

@ -26,11 +26,11 @@ import java.util.Date;
@Api("销售订单")
public class SalesOrder extends BaseOrder {
@Column(name="LOW_EST")
@ApiParam(value ="阶最早开始时间")
@ApiParam(value ="阶最早开始时间")
private Date lowEst;
@Column(name="SPECIFY_LOW_EST")
@ApiParam(value ="指定低价最早开始时间")
@ApiParam(value ="指定底阶最早开始时间")
private Date specifyLowEst;
@Column(name="SPECIFY_LET")

@ -30,6 +30,7 @@ public class ShippingTime extends BaseAPS {
@Column(name="PRIORITY")
@ApiParam(value ="优先级")
@FieldAnnotation(defaultValue = "10")
private Integer priority;
@Column(name="PREV_RES_CODE")

@ -1,10 +1,8 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.enums.DIRECTION;
import cn.estsh.i3plus.pojo.aps.enums.RES_COMB_LOCK_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.RES_COMB_TIME_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.TAIL_DEAL;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -39,13 +37,16 @@ public class StandOperation extends BaseCode {
@Column(name="DIRECTION")
@ApiParam(value ="排程方向")
private DIRECTION direction;
@FieldAnnotation(defaultValue = "POSITIVE")
private ApsEnumUtil.DIRECTION direction;
@Column(name="COMB_TYPE")
@ApiParam(value ="生产组合方式")
private RES_COMB_TIME_TYPE combType;
@FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE")
private ApsEnumUtil.RES_COMB_TIME_TYPE combType;
@Column(name="LOCK_TYPE")
@ApiParam(value ="锁定组合方式")
private RES_COMB_LOCK_TYPE lockType;
@FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE")
private ApsEnumUtil.RES_COMB_LOCK_TYPE lockType;
}

@ -2,7 +2,7 @@ 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 cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -30,11 +30,13 @@ public class SysParam extends BaseAPS {
@Column(name="MAX_INTERRUPT_COUNT")
@ApiParam(value ="最大中断次数")
@FieldAnnotation(defaultValue = "20")
private Integer maxInterruptCount;
@Column(name="TYPE")
@ApiParam(value ="工艺路径有效判断类型")
private ROUTING_VALID_TYPE type;
@FieldAnnotation(defaultValue = "CALC_LET_LT")
private ApsEnumUtil.ROUTING_VALID_TYPE type;
@Column(name="RULE_GROUP_ID")
@ApiParam(value ="规则组id")

@ -3,9 +3,8 @@ package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.WORK_STATUS;
import cn.estsh.i3plus.pojo.aps.enums.WORK_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EWork;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -32,7 +31,7 @@ public class Work extends BaseCode {
@Column(name="WORK_TYPE")
@ApiParam(value ="工作类型")
@FieldAnnotation(modify = false)
private WORK_TYPE workType;
private ApsEnumUtil.WORK_TYPE workType;
@Column(name="count")
@ApiParam(value ="数量")
@ -47,9 +46,9 @@ public class Work extends BaseCode {
@ApiParam(value ="指定资源")
private String specifyResource;
@Column(name="SPECIFY_MANUF_TIME")
@Column(name="SPECIFY_PRODUCE_TIME")
@ApiParam(value ="指定制造时间")
private String specifyManufTime;
private String specifyProduceTime;
@Column(name="SPECIFY_PREV_TIME")
@ApiParam(value ="指定前设置时间")
@ -87,7 +86,7 @@ public class Work extends BaseCode {
@Column(name="WORK_STATUS")
@ApiParam(value ="工作状态")
private WORK_STATUS workStatus;
private ApsEnumUtil.WORK_STATUS workStatus;
@Column(name="PLAN_BEGIN")
@ApiParam(value ="计划开始时间")
@ -105,7 +104,7 @@ public class Work extends BaseCode {
private String planResource;
@Column(name="FIX_SPLIT")
@ApiParam(value ="已分割的工作是否重新分割")
@ApiParam(value ="已分割的工作是否固定")
private Boolean fixSplit;
@Column(name="NEED_PREV_COUNT")

@ -4,9 +4,8 @@ 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 cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -38,7 +37,7 @@ public class WorkPlan extends BaseAPS {
@Column(name="TYPE")
@ApiParam(value ="工作计划类型")
@FieldAnnotation(modify = false, display = false)
private WORK_PLAN_TYPE type;
private ApsEnumUtil.WORK_PLAN_TYPE type;
@Column(name="PREV_SET_BEGIN")
@ApiParam(value ="前设置开始时间")
@ -123,6 +122,11 @@ public class WorkPlan extends BaseAPS {
@FieldAnnotation(property = false)
private Long mainPlanId;
@Column(name="FURNACE_PLAN_ID")
@ApiParam(value ="炉资源计划对象id")
@FieldAnnotation(property = false)
private Long furnacePlanId;
public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }
public void setWork(Work work) {
@ -152,4 +156,11 @@ public class WorkPlan extends BaseAPS {
}
public List<WorkPlan> getAssPlans() { return BeanRelation.list(this, EWorkPlan.AssPlans); }
public FurnacePlan getFurnacePlan() { return BeanRelation.get(this, EWorkPlan.FurnacePlan); }
public void setFurnacePlan(FurnacePlan plan) {
this.furnacePlanId = plan != null ? plan.getId() : 0;
BeanRelation.set(this, EWorkPlan.FurnacePlan, plan);
}
}

@ -3,10 +3,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.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.WORK_RELATION_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EWork;
import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -30,12 +28,12 @@ public class WorkRelation extends BaseAPS {
@Column(name="TYPE")
@ApiParam(value ="关联类型")
@FieldAnnotation(modify = false)
private WORK_RELATION_TYPE type;
private ApsEnumUtil.WORK_RELATION_TYPE type;
@Column(name="CONS_TYPE")
@ApiParam(value ="接续方式")
@FieldAnnotation(modify = false)
private CONSTRAINT_TYPE consType;
private ApsEnumUtil.CONSTRAINT_TYPE consType;
@Column(name="MAX_SPACE_TIME")
@ApiParam(value ="最大间隔时间")

@ -3,9 +3,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.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation;
import cn.estsh.i3plus.pojo.aps.holders.EWorkResource;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -29,7 +28,7 @@ public class WorkResource extends BaseAPS {
@Column(name="USE_TYPE")
@ApiParam(value ="使用类型")
@FieldAnnotation(modify = false)
private USE_TYPE useType;
private ApsEnumUtil.USE_TYPE useType;
@Column(name="PREV_TIME")
@ApiParam(value ="前设置时间")

@ -1,8 +1,9 @@
package cn.estsh.i3plus.pojo.aps.common;
import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import java.sql.Timestamp;
import java.util.*;
import java.util.function.Consumer;
@ -238,36 +239,36 @@ public class BeanInfo {
return beanClasses;
}
public static FIELD_TYPE getFieldType(Class<?> cls) {
FIELD_TYPE type = null;
public static ApsEnumUtil.FIELD_TYPE getFieldType(Class<?> cls) {
ApsEnumUtil.FIELD_TYPE type = null;
if (cls == Boolean.class || cls == boolean.class) {
type = FIELD_TYPE.BOOLEAN;
type = ApsEnumUtil.FIELD_TYPE.BOOLEAN;
} else if (cls == Character.class) {
type = FIELD_TYPE.CHAR;
type = ApsEnumUtil.FIELD_TYPE.CHAR;
} else if (cls == Short.class || cls == short.class) {
type = FIELD_TYPE.SHORT;
type = ApsEnumUtil.FIELD_TYPE.SHORT;
} else if (cls == Integer.class || cls == int.class) {
type = FIELD_TYPE.INTEGER;
type = ApsEnumUtil.FIELD_TYPE.INTEGER;
} else if (cls == Long.class || cls == long.class) {
type = FIELD_TYPE.LONG;
type = ApsEnumUtil.FIELD_TYPE.LONG;
} else if (cls == Double.class || cls == Float.class ||
cls == double.class || cls == float.class) {
type = FIELD_TYPE.DOUBLE;
type = ApsEnumUtil.FIELD_TYPE.DOUBLE;
} else if (cls == String.class) {
type = FIELD_TYPE.STRING;
} else if(cls == Date.class || cls == java.sql.Date.class) {
type = FIELD_TYPE.DATE_TIME;
type = ApsEnumUtil.FIELD_TYPE.STRING;
} else if(cls == Date.class || cls == java.sql.Date.class || cls == Timestamp.class) {
type = ApsEnumUtil.FIELD_TYPE.DATE_TIME;
} else if (cls == DateDuration.class) {
type = FIELD_TYPE.DURATION;
type = ApsEnumUtil.FIELD_TYPE.DURATION;
} else if (Enum.class.isAssignableFrom(cls)) {
type = FIELD_TYPE.ENUM;
type = ApsEnumUtil.FIELD_TYPE.ENUM;
} else if (BaseBean.class.isAssignableFrom(cls)) {
type = FIELD_TYPE.OBJECT;
type = ApsEnumUtil.FIELD_TYPE.OBJECT;
}
return type;
}
public static Class<?> getFieldClass(FIELD_TYPE type) {
public static Class<?> getFieldClass(ApsEnumUtil.FIELD_TYPE type) {
Class<?> cls = null;
switch (type) {
case BOOLEAN:

@ -1,13 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum CALENDAR_TYPE {
ENABLE, // 启用
DISABLE // 停用
}

@ -1,21 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum CALENDAR_WEEK {
MONDAY(1), // 星期一
TUESDAY(2), // 星期二
WEDNESDAY(4), // 星期三
THURSDAY(8), // 星期四
FRIDAY(16), // 星期五
SATURDAY(32), // 星期六
SUNDAY(64); // 星期天
private int _value;
CALENDAR_WEEK(int value) {
_value = value;
}
public int value() {
return this._value;
}
}

@ -1,15 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum CONSTRAINT_TYPE {
ES, // 前工作开始,后工作结束
SS, // 前工作开始,后工作开始
EE, // 前工作结束,后工作结束
SSEE // 前后工作同时开始或同时结束
}

@ -1,8 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum DATA_LINK_TYPE {
CSV,
MYSQL,
ORACLE,
SQLSERVER
}

@ -1,13 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum DIRECTION {
POSITIVE, // 正向
REVERSE // 逆向
}

@ -1,7 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum DYNAMIC_SET_CALC {
MIN, // 取最小值
MAX, // 取最大值
SUM // 求和
}

@ -1,7 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum DYNAMIC_SET_TYPE {
PREV_SET, // 只对前设置影响
POST_SET, // 只对后设置影响
ALL // 对前后设置都产生影响
}

@ -1,28 +0,0 @@
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 // 多选对象,弹出框选择,可以选择全部对象,以*表示选择全部
}

@ -1,10 +1,16 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-10-17
* @Modify:
**/
public enum EFFICIENCY_EFFECT {
NONE(0),
PREV_SET(1),
PRODUCE(2),
POST_SET(4);
PREV_SET(1), // 前设置
PRODUCE(2), // 生产
POST_SET(4); // 后设置
private int _value;

@ -1,27 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum FIELD_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 // 对象集合,不可编辑。
}

@ -1,6 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum IMPORT_DETAIL_TYPE {
REPLACE,
DIFF
}

@ -1,22 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
*
*
*/
public enum MATERIAL_ASSIGN_LIMIT {
NONE(0), // 不进行任何制约
INVENTORY(1), // 库存制约
PURCHASE(2), // 采购制约
PRODUCT(4); // 制造制约
private int _value;
MATERIAL_ASSIGN_LIMIT(int value) {
_value = value;
}
public int value() {
return this._value;
}
}

@ -1,15 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum MATERIAL_TYPE {
PRODUCT, // 成品
HALF_PRODUCT, // 半成品
RAW_MATERIAL, // 原材料
VIRTUAL // 虚拟件
}

@ -1,16 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum ORDER_DEL_LIMIT {
NONE,
NO_PO,
NO_PLAN,
NO_POR,
NO_PPRS
}

@ -1,15 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum PLAN_TYPE {
PREV_SET,
PRODUCE,
POST_SET,
LOCK
}

@ -1,14 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum PREPARE_TYPE {
NO,
SELF_MAKE, // 自制
PURCHASE // 采购
}

@ -1,14 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum REPLENISHMENT_TYPE {
NO,
BATCH, // 批量补充
ONEBYONE // 一对一补充
}

@ -1,22 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum RESOURCE_CHOISE_RULE {
PREV_SET_TIME, // 前设置时间
PRODUCE_TIME, // 生产时间
POST_SET_TIME, // 后设置时间
WORK_WAIT_TIME, // 工作等待时间
RES_BALANCE, // 资源均衡度
SAME_MATERIAL, // 相同物料
SAME_ORDER, // 相同订单
NEARLY_WORK, // 前后工作
POST_RESOURCE, // 后资源制约
SAME_ASS_RESOURCE, // 相同副资源
RESOURCE_PRIORITY; // 资源优先级
}

@ -1,14 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum RESOURCE_CLASS {
LIMITLESS, // 无限能力
SINGLE, // 单能力
BATCH // 炉资源
}

@ -1,7 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum RESOURCE_LOCK_TYPE {
NONE, // 不锁定
PRODUCE_BEGIN, // 与后工序生产开始时刻有关
PRODUCE_END // 与后工序生产结束时刻有关
}

@ -1,13 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum RESOURCE_TYPE {
MAIN, // 主资源
ASS // 副资源
}

@ -1,14 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum RES_COMB_LOCK_TYPE {
KEEP_ORIGIN, // 各自锁定
MAIN_LOCK, // 主资源锁定
MAX_ALL_RESOURCE, // 最大锁定时间
}

@ -1,18 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum RES_COMB_TIME_TYPE {
MAIN_RESOURCE, // 主资源
MAX_ASS_RESOURCE, // 副资源最大值
MIN_ASS_RESOURCE, // 副资源最小值
AVG_ASS_RESOURCE, // 副资源平均值
MAX_ALL_RESOURCE, // 主副资源最大值
MIN_ALL_RESOURCE, // 主副资源最小值
AVG_ALL_RESOURCE // 主副资源平均值
}

@ -1,14 +0,0 @@
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 // 与基准时刻做比较
}

@ -1,8 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum RULE_TYPE {
CANCEL_PLAN,
MAT_CALC,
HEURISTIC,
FIELD_SET
}

@ -1,14 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum TAIL_DEAL {
NODEAL, // 不处理
CEILING, // 向下
PUSHFRONT // 向上
}

@ -1,14 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum TIME_ROUND_TYPE {
UP, // 向上
DOWN, // 向下
ROUNDING // 四舍五入
}

@ -1,18 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :使
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum USE_TYPE {
MAIN, // 主资源
FIRST_ASS, // 第一套副资源
SECOND_ASS, // 第二套副资源
THIRD_ASS, // 第三套副资源
FOURTH_ASS, // 第四套副资源
FIFTH_ASS, // 第五套副资源
SIXTH_ASS // 第六套副资源
}

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

@ -1,13 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum WORK_RELATION_TYPE {
INNER, // 订单内关联
OUTER // 订单间关联
}

@ -1,31 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum WORK_SORT_RULE {
NONE,
ORDER_LET, // 订单交货期
ORDER_PRIORITY, // 订单优先级
ORDER_EST, // 订单最早开始时刻
ORDER_COUNT, // 订单数量
ORDER_RECEIVE_DATE,// 订单接单日期
ORDER_LET_SUB_EST,// 订单交货期与订单最早开始时刻之差
ORDER_SURPLUS, // 订单余裕度
NOPLAN_OPERATION_SIZE,// 残留工序数
REMAIN_PRODUCE_TIME, // 残留生产时间
MIN_OPERATION_REMAIN_TIME,// 最小工序宽裕时间
WORK_LET, // 工作最晚结束时刻
WORK_EST, // 工作最早开始时刻
INVENTORY_RELA, // 订单物品库存量相对值
FIRST_WORK_BEGIN,// 订单首工作上次开始时刻
HAVE_HIGH_WORK, // 订单中含有高级别工作
WORK_RESOURCE_SIZE, // 工作的可用资源数
TOP_ORDER_LET,// 顶层订单的交货期
TOP_ORDER_CODE, // 顶层订单代码
TOP_ORDER_PRIORITY; // 顶层订单优先级
}

@ -1,8 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum WORK_SPLIT_TYPE {
NONE, // 不分割
RATIO, // 按比例分割
COUNT, // 按数量分割
BATCH // 按批量分割
}

@ -1,17 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum WORK_STATUS {
NOPLAN, // 未计划
PLANDONE, // 计划完毕
INDICATIONDONE, // 指示完毕
CONFIRM, // 确认
STARTPRODUCT, // 开始生产
FINISH // 完成
}

@ -1,13 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum WORK_TYPE {
FICTITIOUS, // 虚拟工作
NORMAL // 普通工作
}

@ -1,7 +1,10 @@
package cn.estsh.i3plus.pojo.aps.holders;
import io.swagger.annotations.ApiParam;
public enum EBaseOrder {
Works,
@ApiParam(value = "物料")
Material,
PrevRelations,
PostRelations,

@ -0,0 +1,24 @@
package cn.estsh.i3plus.pojo.aps.model;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* Bom
*/
@Data
public class BomModel {
@Data
public static class Detail {
private String label;
private String name;
}
private String label;
private String name;
private Long id;
private List<Detail> details = new ArrayList<>();
private List<BomModel> children = new ArrayList<>();
}

@ -0,0 +1,19 @@
package cn.estsh.i3plus.pojo.aps.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-11-10
* @Modify:
**/
@Data
public class ExchangeBeanOrderNumber {
@ApiParam(value ="前对象ID")
private Long prevId;
@ApiParam(value ="后对象ID")
private Long postId;
}

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

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

@ -1128,7 +1128,6 @@ public class CommonEnumUtil {
}
}
// 数据有效的静态常量
public static final int VALID = CommonEnumUtil.IS_VAILD.VAILD.getValue();
// 数据未删除的静态常量

@ -1023,7 +1023,8 @@ public class ImppEnumUtil {
MAIL(3, "邮件配置"),
CONTACT(4, "联系人"),
BASIS(5, "基础"),
CONFIG(6, "系统配置");
CONFIG(6, "系统配置"),
LOG(7, "日志配置");
private int value;
private String description;

@ -62,7 +62,8 @@ public class LacEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum HARDWARE_TYPE {
OPC_READ(10, "读OPC"),
OPC_WRITE(20, "写OPC");
OPC_WRITE(20, "写OPC"),
OPC_SUBSCRIPTION(30, "订阅OPC");
private int value;
private String description;
@ -180,4 +181,74 @@ public class LacEnumUtil {
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RETURN_METHOD{
SYNC(1,"同步"),
ASYNC(2,"异步");
private int value;
private String description;
RETURN_METHOD(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 PARAM_VALUE_TYPE{
NUMBER(1,"数字"),
STRING(2,"字符串");
private int value;
private String description;
PARAM_VALUE_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;
}
}
}

@ -13,6 +13,44 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil {
/**
* MesIf
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum IF_CONNECT_TYPE {
DB("10", "DB"),
WEBSERVICE("20", "webservice "),
RESTFUL("30", "restful");
private String value;
private String description;
IF_CONNECT_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.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* Mes
*/

@ -2072,6 +2072,46 @@ public class MesPcnEnumUtil {
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STATION_DATA_TYPE {
TABLE("table", "表格"),
TEXT("text", "正常文本"),
EXP_TEXT("exp_text", "异常文本"),
FILE("file", "定制内容文件"),
IMAGE("image", "图片"),
BUTTON("button", "按钮");
private String value;
private String description;
STATION_DATA_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 (val.equals(values()[i].value)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ONLINE_SEND_TYPE {
@ -2141,6 +2181,44 @@ public class MesPcnEnumUtil {
}
}
/**
* MES_PACKAGE
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PACKAGE_PACKLEVEL {
FIRST(1, "第一层"),
SECOND(2, "第二层"),
THIRD(3, "第三层"),
FOURTH(4, "第四层");
private int value;
private String description;
PACKAGE_PACKLEVEL(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 PRODUCT_PATTERN_PARAMS {

@ -641,7 +641,8 @@ public class WmsEnumUtil {
VDA_STATIC_CS(410,"VDA_STATIC_CS", "静态盘点"),
VDA_CS_SEARCH(420,"VDA_CS_SEARCH", "VDA盘点查询"),
KT_DEFINITE(430,"KT_DEFINITE", "KT合格"),
VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理");
VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"),
KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货");
private int value;
@ -4104,4 +4105,77 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
*
* 10
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CREATE_QC_ORDER_TYPE {
BY_MOVE(10, "按库存移动单"), BY_PART(20, "按物料编号");
private int value;
private String description;
CREATE_QC_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 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;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PACKAGE_OPERATE_TYPE {
PACKAGE_ADD("PACKAGE_ADD", "新增"),
PACKAGE_ADDITIONAL("PACKAGE_ADDITIONAL", "追加"),
PACKAGE_DELETE("PACKAGE_DELETE", "删除"),
PACKAGE_CLEAR("PACKAGE_CLEAR", "清空");
private String value;
private String description;
PACKAGE_OPERATE_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String getDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (val.equals(values()[i].value)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

@ -56,12 +56,16 @@ public class LacCommandStackStep extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long templateId;
@Column(name="STEP_NAME")
@Column(name="TEMPLATE_NAME_RDD")
@ApiParam(value ="模板名称")
private String templateNameRdd;
@Column(name="STEP_NAME")
@ApiParam(value ="步骤名称")
private String stepName;
@Column(name="STEP_CODE")
@ApiParam(value ="模板代码")
@ApiParam(value ="步骤代码")
private String stepCode;
@Column(name="STEP_SORT")
@ -73,7 +77,7 @@ public class LacCommandStackStep extends BaseBean {
private Double stepExecCond;
@Column(name="STEP_DESCRIPTION")
@ApiParam(value ="步骤执行条件")
@ApiParam(value ="步骤描述")
private String stepDescription;
@Transient

@ -81,10 +81,6 @@ public class LacSuitCase extends BaseBean {
@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;

@ -91,7 +91,7 @@ public class LacSuitTaskParamAdapter extends BaseBean {
@Column(name="TRANSFER_PARAM_VALUE_TYPE")
@ApiParam(value ="转换后参数值类型")
private String transferParamValueType;
private Integer transferParamValueType;
@Column(name="DEFAULT_VALUE")
@ApiParam(value ="参数默认值")

@ -67,6 +67,9 @@ public class LacHqlPack {
public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringLikerPack(bean.getTaskName(),"taskName",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bean.getTaskCode(),"taskCode",ddlPackBean);
return ddlPackBean;
}
@ -94,6 +97,8 @@ public class LacHqlPack {
public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bean.getParamType(),"paramType",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean);
return ddlPackBean;
}

@ -40,4 +40,8 @@ public class MesCustomerPart extends BaseBean {
@ApiParam("客户零件号")
private String customerPartNo;
@Column(name = "CUSTOMER_PART_NAME")
@ApiParam("客户零件描述")
private String customerPartName;
}

@ -48,7 +48,7 @@ public class MesPackage extends BaseBean {
private Double packSpecQty;
@Column(name = "UNIT")
@ApiParam("包装规格数量")
@ApiParam("单位")
private String unit;
@Column(name = "LOT_NO")
@ -63,10 +63,6 @@ public class MesPackage extends BaseBean {
@ApiParam("是否封箱")
private Integer isSealed;
@Transient
@ApiParam("封箱状态")
private String sealStatus;
@Column(name = "PRINT_STATUS")
@ApiParam("打印状态10未打印 20已打印")
private Integer printStatus;
@ -87,6 +83,17 @@ public class MesPackage extends BaseBean {
@ApiParam("备注")
private String memo;
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Transient
@ApiParam("封箱状态")
private String sealStatus;
public MesPackage() {
}

@ -43,6 +43,10 @@ public class MesProdPack extends BaseBean {
@ApiParam("产品标签模板")
private String prodLabelTemplate;
@Column(name = "PACK_LABEL_TEMPLATE")
@ApiParam("包装标签模板")
private String packLabelTemplate;
@Column(name = "PACK_LABEL_TEMPLATE2")
@ApiParam("包装标签模板2")
private String packLabelTemplate2;

@ -29,9 +29,13 @@ import javax.persistence.Transient;
@Api("产品条码履历表")
public class MesProduceSnTravel extends BaseBean {
@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;

@ -0,0 +1,64 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @Author: wangjie
* @CreateDate: 2019/9/23 8:06 PM
* @Description:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("产品包装model")
public class ProdPackageModel {
@ApiParam("工单号")
private String workOrderNo;
@ApiParam("生产线")
private String workCenterCode;
@ApiParam("客户代码")
private String custCode;
@ApiParam("班次")
private String shiftCode;
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("单位")
private String unit;
@ApiParam("工单数量")
private Double workOrderQty;
@ApiParam("完成数量")
private Double completeQty;
@ApiParam("包装规格数量")
private Double packSpecQty;
@ApiParam("包装规格")
private String packSpec;
@ApiParam("包装集合")
private List<MesPackage> packageList;
@ApiParam("工单集合")
private List<MesWorkOrder> workOrderList;
}

@ -0,0 +1,29 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/11/12 3:50
* @Description:
**/
@Data
@Api("下拉工步参数对象")
public class StepParamsModel implements Serializable {
private static final long serialVersionUID = -6361645141217616499L;
@ApiParam("参数代码")
private String paramCode;
@ApiParam("参数代码")
private Map<String, Object> paramValues;
}

@ -44,4 +44,13 @@ public class StepPrintSnModel extends MesProduceSn {
@ApiParam("包装规格")
private String packageSpec;
@ApiParam("供应商")
private String supplier;
@ApiParam("客户名称")
private String customerName;
@ApiParam("客户物料名称")
private String customerPartName;
}

@ -0,0 +1,38 @@
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;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\13 11:47
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ACTION_IF")
@Api("动作接口配置")
public class MesActionIf extends BaseBean {
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
}

@ -40,4 +40,7 @@ public class MesCustomerPart extends BaseBean {
@ApiParam("客户零件号")
private String customerPartNo;
@Column(name = "CUSTOMER_PART_NAME")
@ApiParam("客户零件描述")
private String customerPartName;
}

@ -0,0 +1,46 @@
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;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\13 11:43
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_IF")
@Api("接口清单")
public class MesIf extends BaseBean {
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
@Column(name = "IF_NAME")
@ApiParam("接口名称")
private String ifName;
@Column(name = "IF_CONNECT_TYPE")
@ApiParam("交互方式")
private String ifConnectType;
@Column(name = "IF_CLASS")
@ApiParam("接口实现类")
private String ifClass;
}

@ -0,0 +1,46 @@
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;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\13 11:40
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_KEY_ACTION")
@Api("关键动作")
public class MesKeyAction extends BaseBean {
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "ACTION_NAME")
@ApiParam("动作名称")
private String actionName;
@Column(name = "ACTION_DESC")
@ApiParam("动作描述")
private String actionDesc;
@Column(name = "ACTION_CLASS")
@ApiParam("动作关联类")
private String actionClass;
}

@ -63,10 +63,6 @@ public class MesPackage extends BaseBean {
@ApiParam("是否封箱")
private Integer isSealed;
@Transient
@ApiParam("封箱状态")
private String sealStatus;
@Column(name = "PRINT_STATUS")
@ApiParam("打印状态10未打印 20已打印")
private Integer printStatus;
@ -87,4 +83,12 @@ public class MesPackage extends BaseBean {
@ApiParam("备注")
private String memo;
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Transient
@ApiParam("封箱状态")
private String sealStatus;
}

@ -43,14 +43,14 @@ public class MesProdPack extends BaseBean {
@ApiParam("产品标签模板")
private String prodLabelTemplate;
@Column(name = "PACK_LABEL_TEMPLATE2")
@ApiParam("包装标签模板2")
private String packLabelTemplate2;
@Column(name = "PACK_LABEL_TEMPLATE")
@ApiParam("包装标签模板")
private String packLabelTemplate;
@Column(name = "PACK_LABEL_TEMPLATE2")
@ApiParam("包装标签模板2")
private String packLabelTemplate2;
@Column(name = "PACK_LABEL_TEMPLATE3")
@ApiParam("包装标签模板3")
private String packLabelTemplate3;

@ -29,9 +29,13 @@ import javax.persistence.Transient;
@Api("产品条码履历表")
public class MesProduceSnTravel extends BaseBean {
@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;

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

Loading…
Cancel
Save