diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.java
new file mode 100644
index 0000000..f4a4264
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.java
@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.pojo.aps.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface HolderAnnotation {
+    String[] notProperty();
+}
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 ba3afb0..3837379 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
@@ -30,25 +30,25 @@ public class DynamicSetTime extends BaseAPS {
     private String resCode;
 
     @Column(name="TYPE")
-    @ApiParam(value ="应用工作计划类型")
+    @ApiParam(value ="影响类型")
     @FieldAnnotation(defaultValue = "ALL")
     private ApsEnumUtil.DYNAMIC_SET_TYPE type;
 
     @Column(name="CONSIDER_ASS_RES")
-    @ApiParam(value ="是否启用副资源动态设置时间")
+    @ApiParam(value ="启用副资源设置时间")
     private Boolean considerAssRes;
 
     @Column(name="CONSIDER_MATERIAL")
-    @ApiParam(value ="是否启用物料动态设置时间")
+    @ApiParam(value ="启用物料设置时间")
     private Boolean considerMaterial;
 
     @Column(name="ASS_RES_CALC")
-    @ApiParam(value ="副资源动态设置计算方式")
+    @ApiParam(value ="副资源设置计算方式")
     @FieldAnnotation(defaultValue = "MAX")
     private ApsEnumUtil.DYNAMIC_SET_CALC assResCalc;
 
     @Column(name="MATERIAL_CALC")
-    @ApiParam(value ="物料动态设置时间计算方式")
+    @ApiParam(value ="物料设置时间计算方式")
     @FieldAnnotation(defaultValue = "MAX")
     private ApsEnumUtil.DYNAMIC_SET_CALC materialCalc;
 
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 30da6eb..2ea445a 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,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.BaseCode;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
@@ -50,18 +51,22 @@ public class FieldInfo extends BaseCode {
 
     @Column(name="CUSTOMIZE")
     @ApiParam(value ="是否为自定义字段")
-    private Boolean customize;
+    @FieldAnnotation(defaultValue = "true")
+    private Boolean customize = true;
 
     @Column(name="MODIFY")
     @ApiParam(value ="是否能修改")
-    private Boolean modify;
+    @FieldAnnotation(defaultValue = "true")
+    private Boolean modify = true;
 
     @Column(name="DISPLAY")
     @ApiParam(value ="是否在界面显示")
-    private Boolean display;
+    @FieldAnnotation(defaultValue = "true")
+    private Boolean display = true;
 
     @Column(name="PRIC")
     @ApiParam(value ="浮点数显示精度")
+    @FieldAnnotation(defaultValue = "2")
     private Integer pric;
 
     @Column(name="TIPS")
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 e14f224..576ffb0 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
@@ -1,6 +1,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.common.BaseCode;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EWork;
@@ -29,10 +30,20 @@ import java.util.List;
 @Entity
 @Table(name = "APS_WORK")
 @Api("工作")
-public class Work extends BaseCode {
+public class Work extends BaseAPS {
+    @Column(name="CODE")
+    @ApiParam(value ="编码")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String code;
+
+    @Column(name="ORDER_ID")
+    @ApiParam(value ="订单")
+    @FieldAnnotation(property = false)
+    private Long orderId;
+
     @Column(name="WORK_TYPE")
     @ApiParam(value ="工作类型")
-    @FieldAnnotation(modify = false)
+    @FieldAnnotation(property = false)
     private ApsEnumUtil.WORK_TYPE workType;
 
     @Column(name="count")
@@ -124,11 +135,6 @@ public class Work extends BaseCode {
     @FieldAnnotation(modify = false)
     private String failedReason;
 
-    @Column(name="ORDER_ID")
-    @ApiParam(value ="订单")
-    @FieldAnnotation(property = false)
-    private Long orderId;
-
     @Column(name="OPERATION_ID")
     @ApiParam(value ="工序")
     @FieldAnnotation(property = false)
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java
index ad465c2..10cc5dd 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java
@@ -29,10 +29,15 @@ import java.util.List;
 @Table(name = "APS_WORK_INPUT")
 @Api("工作输入")
 public class WorkInput extends BaseAPS {
-    @Column(name="INPUT_TIME")
-    @ApiParam(value ="输入时间")
-    @FieldAnnotation(modify = false)
-    private Date inputTime;
+    @Column(name="MATERIAL_ID")
+    @ApiParam(value ="物料")
+    @FieldAnnotation(property = false)
+    private Long materialId;
+
+    @Column(name="WORK_ID")
+    @ApiParam(value ="工作")
+    @FieldAnnotation(property = false)
+    private Long workId;
 
     @Column(name="INPUT_COUNT")
     @ApiParam(value ="输入数量")
@@ -44,15 +49,10 @@ public class WorkInput extends BaseAPS {
     @FieldAnnotation(modify = false)
     private Double shortCount;
 
-    @Column(name="WORK_ID")
-    @ApiParam(value ="工作")
-    @FieldAnnotation(property = false)
-    private Long workId;
-
-    @Column(name="MATERIAL_ID")
-    @ApiParam(value ="物料")
-    @FieldAnnotation(property = false)
-    private Long materialId;
+    @Column(name="INPUT_TIME")
+    @ApiParam(value ="输入时间")
+    @FieldAnnotation(modify = false)
+    private Date inputTime;
 
     @Column(name="OPER_INPUT_ID")
     @ApiParam(value ="工序输入")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java
index 51f4803..c5638a8 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java
@@ -30,10 +30,16 @@ import java.util.List;
 @Table(name = "APS_WORK_OUTPUT")
 @Api("工作输出")
 public class WorkOutput extends BaseAPS {
-    @Column(name="OUTPUT_TIME")
-    @ApiParam(value ="输出时间")
-    @FieldAnnotation(modify = false)
-    private Date outputTime;
+
+    @Column(name="MATERIAL_ID")
+    @ApiParam(value ="物料")
+    @FieldAnnotation(property = false)
+    private Long materialId;
+
+    @Column(name="WORK_ID")
+    @ApiParam(value ="工作")
+    @FieldAnnotation(property = false)
+    private Long workId;
 
     @Column(name="OUTPUT_COUNT")
     @ApiParam(value ="输出数量")
@@ -45,15 +51,10 @@ public class WorkOutput extends BaseAPS {
     @FieldAnnotation(modify = false)
     private Double remainCount;
 
-    @Column(name="WORK_ID")
-    @ApiParam(value ="工作")
-    @FieldAnnotation(property = false)
-    private Long workId;
-
-    @Column(name="MATERIAL_ID")
-    @ApiParam(value ="物料")
-    @FieldAnnotation(property = false)
-    private Long materialId;
+    @Column(name="OUTPUT_TIME")
+    @ApiParam(value ="输出时间")
+    @FieldAnnotation(modify = false)
+    private Date outputTime;
 
     @Column(name="OPER_OUTPUT_ID")
     @ApiParam(value ="工序输出")
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 b0cb321..876e25f 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
@@ -27,6 +27,37 @@ import javax.persistence.Table;
 @Table(name = "APS_Work_Relation")
 @Api("工作关联")
 public class WorkRelation extends BaseAPS {
+
+    @Column(name="MATERIAL_ID")
+    @ApiParam(value ="物料")
+    @FieldAnnotation(property = false)
+    private Long materialId;
+
+    @Column(name="PREV_ORDER_ID")
+    @ApiParam(value ="前订单")
+    @FieldAnnotation(property = false)
+    private Long prevOrderId;
+
+    @Column(name="POST_ORDER_ID")
+    @ApiParam(value ="后订单")
+    @FieldAnnotation(property = false)
+    private Long postOrderId;
+
+    @Column(name="PREV_WORK_ID")
+    @ApiParam(value ="前工作")
+    @FieldAnnotation(property = false)
+    private Long prevWorkId;
+
+    @Column(name="POST_WORK_ID")
+    @ApiParam(value ="后工作")
+    @FieldAnnotation(property = false)
+    private Long postWorkId;
+
+    @Column(name="COUNT")
+    @ApiParam(value ="关联数量")
+    @FieldAnnotation(modify = false)
+    private Double count;
+
     @Column(name="TYPE")
     @ApiParam(value ="关联类型")
     @FieldAnnotation(modify = false)
@@ -47,11 +78,6 @@ public class WorkRelation extends BaseAPS {
     @FieldAnnotation(modify = false)
     private String minSpaceTime;
 
-    @Column(name="COUNT")
-    @ApiParam(value ="关联数量")
-    @FieldAnnotation(modify = false)
-    private Double count;
-
     @Column(name="FIX_RELATION")
     @ApiParam(value ="是否固定关联")
     private Boolean fixRelation;
@@ -70,31 +96,6 @@ public class WorkRelation extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long workOutputId;
 
-    @Column(name="PREV_WORK_ID")
-    @ApiParam(value ="前工作")
-    @FieldAnnotation(property = false)
-    private Long prevWorkId;
-
-    @Column(name="POST_WORK_ID")
-    @ApiParam(value ="后工作")
-    @FieldAnnotation(property = false)
-    private Long postWorkId;
-
-    @Column(name="PREV_ORDER_ID")
-    @ApiParam(value ="前订单")
-    @FieldAnnotation(property = false)
-    private Long prevOrderId;
-
-    @Column(name="POST_ORDER_ID")
-    @ApiParam(value ="后订单")
-    @FieldAnnotation(property = false)
-    private Long postOrderId;
-
-    @Column(name="MATERIAL_ID")
-    @ApiParam(value ="物料")
-    @FieldAnnotation(property = false)
-    private Long materialId;
-
     public WorkInput getWorkInput() {
         return BeanRelation.get(this, EWorkRelation.WorkInput);
     }
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 67bac97..fbc7726 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
@@ -27,6 +27,17 @@ import javax.persistence.Table;
 @Table(name = "APS_WORK_RESOURCE")
 @Api("工作资源")
 public class WorkResource extends BaseAPS {
+
+    @Column(name="WORK_ID")
+    @ApiParam(value ="工作")
+    @FieldAnnotation(property = false)
+    private Long workId;
+
+    @Column(name="RESOURCE_ID")
+    @ApiParam(value ="资源")
+    @FieldAnnotation(property = false)
+    private Long resourceId;
+
     @Column(name="USE_TYPE")
     @ApiParam(value ="使用类型")
     @FieldAnnotation(modify = false)
@@ -72,16 +83,6 @@ public class WorkResource extends BaseAPS {
     @FieldAnnotation(modify = false)
     private String userMatchNumber;
 
-    @Column(name="WORK_ID")
-    @ApiParam(value ="工作")
-    @FieldAnnotation(property = false)
-    private Long workId;
-
-    @Column(name="RESOURCE_ID")
-    @ApiParam(value ="资源")
-    @FieldAnnotation(property = false)
-    private Long resourceId;
-
     @Column(name="OPER_RESOURCE_ID")
     @ApiParam(value ="工序资源")
     @FieldAnnotation(property = false)
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java
index 8fca466..638f867 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java
@@ -28,8 +28,4 @@ public abstract class BaseCode extends BaseAPS {
     @ApiParam(value ="名称")
     @FieldAnnotation(popSearch = true)
     private String name;
-
-    @Column(name="REMARK")
-    @ApiParam(value ="备注")
-    private String remark;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
index 47da0e1..4e72065 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
@@ -1,5 +1,9 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation;
+
+@HolderAnnotation(notProperty = {"ParentWork", "WorkResources", "WorkInputs", "WorkOutputs",
+        "PrevRelations", "PostRelations", "Operation"})
 public enum EWork {
     Order,      // 订单
     ParentWork, // 父工作
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java
index ddfbd3a..2b35993 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java
@@ -1,5 +1,8 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation;
+
+@HolderAnnotation(notProperty = {"OperInput"})
 public enum EWorkInput {
     Work,
     WorkRelations,
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java
index e2f1de2..b6d52e0 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java
@@ -1,5 +1,8 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation;
+
+@HolderAnnotation(notProperty = "OperOutput")
 public enum EWorkOutput {
     Work,
     WorkRelations,
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java
index 490bddc..25438ec 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java
@@ -1,5 +1,8 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation;
+
+@HolderAnnotation(notProperty = {"WorkResource", "MainPlan", "FurnacePlan"})
 public enum EWorkPlan {
     Work,
     Resource,
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java
index cdfc8ab..d75afa7 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java
@@ -1,11 +1,14 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation;
+
+@HolderAnnotation(notProperty = {"WorkInput", "WorkOutput"})
 public enum EWorkRelation {
-    WorkInput,
-    WorkOutput,
-    PrevWork,
-    PostWork,
+    Material,
     PrevOrder,
     PostOrder,
-    Material
+    PrevWork,
+    PostWork,
+    WorkInput,
+    WorkOutput
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java
index 2f77bcc..360e756 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java
@@ -1,5 +1,8 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation;
+
+@HolderAnnotation(notProperty = "OperResource")
 public enum EWorkResource {
     Work,
     Resource,
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 f8940d1..6d080fb 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
@@ -2962,7 +2962,8 @@ public class MesEnumUtil {
         SUPPLY_SWITCH(150,"SUPPLY_SWITCH",""),
         PCN_LOGIN(160, "PCN_LOGIN",""),
         PCN_MENU(170, "PCN_MENU",""),
-        PCN_MODULE(180, "PCN_MODULE","");
+        PCN_MODULE(180, "PCN_MODULE",""),
+        PCN_LOGOUT(190, "PCN_LOGOUT","");
 
 
         private int value;
@@ -3073,6 +3074,39 @@ public class MesEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ONLINE_SEND_TYPE {
+
+        PLC("PLC", "PLC"),
+        DB("DB", "DB");
+
+        private String value;
+        private String description;
+
+        ONLINE_SEND_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
     /**
      * WC_CHECK_TYPE 开线检查的模块
      */
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 0711dcc..a4862cb 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
@@ -2810,7 +2810,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WMS_PART_TYPE {
-        RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品");
+        RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器");
 
         private int value;
         private String description;
@@ -2850,8 +2850,9 @@ public class WmsEnumUtil {
     }
 
 
+
     public enum WMS_PART_TYPE_STR {
-        RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品");
+        RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"),CONTAINER_PRODUCT("40", "容器");
 
         private String value;
         private String description;
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java
index 4ebc6e9..9b32ffa 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java
@@ -124,7 +124,24 @@ public class LacLogTask extends BaseBean {
     @ApiParam(value ="执行说明")
     private String executionDescription;
 
+
+    @Transient
+    @ApiParam(value ="任务记录")
+    private LacCommandStackRecord record;
+
+    @Transient
+    @ApiParam(value ="任务记录")
+    private LacCommandStackTemplate template;
+
+    @Transient
+    @ApiParam(value ="任务步骤")
+    private LacCommandStackStep step;
+
+    @Transient
+    @ApiParam(value ="任务记录")
+    private LacCommandStackStepTask stackStepTask;
+
     @Transient
-    @ApiParam(value ="步骤列表")
+    @ApiParam(value ="执行任务参数")
     private List<LacLogTaskDetail> detailList;
 }
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java
index d2b3cd2..fb27a2b 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java
@@ -69,11 +69,6 @@ public class LacLogTaskDetail extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long taskTypeId;
 
-    @Column(name="TASK_NAME_TYPE")
-    @ApiParam(value ="任务类型")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long taskNameType;
-
     @Column(name="adapterId")
     @ApiParam(value ="适配器ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
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 466ead5..f21218e 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
@@ -100,21 +100,9 @@ public class MesPackage extends BaseBean {
     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/MesShift.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java
index e23ed67..89cad0e 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java
@@ -44,6 +44,10 @@ public class MesShift extends BaseBean {
     @ApiParam("开班时间")
     private String startTime;
 
+    @Column(name = "END_TIME")
+    @ApiParam("下班时间")
+    private String endTime;
+
     @Column(name = "WORK_TIMES")
     @ApiParam("作业时长")
     private Double workTimes;
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 abc6f92..fc94a50 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
@@ -73,9 +73,6 @@ public class ProdPackageModel {
     @ApiParam("打印状态文字")
     private String printStrStatus;
 
-    @ApiParam("客户代码名称")
-    private String custCodeName;
-
     @ApiParam("包装层级名称")
     private String packLevelName;
 
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java
index 2d627aa..5b3c105 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java
@@ -53,4 +53,20 @@ public class StepPrintSnModel extends MesProduceSn {
 
     @ApiParam("客户物料名称")
     private String customerPartName;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("单位")
+    private String unit;
+
+    @ApiParam("特殊批号")
+    private String fixLotNo;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("生产线代码")
+    private String workCenterCode;
+
 }
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 36b3bf6..93339b7 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
@@ -99,16 +99,4 @@ public class MesPackage extends BaseBean {
     @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/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java
index 86c3aef..2a285ea 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java
@@ -44,6 +44,10 @@ public class MesShift extends BaseBean {
     @ApiParam("开班时间")
     private String startTime;
 
+    @Column(name = "END_TIME")
+    @ApiParam("下班时间")
+    private String endTime;
+
     @Column(name = "WORK_TIMES")
     @ApiParam("作业时长")
     private Double workTimes;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java
index c23700e..dae7847 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
+import cn.estsh.i3plus.pojo.wms.bean.WmsPart;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -41,4 +42,7 @@ public class TransSnModle extends BaseComponetsParam implements Serializable {
      * 供应商批次
      */
     public String dateCode;
+
+    @ApiParam(value = "物料信息")
+    public WmsPart wmsPart;
 }
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 d204e7e..591b77b 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
@@ -104,7 +104,7 @@ public class WmsDocMovementDetails extends BaseBean {
      */
     @Column(name = "ITEM_STATUS")
     @ApiParam(value = "状态", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     private Integer itemStatus;
 
     /**
@@ -112,7 +112,7 @@ public class WmsDocMovementDetails extends BaseBean {
      */
     @Column(name = "IS_FREE")
     @ApiParam(value = "是否免费", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     public Integer isFree;
 
     @Column(name = "REMARK")
@@ -176,25 +176,25 @@ public class WmsDocMovementDetails extends BaseBean {
     public Double inputMoveQty;
 
     @Transient
-    @ApiParam(value ="标准包装",example = "1")
+    @ApiParam(value = "标准包装", example = "1")
     private Double snp;
 
     @Transient
-    @ApiParam(value ="条码总数量",example = "1")
+    @ApiParam(value = "条码总数量", example = "1")
     private Double detailsSnCount;
 
     @Transient
-    @ApiParam(value ="余数",example = "1")
+    @ApiParam(value = "余数", example = "1")
     private Double restQty;
 
     @Transient
     @ApiParam("任务状态")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
     private Integer isTask;
 
     @Transient
     @ApiParam("主表单据状态")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     private Integer orderMasterStatus;
 
     @Transient
@@ -206,17 +206,33 @@ public class WmsDocMovementDetails extends BaseBean {
         return recommondLot == null ? "无" : this.recommondLot;
     }
 
-    public Double getQty() {return qty == null ? 0D : this.qty.doubleValue(); }
+    public Double getQty() {
+        return qty == null ? 0D : this.qty.doubleValue();
+    }
+
+    public Double getOutQty() {
+        return outQty == null ? 0D : this.outQty.doubleValue();
+    }
 
-    public Double getOutQty() {return outQty == null ? 0D : this.outQty.doubleValue(); }
+    public Double getPickQty() {
+        return pickQty == null ? 0D : this.pickQty.doubleValue();
+    }
 
-    public Double getPickQty() {return pickQty == null ? 0D : this.pickQty.doubleValue(); }
+    public Double getActualQty() {
+        return actualQty == null ? 0D : this.actualQty.doubleValue();
+    }
 
-    public Double getActualQty() {return actualQty == null ? 0D : this.actualQty.doubleValue(); }
+    public Double getRecQty() {
+        return recQty == null ? 0D : this.recQty.doubleValue();
+    }
 
-    public Integer getIsTaskVal() {return isTask == null ? 0 : this.isTask.intValue();}
+    public Integer getIsTaskVal() {
+        return isTask == null ? 0 : this.isTask.intValue();
+    }
 
-    public Integer getOrderMasterStatus() { return orderMasterStatus== null ? 0 : this.orderMasterStatus.intValue(); }
+    public Integer getOrderMasterStatus() {
+        return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue();
+    }
 
     @Version
     @Column(name = "LOCK_VERSION")
@@ -229,7 +245,7 @@ public class WmsDocMovementDetails extends BaseBean {
 
     @Transient
     @ApiParam("业务类型")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
     public Integer busiType;
 
     @Column(name = "IS_SN")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java
index c39a72c..3bef737 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java
@@ -47,7 +47,7 @@ public class WmsPackageSpec extends BaseBean {
 
     @Column(name = "SPEC_LEVEL")
     @ApiParam(value = "规格层级")
-    private String specLevel;
+    private Integer specLevel;
 
     @Column(name = "IS_MIXED")
     @ApiParam(value = "是否混包")
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 f4c6c39..06afc0f 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
@@ -142,6 +142,10 @@ public class WmsPoSn extends BaseBean {
     @ApiParam(value = "最晚收货时间")
     public String latestReceTime;
 
+    @Column(name = "FIX_LOT_NO")
+    @ApiParam(value = "特殊批次")
+    private String fixLotNo = "";
+
     public WmsPoSn(){}
 
     public WmsPoSn(String orderNo,String earliestReceTime,String latestReceTime){