diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
index 4bc0eba..34ed60e 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
@@ -138,7 +138,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getOrganizeCode(), "organizeCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getAlarmCode(), "alarmCode", packBean);
-        DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getGroupNo(), "groupNo", packBean);
+        DdlPreparedPack.getStringLikerPack(andonBroadCastCfg.getGroupNo(), "groupNo", packBean);
         DdlPreparedPack.getNumEqualPack(andonBroadCastCfg.getIsValid(),"isValid",packBean);
         return packBean;
     }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java
index 48942c2..1c14524 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java
@@ -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 "";   // 定义字段类型的简单名称，对于多选关联对象时有用。
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java
index 43a7d40..21dd6e1 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java
@@ -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 ="前资源编码")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java
index ff8a94e..456ed09 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java
new file mode 100644
index 0000000..a802118
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java
@@ -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;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java
index 3486531..1f2edb3 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java
@@ -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/文件路径")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java
index cef57c9..34c1a8e 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java
@@ -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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
index e155d1e..30da6eb 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
@@ -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;
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java
index 529fbf2..4e3677d 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java
@@ -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 ="筛选")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java
new file mode 100644
index 0000000..cdf99a2
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java
@@ -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;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java
index 0d0a2fa..ae52fcc 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java
@@ -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); }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java
new file mode 100644
index 0000000..af4ca6f
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java
@@ -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;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java
index 69785bf..e65c965 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java
@@ -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")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java
index 0cfc671..872c9e3 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java
@@ -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 ="外部表名")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java
index b350517..31e3941 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java
@@ -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;
 
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
index 7b7ba76..66199b2 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
@@ -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 ="采购提前期")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java
index d437b48..facf9b4 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -39,5 +40,6 @@ public class MaterialSetTime extends BaseAPS {
 
     @Column(name="PRIORITY")
     @ApiParam(value ="优先级")
+    @FieldAnnotation(defaultValue = "10")
     private int priority;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java
index ef5aac9..3f4d265 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java
@@ -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 ="最大时间间隔")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java
index 483dac0..a877505 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java
@@ -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 ="前设置时间")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
index e14540e..5b1d730 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
@@ -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 ="最大时间间隔")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java
new file mode 100644
index 0000000..b1a449a
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java
@@ -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;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java
index 1c17473..884adbd 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java
@@ -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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
index a006cdf..7175b15 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
@@ -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")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java
index 92c4fa2..74a3b60 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java
@@ -37,6 +37,7 @@ public class ProductRouting extends BaseCode {
 
     @Column(name="PRIORITY")
     @ApiParam(value ="优先级")
+    @FieldAnnotation(defaultValue = "10")
     private Integer priority;
 
     @Column(name="MATERIAL_ID")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java
index f784093..21eed1b 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java
@@ -52,6 +52,7 @@ public class PurchaseOrder extends BaseOrder {
 
     @Column(name="AUTO_SUPPLY")
     @ApiParam(value ="物料计算时自动补充")
+    @FieldAnnotation(defaultValue = "true")
     private Boolean autoSupply;
 
     @JsonIgnore
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java
index fd7bd8f..cc889e3 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java
@@ -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
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
index 1e4576f..129a9db 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
@@ -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;
@@ -31,18 +30,22 @@ import java.util.List;
 public class Resource extends BaseCode {
     @Column(name="BOTTLENECK")
     @ApiParam(value ="是否瓶颈资源")
+    @FieldAnnotation(defaultValue = "false")
     private Boolean bottleneck;
 
     @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")
@@ -58,11 +61,11 @@ public class Resource extends BaseCode {
     private Double maxProduceBatch;
 
     @Column(name="TIME_TAIL_ADJUST")
-    @ApiParam(value ="时间尾数调整")
+    @ApiParam(value ="时间尾数圆整")
     private String timeTailAdjust;
 
     @Column(name="TIME_ADJUST")
-    @ApiParam(value ="时间调整")
+    @ApiParam(value ="时间圆整")
     private String timeAdjust;
 
     @Column(name="MAX_PREV_SD_TIME")
@@ -78,24 +81,29 @@ public class Resource extends BaseCode {
     private String maxPostSdTime;
 
     @Column(name="ROUND_TYPE")
-    @ApiParam(value ="时间与时间尾数圆整类型")
-    private TIME_ROUND_TYPE roundType;
+    @ApiParam(value ="圆整类型")
+    @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 ="锁定时间长度")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java
index 7ae8cbf..d019c4d 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java
@@ -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")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java
index 6ad589e..2b22bce 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java
@@ -34,5 +34,5 @@ public class RuleGroup extends BaseAPS {
     private Integer orderNumber;
 
     @JsonBackReference
-    List<RuleDetail> getDetails() { return BeanRelation.list(this, ERuleGroup.Details); }
+    public List<RuleDetail> getDetails() { return BeanRelation.list(this, ERuleGroup.Details); }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java
index dc63b89..66a5337 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java
@@ -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")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java
new file mode 100644
index 0000000..eea1979
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java
@@ -0,0 +1,28 @@
+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 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_SERIAL_NUMBER")
+@Api("取消计划规则")
+public class SerialNumber extends BaseAPS {
+
+    @Column(name="NUMBER")
+    @ApiParam(value ="流水号")
+    private Integer number;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java
index cfffda0..de87386 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java
@@ -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")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
index cabd90a..7e6aeb4 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
@@ -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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java
index 4f68bf4..68e1ddf 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java
@@ -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")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
index 5e68d01..4e64725 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
@@ -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")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
index f3e64de..e0b655c 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
@@ -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);
+    }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java
index e4d86da..13aa2cc 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java
@@ -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 ="最大间隔时间")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java
index 638b6e8..16a577f 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java
@@ -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 ="前设置时间")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java
index e206810..a8cdb93 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java
@@ -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:
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java
index fa3db91..f35fbed 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java
@@ -359,30 +359,31 @@ public class BeanRelation {
      *
      * @param bean
      */
-    public static void delete(BaseBean bean) {
-        if (bean == null) {
-            return;
-        }
-        BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass());
-        List<Enum<?>> ownerSigns = beanInfo.getOwnerHolders();
-        for (Enum<?> holder : ownerSigns) {
-            List<BaseBean> relaBeans = new ArrayList<>(list(bean, holder));
-            for (BaseBean relaBean : relaBeans) {
-                //MemoryManager.delete(relaBean);
-            }
-        }
-
-        List<Enum<?>> normalSigns = beanInfo.getNormalSigns();
-        for (Enum<?> holder : normalSigns) {
-            Enum<?> reverseHolder = beanInfo.getReverseHolder(holder);
-            List<BaseBean> relaBeans = new ArrayList<>(list(bean, holder));
-            for (BaseBean relaBean : relaBeans) {
-                if (reverseHolder != null) {
-                    remove(relaBean, reverseHolder, bean);
-                }
-            }
-        }
-    }
+//    public static void delete(BaseBean bean) {
+//        if (bean == null) {
+//            return;
+//        }
+//        BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass());
+//        List<Enum<?>> ownerSigns = beanInfo.getOwnerHolders();
+//        for (Enum<?> holder : ownerSigns) {
+//            Class<? extends BaseBean> relaCls = beanInfo.getRelationInfo(holder).getBeanInfo().getBeanClass();
+//            List<BaseBean> relaBeans = new ArrayList<>(list(bean, holder));
+//            for (BaseBean relaBean : relaBeans) {
+//                //MemoryManager.delete(relaBean);
+//            }
+//        }
+//
+//        List<Enum<?>> normalSigns = beanInfo.getNormalSigns();
+//        for (Enum<?> holder : normalSigns) {
+//            Enum<?> reverseHolder = beanInfo.getReverseHolder(holder);
+//            List<BaseBean> relaBeans = new ArrayList<>(list(bean, holder));
+//            for (BaseBean relaBean : relaBeans) {
+//                if (reverseHolder != null) {
+//                    remove(relaBean, reverseHolder, bean);
+//                }
+//            }
+//        }
+//    }
 
     /**
      * 按指定路径，递归调用lambda表达式，当lambda表达式返回false或路径存在循环则退出递归。
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_TYPE.java
deleted file mode 100644
index 790195d..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_TYPE.java
+++ /dev/null
@@ -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     // 停用
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_WEEK.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_WEEK.java
deleted file mode 100644
index c89ca37..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_WEEK.java
+++ /dev/null
@@ -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;
-    }
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CONSTRAINT_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CONSTRAINT_TYPE.java
deleted file mode 100644
index 66e085a..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CONSTRAINT_TYPE.java
+++ /dev/null
@@ -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    // 前后工作同时开始或同时结束
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DATA_LINK_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DATA_LINK_TYPE.java
deleted file mode 100644
index 6e031cf..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DATA_LINK_TYPE.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package cn.estsh.i3plus.pojo.aps.enums;
-
-public enum DATA_LINK_TYPE {
-    CSV,
-    MYSQL,
-    ORACLE,
-    SQLSERVER
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DIRECTION.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DIRECTION.java
deleted file mode 100644
index 800ffdd..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DIRECTION.java
+++ /dev/null
@@ -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     // 逆向
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java
deleted file mode 100644
index acf8ac8..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package cn.estsh.i3plus.pojo.aps.enums;
-
-public enum DYNAMIC_SET_CALC {
-    MIN,    // 取最小值
-    MAX,    // 取最大值
-    SUM     // 求和
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java
deleted file mode 100644
index 0453942..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package cn.estsh.i3plus.pojo.aps.enums;
-
-public enum DYNAMIC_SET_TYPE {
-    PREV_SET,   // 只对前设置影响
-    POST_SET,   // 只对后设置影响
-    ALL         // 对前后设置都产生影响
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EDIT_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EDIT_TYPE.java
deleted file mode 100644
index b231839..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EDIT_TYPE.java
+++ /dev/null
@@ -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 // 多选对象，弹出框选择，可以选择全部对象，以*表示选择全部
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java
index 40f73ba..f1da6b4 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java
@@ -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;
 
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/FIELD_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/FIELD_TYPE.java
deleted file mode 100644
index 3677c69..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/FIELD_TYPE.java
+++ /dev/null
@@ -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        // 对象集合，不可编辑。
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/IMPORT_DETAIL_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/IMPORT_DETAIL_TYPE.java
deleted file mode 100644
index a23a8e9..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/IMPORT_DETAIL_TYPE.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package cn.estsh.i3plus.pojo.aps.enums;
-
-public enum IMPORT_DETAIL_TYPE {
-    REPLACE,
-    DIFF
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java
deleted file mode 100644
index e068a04..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java
+++ /dev/null
@@ -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;
-    }
-}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java
deleted file mode 100644
index 89f6644..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java
+++ /dev/null
@@ -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         // 虚拟件
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ORDER_DEL_LIMIT.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ORDER_DEL_LIMIT.java
deleted file mode 100644
index 67e8f31..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ORDER_DEL_LIMIT.java
+++ /dev/null
@@ -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
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java
deleted file mode 100644
index 8218c5b..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java
+++ /dev/null
@@ -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
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PREPARE_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PREPARE_TYPE.java
deleted file mode 100644
index b357026..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PREPARE_TYPE.java
+++ /dev/null
@@ -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    // 采购
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/REPLENISHMENT_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/REPLENISHMENT_TYPE.java
deleted file mode 100644
index e9c78dd..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/REPLENISHMENT_TYPE.java
+++ /dev/null
@@ -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    // 一对一补充
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java
deleted file mode 100644
index deb2079..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java
+++ /dev/null
@@ -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;  // 资源优先级
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java
deleted file mode 100644
index d78c393..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java
+++ /dev/null
@@ -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       // 炉资源
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java
deleted file mode 100644
index cb37621..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package cn.estsh.i3plus.pojo.aps.enums;
-
-public enum RESOURCE_LOCK_TYPE {
-    NONE,       // 不锁定
-    PRODUCE_BEGIN,  // 与后工序生产开始时刻有关
-    PRODUCE_END // 与后工序生产结束时刻有关
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java
deleted file mode 100644
index fa18826..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java
+++ /dev/null
@@ -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     // 副资源
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_LOCK_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_LOCK_TYPE.java
deleted file mode 100644
index e5eb47f..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_LOCK_TYPE.java
+++ /dev/null
@@ -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,   // 最大锁定时间
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_TIME_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_TIME_TYPE.java
deleted file mode 100644
index c9210a1..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_TIME_TYPE.java
+++ /dev/null
@@ -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    // 主副资源平均值
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ROUTING_VALID_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ROUTING_VALID_TYPE.java
deleted file mode 100644
index 47f2580..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ROUTING_VALID_TYPE.java
+++ /dev/null
@@ -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       // 与基准时刻做比较
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RULE_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RULE_TYPE.java
deleted file mode 100644
index 3cfede4..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RULE_TYPE.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package cn.estsh.i3plus.pojo.aps.enums;
-
-public enum RULE_TYPE {
-    CANCEL_PLAN,
-    MAT_CALC,
-    HEURISTIC,
-    FIELD_SET
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TAIL_DEAL.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TAIL_DEAL.java
deleted file mode 100644
index 626e1df..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TAIL_DEAL.java
+++ /dev/null
@@ -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   // 向上
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java
deleted file mode 100644
index 0233691..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java
+++ /dev/null
@@ -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    // 四舍五入
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/USE_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/USE_TYPE.java
deleted file mode 100644
index 68ee62e..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/USE_TYPE.java
+++ /dev/null
@@ -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       // 第六套副资源
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java
deleted file mode 100644
index 2a3afa2..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package cn.estsh.i3plus.pojo.aps.enums;
-
-public enum WORK_PLAN_TYPE {
-    MAIN_PLAN,   // 主资源计划
-    ASS_PLAN,   // 副资源计划
-    BATCH_PLAN  // 炉资源计划
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_RELATION_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_RELATION_TYPE.java
deleted file mode 100644
index 1aa3c33..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_RELATION_TYPE.java
+++ /dev/null
@@ -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       // 订单间关联
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java
deleted file mode 100644
index bdaa913..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java
+++ /dev/null
@@ -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; // 顶层订单优先级
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java
deleted file mode 100644
index 95383b4..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package cn.estsh.i3plus.pojo.aps.enums;
-
-public enum WORK_SPLIT_TYPE {
-    NONE,   // 不分割
-    RATIO,  // 按比例分割
-    COUNT,  // 按数量分割
-    BATCH   // 按批量分割
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_STATUS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_STATUS.java
deleted file mode 100644
index a650ed1..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_STATUS.java
+++ /dev/null
@@ -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          // 完成
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_TYPE.java
deleted file mode 100644
index 1aed997..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_TYPE.java
+++ /dev/null
@@ -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      // 普通工作
-}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java
index e4c5238..ef776fc 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java
@@ -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,
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BomModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BomModel.java
new file mode 100644
index 0000000..59d8be4
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BomModel.java
@@ -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<>();
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ExchangeBeanOrderNumber.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ExchangeBeanOrderNumber.java
new file mode 100644
index 0000000..df4b3cb
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ExchangeBeanOrderNumber.java
@@ -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;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IFurnaceCapacityRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IFurnaceCapacityRepository.java
new file mode 100644
index 0000000..30df84d
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IFurnaceCapacityRepository.java
@@ -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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IFurnaceSettingRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IFurnaceSettingRepository.java
new file mode 100644
index 0000000..76dff1a
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IFurnaceSettingRepository.java
@@ -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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ISerialNumberRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ISerialNumberRepository.java
new file mode 100644
index 0000000..3770ae5
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ISerialNumberRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.SerialNumber;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ISerialNumberRepository extends CrudRepository<SerialNumber, Long> {
+}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
new file mode 100644
index 0000000..b84ac79
--- /dev/null
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
@@ -0,0 +1,1001 @@
+package cn.estsh.i3plus.pojo.base.enumutil;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-11-11
+ * @Modify:
+ **/
+public class ApsEnumUtil {
+
+    /**
+     * 日历中选择星期的多选枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CALENDAR_WEEK {
+        MONDAY(1, "星期一"),
+        TUESDAY(2, "星期二"),
+        WEDNESDAY(4, "星期三"),
+        THURSDAY(8, "星期四"),
+        FRIDAY(16, "星期五"),
+        SATURDAY(32, "星期六"),
+        SUNDAY(64, "星期天");
+
+        private int value;
+        private String description;
+
+        CALENDAR_WEEK(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 MATERIAL_TYPE {
+        PRODUCT("PRODUCT", "成品"),
+        HALF_PRODUCT("HALF_PRODUCT", "半成品"),
+        RAW_MATERIAL("RAW_MATERIAL", "原材料"),
+        VIRTUAL("VIRTUAL", "虚拟件");
+
+        private String value;
+        private String description;
+
+        MATERIAL_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 备料类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PREPARE_TYPE {
+        NO("NO", "不备料"),
+        SELF_MAKE("SELF_MAKE", "自制"),  // 自制
+        PURCHASE("PURCHASE", "采购");    // 采购
+
+        private String value;
+        private String description;
+
+        PREPARE_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 补充类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REPLENISHMENT_TYPE {
+        NO("NO", "不补充"),
+        BATCH("BATCH", "批量补充"),
+        ONEBYONE("ONEBYONE", "一对一补充");
+
+        private String value;
+        private String description;
+
+        REPLENISHMENT_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 物料分配限制
+     * 主要考虑输出订的最晚计算时间不能晚于输入的最晚计算时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MATERIAL_ASSIGN_LIMIT {
+        INVENTORY(1, "库存制约"),
+        PURCHASE(2, "采购制约"),
+        PRODUCT(4, "制造制约");
+
+        private int value;
+        private String description;
+
+        MATERIAL_ASSIGN_LIMIT(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 DIRECTION {
+        POSITIVE("POSITIVE", "正向"),
+        REVERSE("REVERSE", "逆向");
+
+        private String value;
+        private String description;
+
+        DIRECTION(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 尾数处理方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TAIL_DEAL {
+        NODEAL("NODEAL", "不处理"),
+        CEILING("CEILING", "向下"),
+        PUSHFRONT("PUSHFRONT", "向上");
+
+        private String value;
+        private String description;
+
+        TAIL_DEAL(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 则管理中规则的类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RULE_TYPE {
+        CANCEL_PLAN("CANCEL_PLAN", "取消计划"),
+        MAT_CALC("MAT_CALC", "物料运算"),
+        HEURISTIC("HEURISTIC", "排程运算"),
+        FIELD_SET("FIELD_SET", "字段赋值");
+
+        private String value;
+        private String description;
+
+        RULE_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 资源区分
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RESOURCE_CLASS {
+        LIMITLESS("LIMITLESS", "无限能力"),
+        SINGLE("SINGLE", "单能力"),
+        BATCH("BATCH", "炉资源");
+
+        private String value;
+        private String description;
+
+        RESOURCE_CLASS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 锁定时间的取值方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RESOURCE_LOCK_TYPE {
+        NONE("NONE", "不锁定"),       //
+        PRODUCE_BEGIN("PRODUCE_BEGIN", "后工序生产开始时刻"),
+        PRODUCE_END("PRODUCE_END", "后工序生产结束时刻");
+
+        private String value;
+        private String description;
+
+        RESOURCE_LOCK_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 资源类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RESOURCE_TYPE {
+        MAIN("MAIN", "主资源"),
+        ASS("ASS", "副资源");
+
+        private String value;
+        private String description;
+
+        RESOURCE_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 预置的资源选择规则
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RESOURCE_CHOISE_RULE {
+        PREV_SET_TIME("PREV_SET_TIME", "前设置时间"),
+        PRODUCE_TIME("PRODUCE_TIME", "生产时间"),
+        POST_SET_TIME("POST_SET_TIME", "后设置时间"),
+        WORK_WAIT_TIME("WORK_WAIT_TIME", "工作等待时间"),
+        RES_BALANCE("RES_BALANCE", "资源均衡度"),
+        SAME_MATERIAL("SAME_MATERIAL", "相同物料"),
+        SAME_ORDER("SAME_ORDER", "相同订单"),
+        NEARLY_WORK("NEARLY_WORK", "前后工作"),
+        POST_RESOURCE("POST_RESOURCE", "后资源制约"),
+        SAME_ASS_RESOURCE("SAME_ASS_RESOURCE", "相同副资源"),
+        RESOURCE_PRIORITY("RESOURCE_PRIORITY", "资源优先级");
+
+        private String value;
+        private String description;
+
+        RESOURCE_CHOISE_RULE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 订单删除限制
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_DEL_LIMIT {
+        NONE("NONE", "不限制"),
+        NO_PO("NO_PO", "未计划"),
+        NO_PLAN("NO_PLAN", "计划完毕"),
+        NO_POR("NO_POR", ""),
+        NO_PPRS("NO_PPRS", "");
+
+        private String value;
+        private String description;
+
+        ORDER_DEL_LIMIT(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 锁定时间计算方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RES_COMB_LOCK_TYPE {
+        KEEP_ORIGIN("KEEP_ORIGIN", "各自锁定"),
+        MAIN_LOCK("MAIN_LOCK", "主资源锁定"),
+        MAX_ALL_RESOURCE("MAX_ALL_RESOURCE", "最大锁定时间");
+
+        private String value;
+        private String description;
+
+        RES_COMB_LOCK_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 生产时间计算方法
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RES_COMB_TIME_TYPE {
+        MAIN_RESOURCE("MAIN_RESOURCE", "主资源"),
+        MAX_ASS_RESOURCE("MAX_ASS_RESOURCE", "副资源最大值"),
+        MIN_ASS_RESOURCE("MIN_ASS_RESOURCE", "副资源最小值"),
+        AVG_ASS_RESOURCE("AVG_ASS_RESOURCE", "副资源平均值"),
+        MAX_ALL_RESOURCE("MAX_ALL_RESOURCE", "主副资源最大值"),
+        MIN_ALL_RESOURCE("MIN_ALL_RESOURCE", "主副资源最小值"),
+        AVG_ALL_RESOURCE("AVG_ALL_RESOURCE", "主副资源平均值");
+
+        private String value;
+        private String description;
+
+        RES_COMB_TIME_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 时间圆整方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TIME_ROUND_TYPE {
+        UP("UP", "向上"),
+        DOWN("DOWN", "向下"),
+        ROUNDING("ROUNDING", "四舍五入");
+
+        private String value;
+        private String description;
+
+        TIME_ROUND_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 工艺路径有效性判断类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTING_VALID_TYPE {
+        ORDER_CALC_LET("ORDER_CALC_LET", "与订单的最晚结束时刻计算值做比较"),
+        CALC_LET_LT("CALC_LET_LT", "与最晚结束时刻计算值-提前期做比较"),
+        BASE_TIME("BASE_TIME", "与基准时刻做比较");
+
+        private String value;
+        private String description;
+
+        ROUTING_VALID_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 使用类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum USE_TYPE {
+        MAIN("MAIN", "主资源"),
+        FIRST_ASS("FIRST_ASS", "第一套副资源"),
+        SECOND_ASS("SECOND_ASS", "第二套副资源"),
+        THIRD_ASS("THIRD_ASS", "第三套副资源"),
+        FOURTH_ASS("FOURTH_ASS", "第四套副资源"),
+        FIFTH_ASS("FIFTH_ASS", "第五套副资源"),
+        SIXTH_ASS("SIXTH_ASS", "第六套副资源");
+
+        private String value;
+        private String description;
+
+        USE_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 工作计划类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_PLAN_TYPE {
+        MAIN_PLAN("MAIN_PLAN", "主资源计划"),
+        ASS_PLAN("ASS_PLAN", "副资源计划"),
+        BATCH_PLAN("BATCH_PLAN", "炉资源计划");
+
+        private String value;
+        private String description;
+
+        WORK_PLAN_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 工作关联类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_RELATION_TYPE {
+        INNER("INNER", "订单内关联"),
+        OUTER("OUTER", "订单间关联");
+
+        private String value;
+        private String description;
+
+        WORK_RELATION_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 工作排序规则
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_SORT_RULE {
+        NONE("NONE", "非内置"),
+        ORDER_LET("ORDER_LET", "订单交货期"),
+        ORDER_PRIORITY("ORDER_PRIORITY", "订单优先级"),
+        ORDER_EST("ORDER_EST", "订单最早开始时刻"),
+        ORDER_COUNT("ORDER_COUNT", "订单数量"),
+        ORDER_RECEIVE_DATE("ORDER_RECEIVE_DATE", "订单接单日期"),
+        ORDER_LET_SUB_EST("ORDER_LET_SUB_EST", "订单交货期与订单最早开始时刻之差"),
+        ORDER_SURPLUS("ORDER_SURPLUS", "订单余裕度"),
+        NOPLAN_OPERATION_SIZE("NOPLAN_OPERATION_SIZE", "残留工序数"),
+        REMAIN_PRODUCE_TIME("REMAIN_PRODUCE_TIME", "残留生产时间"),
+        MIN_OPERATION_REMAIN_TIME("MIN_OPERATION_REMAIN_TIME", "最小工序宽裕时间"),
+        WORK_LET("WORK_LET", "工作最晚结束时刻"),
+        WORK_EST("WORK_EST", "工作最早开始时刻"),
+        INVENTORY_RELA("INVENTORY_RELA", "订单物品库存量相对值"),
+        FIRST_WORK_BEGIN("FIRST_WORK_BEGIN", "订单首工作上次开始时刻"),
+        HAVE_HIGH_WORK("HAVE_HIGH_WORK", "订单中含有高级别工作"),
+        WORK_RESOURCE_SIZE("WORK_RESOURCE_SIZE", "工作的可用资源数"),
+        TOP_ORDER_LET("TOP_ORDER_LET", "顶层订单的交货期"),
+        TOP_ORDER_CODE("TOP_ORDER_CODE", "顶层订单代码"),
+        TOP_ORDER_PRIORITY("TOP_ORDER_PRIORITY", "顶层订单优先级");
+
+        private String value;
+        private String description;
+
+        WORK_SORT_RULE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 工作分割类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_SPLIT_TYPE {
+        NONE("NONE", "不分割"),
+        RATIO("RATIO", "按比例分割"),
+        COUNT("COUNT", "按数量分割"),
+        BATCH("BATCH", "按批量分割");
+
+        private String value;
+        private String description;
+
+        WORK_SPLIT_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 工作状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_STATUS {
+        NOPLAN("NOPLAN", "未计划"),
+        PLANDONE("PLANDONE", "计划完毕"),
+        INDICATIONDONE("INDICATIONDONE", "指示完毕"),
+        CONFIRM("CONFIRM", "确认"),
+        STARTPRODUCT("STARTPRODUCT", "开始生产"),
+        FINISH("FINISH", "完成");
+
+        private String value;
+        private String description;
+
+        WORK_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 工作种类
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_TYPE {
+        FICTITIOUS("FICTITIOUS", "虚拟工作"),
+        NORMAL("NORMAL", "普通工作");
+
+        private String value;
+        private String description;
+
+        WORK_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 动态设置时间影响类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DYNAMIC_SET_TYPE {
+        PREV_SET("PREV_SET", "只对前设置影响"),
+        POST_SET("POST_SET", "只对后设置影响"),
+        ALL("ALL", "对前后设置都产生影响");
+
+        private String value;
+        private String description;
+
+        DYNAMIC_SET_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 动态设置事件取值方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DYNAMIC_SET_CALC {
+        MIN("MIN", "取最小值"),
+        MAX("MAX", "取最大值"),
+        SUM("SUM", "求和");
+
+        private String value;
+        private String description;
+
+        DYNAMIC_SET_CALC(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 接续方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CONSTRAINT_TYPE {
+        ES("ES", "前工作开始，后工作结束"),
+        SS("SS", "前工作开始，后工作开始"),
+        EE("EE", "前工作结束，后工作结束"),
+        SSEE("SSEE", "前后工作同时开始或同时结束");
+
+        private String value;
+        private String description;
+
+        CONSTRAINT_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 加班日历类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CALENDAR_TYPE {
+        ENABLE("ENABLE", "启用"),
+        DISABLE("DISABLE", "停用");
+
+        private String value;
+        private String description;
+
+        CALENDAR_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 导入类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IMPORT_DETAIL_TYPE {
+        REPLACE("REPLACE", "替代导入"),
+        DIFF("DIFF", "差分导入");
+
+        private String value;
+        private String description;
+
+        IMPORT_DETAIL_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 字段赋值对象
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FIELD_SET_BEAN {
+        Material("Material", "物料"),
+        ProductRouting("ProductRouting", "工艺路线"),
+        Operation("Operation", "工序"),
+        OperInput("OperInput", "工序输入"),
+        OperOutput("OperOutput", "工序输出"),
+        OperResource("OperResource", "工序资源"),
+        StandOperation("StandOperation", "标准工序"),
+        SalesOrder("SalesOrder", "销售订单"),
+        ProductOrder("ProductOrder", "生产订单"),
+        PurchaseOrder("PurchaseOrder", "采购订单"),
+        Inventory("Inventory", "库存"),
+        Work("Work", "工作"),
+        WorkInput("WorkInput", "工作输入"),
+        WorkOutput("WorkOutput", "工作输出"),
+        WorkResource("WorkResource", "工作资源"),
+        WorkRelation("WorkRelation", "工作关联");
+
+        private String value;
+        private String description;
+
+        FIELD_SET_BEAN(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 计划类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLAN_TYPE {
+        PREV_SET("", "前设置"),
+        PRODUCE("", "生产"),
+        POST_SET("", "后设置"),
+        LOCK("", "锁定");
+
+        private String value;
+        private String description;
+
+        PLAN_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 数据连接类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATA_LINK_TYPE {
+        CSV("CSV", "csv文件"),
+        MYSQL("MYSQL", "MySql"),
+        ORACLE("ORACLE", "Oracle"),
+        SQLSERVER("SQLSERVER", "SqlServer");
+
+        private String value;
+        private String description;
+
+        DATA_LINK_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 字段的编辑类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EDIT_TYPE {
+        NONE("NONE", "未知"),
+        BOOLEAN("BOOLEAN", "布尔, 开关编辑"),
+        CHAR("CHAR", "字符, 文本框编辑"),
+        SHORT("SHORT", "短整型, 数字编辑"),
+        INTEGER("INTEGER", "整型, 数字编辑"),
+        LONG("LONG", "长整型, 数字编辑"),
+        DOUBLE("DOUBLE", "浮点型, 文本框编辑"),
+        DATE("DATE", "日期类型(2019-09-16)"),
+        TIME("TIME", "时间类型(17:35:30)"),
+        DATE_TIME("DATE_TIME", "日期时间类型(2019-09-16 17:35:30)"),
+        DURATION("DURATION", "时间段(1H),文本框编辑"),
+        ENUM("ENUM", "枚举,下拉选择"),
+        MULTI_ENUM("MULTI_ENUM", "多选枚举， 下拉多选"),
+        STRING("STRING", "字符串，文本框编辑"),
+        OBJECT("OBJECT", "关联对象，下来选择关联对象的Code值"),
+        LIST("LIST", "对象集合，不可编辑。"),
+        MULTI_OBJECT("MULTI_OBJECT", "多选对象，弹出框选择，可以选择全部对象，以*表示选择全部");
+
+        private String value;
+        private String description;
+
+        EDIT_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 字段类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FIELD_TYPE {
+        NONE("NONE", "未知"),
+        BOOLEAN("BOOLEAN", "布尔"),
+        CHAR("CHAR", "字符"),
+        SHORT("SHORT", "短整型"),
+        INTEGER("INTEGER", "整型"),
+        LONG("LONG", "长整型"),
+        DOUBLE("DOUBLE", "浮点型"),
+        DATE("DATE", "日期类型(2019-09-16)"),
+        TIME("TIME", "时间类型(17:35:30)"),
+        DATE_TIME("DATE_TIME", "日期时间类型(2019-09-16 17:35:30)"),
+        DURATION("DURATION", "时间段(1H)"),
+        ENUM("ENUM", "枚举"),
+        MULTI_ENUM("MULTI_ENUM", "多选枚举"),
+        STRING("STRING", "字符串"),
+        OBJECT("OBJECT", "关联对象，下来选择关联对象的Code值"),
+        LIST("LIST", "对象集合，不可编辑。");
+
+        private String value;
+        private String description;
+
+        FIELD_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index a5b5ece..a61cf7b 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -12,8 +12,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class MesEnumUtil {
 
-
-
     /**
      * MesIf  交互方式
      */
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index 38268c7..59dfd14 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -13,6 +13,43 @@ import org.apache.commons.lang3.StringUtils;
 public class MesPcnEnumUtil {
 
     /**
+     * 接口同步状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IF_SYNC_STATUS {
+
+        NO_SYNC(10, "未同步"),
+        ALREADY_SYNC(20, "已同步"),
+        FAIL_SYNC(30, "同步失败");
+
+        private int value;
+        private String description;
+
+        IF_SYNC_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;
+        }
+    }
+
+    /**
      * 条码类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 53f325f..c06ad50 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -755,7 +755,8 @@ public class WmsEnumUtil {
         QC("QC", "质检"),
         CS("CS", "盘点"),
         DR("DR", "直送收货"),
-        AMPR("AMPR", "AMP拉动收货");
+        AMPR("AMPR", "AMP拉动收货"),
+        OPENING("OPENING", "开口合同");
 
         private String value;
         private String description;
@@ -1697,7 +1698,8 @@ public class WmsEnumUtil {
         CHECK_DETAILS(40, "查看明细"),
         DELETE_DETAILS(50, "明细(删除)"),
         CLEAR_DETAILS(60, "明细（清空）"),
-        CUSTOM_BUTTON(70, "自定义按钮");
+        CUSTOM_BUTTON(70, "自定义按钮"),
+        MAGNIFIER(80, "放大镜");
 
         private int value;
         private String description;
@@ -4178,4 +4180,51 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 客户发运 发运数量控制
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SHIPP_QTY_CONTROL {
+        LESS_SEND(10, "少发"),
+        MANY_SEND(20, "多发"),
+        CONSISTENT(30, "一致"),
+        NO_CONTROL(40, "不控制");
+
+        private int value;
+        private String description;
+
+        SHIPP_QTY_CONTROL(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static SHIPP_QTY_CONTROL codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java
index 5fdefdd..620fa7d 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java
@@ -25,7 +25,6 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
      * 字符串，并且没有赋值，该方法将自动设置为uuid值
      * @param item
      *            持久对象，或者对象集合
-     * @throws Exception
      */
     T insert(T item);
 
@@ -36,7 +35,6 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
      * @param item
      *            持久对象，或者对象集合
      * @param initParam 是否需要初始化值为null的属性，
-     * @throws Exception
      */
     T insert(T item,boolean initParam);
 
@@ -45,7 +43,6 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
      *
      * @param item
      *            持久对象，或者对象集合
-     * @throws Exception
      */
     void update(Object... item);
 
@@ -73,7 +70,6 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
      * @param qlString 基于jpa标准的ql语句
      * @param values ql中的T参数值
      * @return 返回执行后受影响的数据个数
-     * @throws Exception
      */
     int executeUpdate(String qlString, List<Object> values);
 
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java
new file mode 100644
index 0000000..19bbed9
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java
@@ -0,0 +1,103 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.math.BigDecimal;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\14 19:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_DISMENTLE_RECORD")
+@Api("物料拆解表")
+public class IfDismantleRecord extends BaseBean {
+
+    @Column(name = "DISMANTLE_ID")
+    @ApiParam("拆解编号")
+    private String dismantleId;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "PARENT_PART_NO")
+    @ApiParam("产品物料编码")
+    private String parentPartNo;
+
+    @Column(name = "PARENT_PART_NAME")
+    @ApiParam("产品物料名称")
+    private String parentPartName;
+
+    @Column(name = "SN")
+    @ApiParam("产品条码")
+    private String sn;
+
+    @Column(name = "QTY")
+    @ApiParam("产品数量")
+    private Integer qty;
+
+    @Column(name = "DISMANTLE_QTY")
+    @ApiParam("拆解数")
+    private BigDecimal dismantleQty;
+
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("子物料编码")
+    private String itemPartNo;
+
+    @Column(name = "ITEM_PART_NAME")
+    @ApiParam("子物料名称")
+    private String itemPartName;
+
+    @Column(name = "OK_QTY")
+    @ApiParam("合格数")
+    private BigDecimal okQty;
+
+    @Column(name = "MISS_QTY")
+    @ApiParam("缺失数")
+    private BigDecimal missQty;
+
+    @Column(name = "SCRAP_QTY")
+    @ApiParam("报废数")
+    private BigDecimal scrapQty;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("批次")
+    private String lotNo;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java
new file mode 100644
index 0000000..afecb21
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java
@@ -0,0 +1,94 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\15 10:01
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_PACKAGE_DETAIL")
+@Api("包装明细表")
+public class IfPackageDetail extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装条码")
+    private String packageNo;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("包装批次")
+    private String lotNo;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private String qty;
+
+    @Column(name = "PACKAGE_NO2")
+    @ApiParam("包装编号2")
+    private String packageNo2;
+
+    @Column(name = "PACKAGE_NO3")
+    @ApiParam("包装编号3")
+    private String packageNo3;
+
+    @Column(name = "PACKAGE_NO4")
+    @ApiParam("包装编号4")
+    private String packageNo4;
+
+    @Column(name = "ACTION_USER")
+    @ApiParam("操作人")
+    private String actionUser;
+
+    @Column(name = "ACTION_DATE_TIME")
+    @ApiParam("操作时间")
+    private String actionDateTime;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java
new file mode 100644
index 0000000..a53a8b5
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java
@@ -0,0 +1,86 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\15 10:12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_PRODUCT_OFF_LINE")
+@Api("生产报工表")
+public class IfProductOffLine extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装条码")
+    private String packageNo;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private String qty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    private String unit;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("生产批次")
+    private String lotNo;
+
+    @Column(name = "FIX_LOT_NO")
+    @ApiParam("特殊批次")
+    private String fixLotNo;
+
+    @Column(name = "ACTION_USER")
+    @ApiParam("操作人")
+    private String actionUser;
+
+    @Column(name = "ACTION_DATE_TIME")
+    @ApiParam("操作时间")
+    private String actionDateTime;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java
new file mode 100644
index 0000000..c1c1a82
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java
@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: 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;
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java
index 33b2402..5b9c854 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java
@@ -12,6 +12,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.math.BigDecimal;
 
 /**
  * @Description:
@@ -59,7 +60,7 @@ public class MesDismantleRecord extends BaseBean {
 
     @Column(name = "DISMANTLE_QTY")
     @ApiParam("拆解数")
-    private Integer dismantleQty;
+    private BigDecimal dismantleQty;
 
     @Column(name = "ITEM_PART_NO")
     @ApiParam("子物料编码")
@@ -71,15 +72,15 @@ public class MesDismantleRecord extends BaseBean {
 
     @Column(name = "OK_QTY")
     @ApiParam("合格数")
-    private Integer okQty;
+    private BigDecimal okQty;
 
     @Column(name = "MISS_QTY")
     @ApiParam("缺失数")
-    private Integer missQty;
+    private BigDecimal missQty;
 
     @Column(name = "SCRAP_QTY")
     @ApiParam("报废数")
-    private Integer scrapQty;
+    private BigDecimal scrapQty;
 
     @Column(name = "MEMO")
     @ApiParam("备注")
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
index 332fe9f..466ead5 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
@@ -55,6 +55,10 @@ public class MesPackage extends BaseBean {
     @ApiParam("批号")
     private String lotNo;
 
+    @Column(name = "FIX_LOT_NO")
+    @ApiParam("特殊批号")
+    private String fixLotNo;
+
     @Column(name = "PACK_SPEC")
     @ApiParam("包装规格")
     private String packSpec;
@@ -91,8 +95,25 @@ public class MesPackage extends BaseBean {
     @ApiParam("封箱状态")
     private String sealStatus;
 
+    @Transient
+    @ApiParam("打印状态文字")
+    private String printStrStatus;
+
+    @Transient
+    @ApiParam("客户代码名称")
+    private String custCodeName;
+
+    @Transient
+    @ApiParam("打印缓存id")
+    private String printId;
 
+    @Transient
+    @ApiParam("包装层级名称")
+    private String packLevelName;
 
+    @Transient
+    @ApiParam("是否封箱名称")
+    private String isSealedName;
 
     public MesPackage() {
     }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java
index d3864d0..883c12a 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java
@@ -24,7 +24,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PACKAGE_DETAIL")
-@Api("包装规格")
+@Api("包装规格明细")
 public class MesPackageDetail extends BaseBean {
 
     @Column(name = "PACKAGE_NO")
@@ -32,15 +32,15 @@ public class MesPackageDetail extends BaseBean {
     private String packageNo;
 
     @Column(name = "SERIAL_NUMBER")
-    @ApiParam("产品条码")
+    @ApiParam("过程条码")
     private String serialNumber;
 
     @Column(name = "PART_NO")
-    @ApiParam("产品条码")
+    @ApiParam("物料编号")
     private String partNo;
 
     @Column(name = "PART_NAME_RDD")
-    @ApiParam("产品条码")
+    @ApiParam("物料名称")
     private String partNameRdd;
 
     @Column(name = "PACKAGE_NO2")
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java
index 89e6f89..19bd5d9 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java
@@ -32,7 +32,7 @@ public class MesPackageTravel extends BaseBean {
     private String packageNo;
 
     @Column(name = "SERIAL_NUMBER")
-    @ApiParam("产品条码")
+    @ApiParam("过程条码")
     private String serialNumber;
 
     @Column(name = "OP_TYPE")
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java
index 1ff7261..abc6f92 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java
@@ -34,6 +34,9 @@ public class ProdPackageModel {
     @ApiParam("班次")
     private String shiftCode;
 
+    @ApiParam("班次名称")
+    private String shiftName;
+
     @ApiParam("物料号")
     private String partNo;
 
@@ -55,10 +58,28 @@ public class ProdPackageModel {
     @ApiParam("包装规格")
     private String packSpec;
 
+    @ApiParam("数量")
+    private Double qty;
+
+    @ApiParam("特殊批次")
+    private String fixLotNo;
+
     @ApiParam("包装集合")
     private List<MesPackage> packageList;
 
     @ApiParam("工单集合")
     private List<MesWorkOrder> workOrderList;
 
+    @ApiParam("打印状态文字")
+    private String printStrStatus;
+
+    @ApiParam("客户代码名称")
+    private String custCodeName;
+
+    @ApiParam("包装层级名称")
+    private String packLevelName;
+
+    @ApiParam("是否封箱名称")
+    private String isSealedName;
+
 }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java
new file mode 100644
index 0000000..02bca6e
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java
@@ -0,0 +1,14 @@
+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.IfDismantleRecord;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\15 14:14
+ * @Modify:
+ **/
+public interface IfDismantleRecordRepository extends BaseRepository<IfDismantleRecord, Long> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java
new file mode 100644
index 0000000..9a4d6be
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java
@@ -0,0 +1,14 @@
+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.IfPackageDetail;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\15 17:47
+ * @Modify:
+ **/
+public interface IfPackageDetailRepository extends BaseRepository<IfPackageDetail, Long> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java
new file mode 100644
index 0000000..9d362f1
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java
@@ -0,0 +1,14 @@
+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.IfProductOffLine;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\15 17:48
+ * @Modify:
+ **/
+public interface IfProductOffLineRepository extends BaseRepository<IfProductOffLine, Long> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java
new file mode 100644
index 0000000..5f1dbef
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java
@@ -0,0 +1,14 @@
+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.MesActionIf;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\15 11:21
+ * @Modify:
+ **/
+public interface MesActionIfRepository extends BaseRepository<MesActionIf, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java
new file mode 100644
index 0000000..6fe4ca3
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java
@@ -0,0 +1,99 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.math.BigDecimal;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\14 19:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_DISMENTLE_RECORD")
+@Api("物料拆解表")
+public class IfDismantleRecord extends BaseBean {
+
+    @Column(name = "DISMANTLE_ID")
+    @ApiParam("拆解编号")
+    private String dismantleId;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "PARENT_PART_NO")
+    @ApiParam("产品物料编码")
+    private String parentPartNo;
+
+    @Column(name = "PARENT_PART_NAME")
+    @ApiParam("产品物料名称")
+    private String parentPartName;
+
+    @Column(name = "SN")
+    @ApiParam("产品条码")
+    private String sn;
+
+    @Column(name = "QTY")
+    @ApiParam("产品数量")
+    private Integer qty;
+
+    @Column(name = "DISMANTLE_QTY")
+    @ApiParam("拆解数")
+    private BigDecimal dismantleQty;
+
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("子物料编码")
+    private String itemPartNo;
+
+    @Column(name = "ITEM_PART_NAME")
+    @ApiParam("子物料名称")
+    private String itemPartName;
+
+    @Column(name = "OK_QTY")
+    @ApiParam("合格数")
+    private BigDecimal okQty;
+
+    @Column(name = "MISS_QTY")
+    @ApiParam("缺失数")
+    private BigDecimal missQty;
+
+    @Column(name = "SCRAP_QTY")
+    @ApiParam("报废数")
+    private BigDecimal scrapQty;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("批次")
+    private String lotNo;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java
new file mode 100644
index 0000000..71f7100
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java
@@ -0,0 +1,94 @@
+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\15 10:01
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_PACKAGE_DETAIL")
+@Api("包装明细表")
+public class IfPackageDetail extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装条码")
+    private String packageNo;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("包装批次")
+    private String lotNo;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private String qty;
+
+    @Column(name = "PACKAGE_NO2")
+    @ApiParam("包装编号2")
+    private String packageNo2;
+
+    @Column(name = "PACKAGE_NO3")
+    @ApiParam("包装编号3")
+    private String packageNo3;
+
+    @Column(name = "PACKAGE_NO4")
+    @ApiParam("包装编号4")
+    private String packageNo4;
+
+    @Column(name = "ACTION_USER")
+    @ApiParam("操作人")
+    private String actionUser;
+
+    @Column(name = "ACTION_DATE_TIME")
+    @ApiParam("操作时间")
+    private String actionDateTime;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
new file mode 100644
index 0000000..2309dbe
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
@@ -0,0 +1,86 @@
+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\15 10:12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_PRODUCT_OFF_LINE")
+@Api("生产报工表")
+public class IfProductOffLine extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装条码")
+    private String packageNo;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private String qty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    private String unit;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("生产批次")
+    private String lotNo;
+
+    @Column(name = "FIX_LOT_NO")
+    @ApiParam("特殊批次")
+    private String fixLotNo;
+
+    @Column(name = "ACTION_USER")
+    @ApiParam("操作人")
+    private String actionUser;
+
+    @Column(name = "ACTION_DATE_TIME")
+    @ApiParam("操作时间")
+    private String actionDateTime;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java
index b018ee8..88fb6d1 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java
@@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 
 /**
  * @Description :设备通知对象配置
@@ -37,10 +34,12 @@ public class MesEquNotifyObjectCfg extends BaseBean {
     @ApiParam("对象名称")
     private String notifyObjectName;
 
+    @Lob
     @Column(name="NOTIFY_OBJECT_VALUE")
     @ApiParam("对象值")
     private String notifyObjectValue;
 
+    @Lob
     @Column(name="NOTIFY_OBJECT_VALUE_RDD")
     @ApiParam("对象值")
     private String notifyObjectValueRdd;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java
index b15b610..c62fb18 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java
@@ -87,4 +87,8 @@ public class MesEquTaskDetail extends BaseBean {
     @ApiParam(value = "任务类型")
     private Integer taskType;
 
+    @Transient
+    @ApiParam(value = "关联任务")
+    private String relateTask;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
index ce04c3d..36b3bf6 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
@@ -55,6 +55,10 @@ public class MesPackage extends BaseBean {
     @ApiParam("批号")
     private String lotNo;
 
+    @Column(name = "FIX_LOT_NO")
+    @ApiParam("特殊批号")
+    private String fixLotNo;
+
     @Column(name = "PACK_SPEC")
     @ApiParam("包装规格")
     private String packSpec;
@@ -91,4 +95,20 @@ public class MesPackage extends BaseBean {
     @ApiParam("封箱状态")
     private String sealStatus;
 
+    @Transient
+    @ApiParam("打印状态文字")
+    private String printStrStatus;
+
+    @Transient
+    @ApiParam("客户代码名称")
+    private String custCodeName;
+
+    @Transient
+    @ApiParam("包装层级名称")
+    private String packLevelName;
+
+    @Transient
+    @ApiParam("是否封箱名称")
+    private String isSealedName;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
index a6594ad..95483c1 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
@@ -23,8 +23,8 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE")
-@Api("包装规格")
+@Table(name = "MES_PACKAGE_DETAIL")
+@Api("包装规格明细")
 public class MesPackageDetail extends BaseBean {
 
     @Column(name = "PACKAGE_NO")
@@ -32,7 +32,7 @@ public class MesPackageDetail extends BaseBean {
     private String packageNo;
 
     @Column(name = "SERIAL_NUMBER")
-    @ApiParam("产品条码")
+    @ApiParam("过程条码")
     private String serialNumber;
 
     @Column(name = "PART_NO")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java
index 4ac7024..76a808b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java
@@ -32,7 +32,7 @@ public class MesPackageTravel extends BaseBean {
     private String packageNo;
 
     @Column(name = "SERIAL_NUMBER")
-    @ApiParam("产品条码")
+    @ApiParam("过程条码")
     private String serialNumber;
 
     @Column(name = "OP_TYPE")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
index 7502dd2..397ff0b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
@@ -77,9 +77,9 @@ public class MesPart extends BaseBean {
     @ApiParam("产品类型名称")
     private String produceCategoryName;
 
-    @Column(name = "PORCESS_MATCH_TYPE")
+    @Column(name = "PROCESS_MATCH_TYPE")
     @ApiParam("过程编码匹配类型")
-    private String porcessMatchType;
+    private String processMatchType;
 
     @Column(name = "PACKAGE_MATCH_TYPE")
     @ApiParam("包装编码匹配类型")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java
index c8316cc..a67a223 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java
@@ -24,13 +24,13 @@ public class MesButtonFlagModel implements Serializable {
     private boolean updateButton;
 
 //    @ApiParam("按配置修改按钮")
-//    private boolean updateButton4Config;
+//    private boolean updateButtonConfig;
 
     @ApiParam("下达按钮")
     private boolean transmitButton;
 
 //    @ApiParam("测试动态下达按钮")
-//    private boolean dynamicTransmitButton4Test;
+//    private boolean dynamicTransmitButtonTest;
 
     @ApiParam("启动按钮")
     private boolean startUpButton;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index bc3eab8..9b67963 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -818,6 +818,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(customerPart.getCustomerPartNo())) {
             DdlPreparedPack.getStringLikerPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean);
         }
+        if (!StringUtils.isEmpty(customerPart.getCustomerPartName())) {
+            DdlPreparedPack.getStringLikerPack(customerPart.getCustomerPartName(), "customerPartName", packBean);
+        }
 
         return packBean;
     }
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
index 4e34946..99bac14 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
@@ -49,8 +49,8 @@ public class CoreHqlPack {
      */
     public static String packHqlIds(String columnName, String[] params){
         StringBuffer result =  new StringBuffer();
-
-        // 参数数组 [1,2,3] -> "1,2,3"
+        HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
         HqlPack.getInPack(String.join(",", params), columnName, result);
         return result.toString();
     }
@@ -63,6 +63,8 @@ public class CoreHqlPack {
      */
     public static String packHqlIds(String columnName, Long[] params){
         StringBuffer result =  new StringBuffer();
+        HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
 
         // 参数数组 [1,2,3] -> "1,2,3"
         HqlPack.getInPack(StringUtils.join(params,","),columnName,result);
@@ -524,13 +526,13 @@ public class CoreHqlPack {
         DdlPackBean result = DdlPackBean.getDdlPackBean(user);
 
         DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
-        DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
+//        DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
 
         DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
         DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result);
         DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result);
         DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result);
-        DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result);
+//        DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result);
 
         DdlPreparedPack.getInPackList(idList,"id",result);
         result.setOrderByStr(user.orderBy());
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java
index f2a841b..bf98ee4 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java
@@ -60,4 +60,8 @@ public class BasCustomer extends BaseBean {
     @Column(name = "CUST_FAX")
     @ApiParam(value = "传真")
     private String custFax;
+
+    @Column(name = "SHIPP_QTY")
+    @ApiParam(value = "发运数量控制")
+    private Integer shippQty;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java
index 31153ac..c54315e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java
@@ -51,6 +51,6 @@ public class SwebProcurementPlanOrder extends BaseBean {
 
     @Column(name = "CONSIGNMENT")
     @ApiParam(value = "是否寄售")
-    private Integer consignment;
+    private Integer consignment=2;
 
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index 7dc5ac8..d204e7e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -197,6 +197,11 @@ public class WmsDocMovementDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     private Integer orderMasterStatus;
 
+    @Transient
+    @ApiParam("打印状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer printStatus;
+
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
index 82bfeeb..5705251 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
@@ -126,6 +126,11 @@ public class WmsDocMovementMaster extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     private Integer isPart;
 
+    @Column(name = "PRINT_STATUS")
+    @ApiParam("打印状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer printStatus;
+
     @Column(name = "SRC_WH_NO")
     @ApiParam("源仓库代码")
     public String assignSrcWhNo;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
index d546d76..22fe9f5 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
@@ -74,6 +74,10 @@ public class WmsDocMovementSn extends BaseBean {
     @ApiParam("条码")
     public String sn;
 
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编码")
+    public String vendorNo;
+
     @Transient
     @ApiParam("前端表格编辑使用")
     private Boolean isSet = false;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
index 208e2ca..8e6d27e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
@@ -190,6 +190,10 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam(value = "车号")
     private String carNo;
 
+    @Column(name = "CONSIGNATION")
+    @ApiParam("是否寄售 1-是 2-否")
+    private Integer consignation;
+
     public Integer getIsSnapshot() {
         return isSnapshot == null ? 0 : isSnapshot.intValue();
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
index 96ffb91..4581410 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
@@ -196,6 +196,10 @@ public class WmsMoveSn extends BaseBean {
     @Transient
     private Integer isSnapshot;
 
+    @Column(name = "CONSIGNATION")
+    @ApiParam("是否寄售 1-是 2-否")
+    private Integer consignation;
+
     public Integer getIsSnapshot() {
         return isSnapshot == null ? 0 : isSnapshot.intValue();
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
index 654dbd2..6342635 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
@@ -175,6 +175,14 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("年度")
     public String year;
 
+    @Column(name = "IS_CONSIGNMENT")
+    @ApiParam("是否寄售")
+    public Integer isConsignment = 2;
+
+    @Column(name = "PRIOR_RC")
+    @ApiParam("是否预收货")
+    public Integer priorRC = 2;
+
     @ApiParam(value = "待出库数量", example = "0")
     @Transient
     private Long waitingCounts;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
index b2c81ff..34d1a36 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
@@ -116,7 +116,7 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam("集装箱号")
     public String containerNo;
 
-    @Column(name = "PRIOR_RC")
+    @Column(name = "PRIOR_RC",columnDefinition = "int default 2")
     @ApiParam("预收货")
     public Integer priorRC;
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java
index 0c9c9bf..f4c6c39 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java
@@ -67,6 +67,11 @@ public class WmsPoSn extends BaseBean {
     @Column(name="SN_STATUS")
     @ApiParam(value = "状态", example = "10")
     public Integer snStatus;
+    /**
+     * 质量:10-合格 20-不合格 30-隔离 40-报废
+     */
+    @ApiParam(value = "质量状态", example = "10")
+    public Integer qcStatus;
 
     @Column(name="PACKAGE")
     @ApiParam("包装名称")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
index c98681aa..9cab718 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -59,13 +61,33 @@ public class WmsRoutingRule extends BaseBean {
     @ApiParam(value = "目标存储区" , example = "2")
     private String destZoneNo;
 
-    @Column(name = "OP_TYPE_CODE")
-    @ApiParam(value = "作业类型" , example = "2")
-    private String opTypeCode;
-
-    @Column(name = "TRANS_TYPE_CODE")
-    @ApiParam(value = "交易类型" , example = "1")
-    private String transTypeCode;
+    @Column(name = "DEST_BUSI_TYPE_CODE")
+    @ApiParam(value = "目标业务类型编码" , example = "")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+    private String destBusiTypeCode;
+
+    @Column(name = "SRC_BUSI_TYPE_CODE")
+    @ApiParam(value = "源业务类型编码" , example = "")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+    private String srcBusiTypeCode;
+
+    @Column(name = "DEST_TRANS_TYPE_CODE")
+    @ApiParam(value = "目标交易类型" , example = "1")
+    private String destTransTypeCode;
+
+    @Column(name = "SRC_TRANS_TYPE_CODE")
+    @ApiParam(value = "源交易类型" , example = "1")
+    private String srcTransTypeCode;
+
+    @Column(name = "DEST_SN_STATUS")
+    @ApiParam(value = "目标条码状态" , example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer destSnStatus;
+
+    @Column(name = "DEST_QC_STATUS")
+    @ApiParam(value = "目标质量状态" , example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer destQcStatus;
 
     @Column(name = "MODE_CODE")
     @ApiParam(value = "处理模式(10:生成任务,20:自动操作,30手工操作，40:自动操作 无交易)" , example = "1")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index a3e8927..773ae39 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -274,6 +274,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("批次校验规则")
     private String lotCheckRule;
 
+    @Column(name = "CONSIGNATION")
+    @ApiParam("是否寄售 1-是 2-否")
+    private Integer consignation;
+
     public WmsStockSn() {
     }
 
@@ -325,4 +329,37 @@ public class WmsStockSn extends BaseBean {
         this.lotNo = lotNo;
         this.qty = qty;
     }
+
+    public WmsStockSn(String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
+                      Integer qcStatus, Double qty, String locateNo, String zoneNo, String whNo, String lotNo,
+                      String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd,
+                      String qualityDate, String custNo, String lotCheckRule, String sn2d,
+                      String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser) {
+        this.sn = sn;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.unit = unit;
+        this.snStatus = snStatus;
+        this.qcStatus = qcStatus;
+        this.qty = qty;
+        this.locateNo = locateNo;
+        this.zoneNo = zoneNo;
+        this.whNo = whNo;
+        this.lotNo = lotNo;
+        this.dateCode = dateCode;
+        this.leftCode = leftCode;
+        this.fixLotNo = fixLotNo;
+        this.vendorNo = vendorNo;
+        this.vendorNameRdd = vendorNameRdd;
+        this.qualityDate = qualityDate;
+        this.qualityDay = qualityDay;
+        this.custNo = custNo;
+        this.lotCheckRule = lotCheckRule;
+        this.sn2d = sn2d;
+        this.packageNo = packageNo;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyDatetime = modifyDatetime;
+        this.modifyUser = modifyUser;
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index dd901c0..15013e3 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -208,6 +208,16 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
+        if (wmsPOMaster.getPriorRC()!=null&&wmsPOMaster.getPriorRC()==WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()){
+            ArrayList<Integer> numList = new ArrayList<>();
+            numList.add(0);
+            numList.add(wmsPOMaster.getPriorRC());
+            numList.add(null);
+            DdlPreparedPack.getInPackList(numList, "priorRC", result);
+        }else{
+            DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result);
+        }
+
 
         //  查询计划时间在指定范围的单号，查询这些单号的数据
         if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) {
@@ -1510,7 +1520,9 @@ public class WmsHqlPack {
 
         //查询参数封装
         DdlPreparedPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsPoSn.getSn(), "snOneBarCode", result);
         DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsPoSn.getQcStatus(), "qcStatus", result);
         DdlPreparedPack.getStringLikerPack(wmsPoSn.getErpAreaNoAdd(), "erpAreaNoAdd", result);
         DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result);