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 903874d..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
@@ -30,6 +30,7 @@ import java.util.List;
 public class Resource extends BaseCode {
     @Column(name="BOTTLENECK")
     @ApiParam(value ="是否瓶颈资源")
+    @FieldAnnotation(defaultValue = "false")
     private Boolean bottleneck;
 
     @Column(name="TYPE")
@@ -60,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")
@@ -80,7 +81,7 @@ public class Resource extends BaseCode {
     private String maxPostSdTime;
 
     @Column(name="ROUND_TYPE")
-    @ApiParam(value ="时间与时间尾数圆整类型")
+    @ApiParam(value ="圆整类型")
     @FieldAnnotation(defaultValue = "ROUNDING")
     private ApsEnumUtil.TIME_ROUND_TYPE roundType;
 
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/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/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/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-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 88a3791..ca904d5 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;
@@ -95,8 +99,17 @@ public class MesPackage extends BaseBean {
     @ApiParam("打印状态文字")
     private String printStrStatus;
 
+    @Transient
+    @ApiParam("客户代码名称")
+    private String custCodeName;
 
+    @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/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/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-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/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..e120ba0 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,31 @@ 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 = "DEST_OP_TYPE_CODE")
+    @ApiParam(value = "目标作业类型" , example = "2")
+    private String destOpTypeCode;
 
-    @Column(name = "TRANS_TYPE_CODE")
-    @ApiParam(value = "交易类型" , example = "1")
-    private String transTypeCode;
+    @Column(name = "DEST_TRANS_TYPE_CODE")
+    @ApiParam(value = "目标交易类型" , example = "1")
+    private String destTransTypeCode;
+
+    @Column(name = "SRC_OP_TYPE_CODE")
+    @ApiParam(value = "源作业类型" , example = "2")
+    private String srcOpTypeCode;
+
+    @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..75b3400 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,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
+        DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result);
 
         //  查询计划时间在指定范围的单号，查询这些单号的数据
         if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) {
@@ -1510,7 +1511,9 @@ public class WmsHqlPack {
 
         //查询参数封装
         DdlPreparedPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsPoSn.getSn(), "sn", 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);