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 0a3be6b..249341d 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
@@ -483,14 +483,19 @@ public class WmsEnumUtil {
         SCATTERED_OUT(50, "SCATTERED_OUT", "零星出库"),
         SCATTERED_IN(60, "SCATTERED_IN", "零星入库"),
         NC_WAREHOSING_IN(70, "NC_WAREHOSING", "NC入库"),
-        SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"),
+        SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"),//默认DMR
         CUSTOMER_RETURN(90, "CUSTOMER_RETURN", "客户退货"),
         PRODUCT_RETURN(100, "PRODUCT_RETURN", "生产退料"),
         INSTRUCTION_MOVE(110, "INSTRUCTION_MOVE", "指令移库"),
         SCRAPPING_OUT(120, "SCRAPPING_OUT", "报废出库"),
         RECEIVING_IN(130, "RECEIVING_IN", "收货入库"),
         OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"),
-        NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库");
+        NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库"),
+        SUPPLIER_RETURN_SMRR(190, "SUPPLIER_RETURN_SMRR", "供应商退货(SMRR)"),
+        NC_DISMANTLING_PICKING(160,"NC_DISMANTLING_PICKING","NC拆解领料"),
+        NC_DISMANTLING_RETREAT(170,"NC_DISMANTLING_RETREAT","NC拆解退料"),
+        LINE_EDGE_SCRAPPING_OUT(180,"LINE_EDGE_SCRAPPING_OUT","线边报废出库");
+
 
         private int value;
         private String code;
@@ -802,7 +807,7 @@ public class WmsEnumUtil {
         INSTOCKED(40, "入库"),
         PICKED(50, "配料"),
         OUT_STOCK(60, "出库"),
-        FRAZE(70, "报废"),
+//        FRAZE(70, "报废"),
         COMMING(80, "在途");
 
         private int value;
@@ -847,7 +852,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_QC_STATUS {
-        NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离");
+        NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40,"ISOLATED", "报废");
 
         private int value;
         private String code;
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java
new file mode 100644
index 0000000..2a88530
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java
@@ -0,0 +1,37 @@
+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 : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PROCESS")
+@Api("工序")
+public class MesProcess extends BaseBean {
+    @Column(name = "PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @Column(name = "PROCESS_NAME")
+    @ApiParam("工序名称")
+    private String processName;
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java
new file mode 100644
index 0000000..1a2949f
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java
@@ -0,0 +1,41 @@
+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 : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_ROUTE")
+@Api("流程表")
+public class MesRoute extends BaseBean {
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "ROUTE_NAME")
+    @ApiParam("流程名称")
+    private String routeName;
+
+    @Column(name = "POSITION")
+    @ApiParam("GOJS位置")
+    private String position;
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java
new file mode 100644
index 0000000..d931c12
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java
@@ -0,0 +1,16 @@
+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.MesProcess;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesProcessRepository extends BaseRepository<MesProcess, Long> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java
new file mode 100644
index 0000000..92800fd
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java
@@ -0,0 +1,16 @@
+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.MesRoute;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesRouteRepository extends BaseRepository<MesRoute, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java
new file mode 100644
index 0000000..be0c7ee
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java
@@ -0,0 +1,59 @@
+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 :PLC设备信息配置表
+ * @Reference :
+ * @Author : Crish
+ * @CreateDate : 2019-05-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PLC_CONFIGURE")
+@Api("PLC设备信息配置表")
+public class MesPLCConfigure extends BaseBean {
+    @Column(name="IP")
+    @ApiParam("设备ip")
+    private String ipAddress;
+
+    @Column(name="CHANNEL_NAME")
+    @ApiParam("通道名称")
+    private String channelName;
+
+    @Column(name="DEVICE_NAME")
+    @ApiParam("设备地址")
+    private String deviceName;
+
+    @Column(name="TAG_NAME")
+    @ApiParam("标签地址")
+    private String tagName;
+
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java
new file mode 100644
index 0000000..11aa97c
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java
@@ -0,0 +1,80 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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: yiming.gu
+ * @CreateDate:2019-05-30-17:32
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PCN_SYNC_CFG")
+@Api("MES_PCN_同步配置")
+public class MesPcnSyncCfg extends BaseBean {
+    @Column(name="PCN_CODE")
+    @ApiParam("PCN代码")
+    private String pcnCode;
+
+    @Column(name="OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name="OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @Column(name="OBJECT_KEY")
+    @ApiParam("对象主键")
+    private String objectKey;
+
+    @Column(name="SYNC_FREQUENCY")
+    @ApiParam("同步频率")
+    private Integer syncFrequency;
+
+    @Column(name="SYNC_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value ="同步时间")
+    private String syncTime;
+
+    @Column(name="SYNC_PATTERN")//2、新增  1、修改
+    @ApiParam("同步方式")
+    private Integer syncPattern;
+
+    @Column(name="SYNC_TYPE")//1\pcn获取mes数据   2、pcn推送数据至mes
+    @ApiParam("同步类型")
+    private Integer syncType;
+
+    @Column(name="LAST_SYNC_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value ="上一同步时间")
+    private String lastSyncTime;
+
+    public int getSyncFrequencyVal() {
+        return this.syncFrequency == null ? 0 : this.syncFrequency;
+    }
+
+    public int getSyncTypeVal() {
+        return this.syncType == null ? 0 : this.syncType;
+    }
+
+    public int getSyncPatternVal() {
+        return this.syncPattern == null ? 0 : this.syncPattern;
+    }
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpsnRuleReposity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpsnRuleRepository.java
similarity index 79%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpsnRuleReposity.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpsnRuleRepository.java
index 285b907..ae36d15 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpsnRuleReposity.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpsnRuleRepository.java
@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface MesKpsnRuleReposity extends BaseRepository<MesKpsnRule, Long> {
+public interface MesKpsnRuleRepository extends BaseRepository<MesKpsnRule, Long> {
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPLCConfigureRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPLCConfigureRepository.java
new file mode 100644
index 0000000..af4c855
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPLCConfigureRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPLCConfigure;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesPLCConfigureRepository extends BaseRepository<MesPLCConfigure, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSyncCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSyncCfgRepository.java
new file mode 100644
index 0000000..edf3fd1
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSyncCfgRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPcnSyncCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-24-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesPcnSyncCfgRepository extends BaseRepository<MesPcnSyncCfg, Long> {
+}
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 a11e846..0623bce 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
@@ -717,4 +717,41 @@ public class MesHqlPack {
 
         return packBean;
     }
+
+    /**
+     * MES对象与dao对应关系查询条件封装
+     * @param objectDao
+     * @return
+     */
+    public static DdlPackBean getMesObjectDao(MesObjectDao objectDao, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(objectDao, organizeCode);
+        if (StringUtils.isNotEmpty(objectDao.getObjectCode())){
+            DdlPreparedPack.getStringEqualPack(objectDao.getObjectCode(), "objectCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(objectDao.getDaoClass())){
+            DdlPreparedPack.getStringEqualPack(objectDao.getDaoClass(), "daoClass", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES-PCN同步配置查询条件封装
+     * @param pcnSyncCfg
+     * @return
+     */
+    public static DdlPackBean getMesPcnSyncCfg(MesPcnSyncCfg pcnSyncCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode);
+        if (StringUtils.isNotEmpty(pcnSyncCfg.getObjectCode())){
+            DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(pcnSyncCfg.getPcnCode())){
+            DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean);
+        }
+        if (null != pcnSyncCfg.getSyncType()){
+            DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean);
+        }
+
+        return packBean;
+    }
 }
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 ffb6744..7ed02fe 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
@@ -118,6 +118,30 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "是否散件", example = "1")
     private Integer isPart;
 
+    @Column(name = "SRC_WH_NO")
+    @ApiParam("源仓库代码")
+    public String AssignSrcWhNo;
+
+    @Column(name = "SRC_ZONE_NO")
+    @ApiParam("源存储区代码")
+    public String AssignSrcZoneNo;
+
+    @Column(name = "DEST_WH_NO")
+    @ApiParam("目标仓库代码")
+    public String AssignDestWhNo;
+
+    @Column(name = "DEST_ZONE_NO")
+    @ApiParam("目标存储区代码")
+    public String AssignDestZoneNo;
+
+    @Column(name = "PLAN_DATE")
+    @ApiParam(value = "计划日期")
+    private String AssignPlanDate;
+
+    @Column(name = "PLAN_TIME")
+    @ApiParam(value = "计划时间")
+    private String AssignPlanTime;
+
     @Transient
     @ApiParam(value = "发运单号")
     private String shipOrderNo;