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 784251b..6f63bf5 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
@@ -1469,6 +1469,7 @@ public class MesEnumUtil {
         CUSTOM_COMPONENT("customComponent", "定制内容"),
         TASK_COMPLETE("taskComplete", "整个扫描完成"),
         STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
+        RUNNING_INFO("runningInfo", "运行信息"),
         RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");
 
 
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 01f31a2..822a771 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
@@ -621,7 +621,9 @@ public class WmsEnumUtil {
         AMPR(230, "AMPR", "AMPR"),
         FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"),
         VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"),
-        VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库");
+        VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库"),
+        VDA_PICKING_GOODS(270, "VDA_PICKING_GOODS", "VDA生产领料"),
+        VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料");
 
 
         private int value;
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java
index 7b4d5df..b73cd80 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java
@@ -14,10 +14,10 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
- * @Description :mes系统业务动作
+ * @Description :工位投料信息
  * @Reference :
- * @Author : jack.jia
- * @CreateDate : 2019-04-12
+ * @Author : Wynne.Lu
+ * @CreateDate : 2019-09-17
  * @Modify:
  **/
 @Data
@@ -54,7 +54,7 @@ public class MesCellFeed extends BaseBean {
 
     @Column(name = "RAW_QTY")
     @ApiParam("特殊批次")
-    private Long rawQty;
+    private Double rawQty;
 
     @Column(name = "LOT_NO")
     @ApiParam("关联批次")
@@ -64,7 +64,7 @@ public class MesCellFeed extends BaseBean {
     @ApiParam("供应商代码")
     private String supplierCode;
 
-    public long getRawQtyVal() {
+    public double getRawQtyVal() {
         return this.rawQty == null ? 0l : this.rawQty;
     }
 
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java
index 756aea5..bb74b3e 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java
@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Author: Wynne.Lu
@@ -27,6 +28,7 @@ import javax.persistence.Table;
 @Api("PLC配置表")
 public class MesPlc extends BaseBean {
 
+
     @Column(name = "PLC_CODE")
     @ApiParam("PLC代码")
     private String plcCode;
@@ -63,23 +65,31 @@ public class MesPlc extends BaseBean {
     @ApiParam("分组名称")
     private String groupName;
 
-    @Column(name="EQUIPMENT_CODE")
+    @Column(name = "EQUIPMENT_CODE")
     @ApiParam("设备代码")
     private String equipmentCode;
 
     @Column(name = "WORK_CENTER_CODE")
-    @ApiParam("工作中心")
+    @ApiParam("生产线")
     private String workCenterCode;
 
     @Column(name = "WORK_CELL_CODE")
-    @ApiParam("工作单元")
+    @ApiParam("工位")
     private String workCellCode;
 
-    @Column(name = "ENABLED")
-    @ApiParam("是否启用 0 false 1 true")
-    private Integer enabled;
-
     @Column(name = "PLC_CFG")
     @ApiParam("PLC的值的设定")
     private String plcCfg;
+
+    @Column(name = "ANALYSIS_RULE")
+    @ApiParam("解析规则")
+    private String analysisRule;
+
+    @Column(name = "IS_ANALYSIS")
+    @ApiParam("是否解析")
+    private String isAnalysis;
+
+    @Transient
+    @ApiParam("设备名称")
+    private String equipmentName;
 }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java
new file mode 100644
index 0000000..f7d8843
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java
@@ -0,0 +1,95 @@
+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 : Wynne.Lu
+ * @CreateDate : 2019-10-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PRODUCT_DATA")
+@Api("生产数据")
+public class MesProductData extends BaseBean {
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CENTER_NAME")
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name = "WORK_CELL_NAME")
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
+    @Column(name="SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_DESC")
+    @ApiParam("物料名称")
+    private String partDesc;
+
+    @Column(name = "EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+    @Column(name = "EQU_NAME")
+    @ApiParam("设备名称")
+    private String equName;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @Column(name = "FIELD_CODE")
+    @ApiParam("字段代码")
+    private String fieldCode;
+
+    @Column(name = "FIELD_NAME")
+    @ApiParam("字段名称")
+    private String fieldName;
+
+    @Column(name = "FIELD_VALUE")
+    @ApiParam("字段值")
+    private String fieldValue;
+
+    @Column(name = "ROW_NO")
+    @ApiParam("数据行号")
+    private String rowNo;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam("数据组号")
+    private String groupNo;
+
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java
index 7f01147..4a2bae6 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java
@@ -46,7 +46,7 @@ public class MesRawPartSn extends BaseBean {
 
     @Column(name = "RAW_QTY")
     @ApiParam("数量")
-    private Long rawQty;
+    private Double rawQty;
 
     @Column(name = "LOT_NO")
     @ApiParam("生产批次")
@@ -64,7 +64,7 @@ public class MesRawPartSn extends BaseBean {
     @ApiParam("供应商代码")
     private String supplierCode;
 
-    public long getRawQtyVal() {
+    public double getRawQtyVal() {
         return this.rawQty == null ? 0l : this.rawQty;
     }
 
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java
new file mode 100644
index 0000000..f8eb168
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java
@@ -0,0 +1,61 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/16 2:42 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_MONITOR_LOG")
+@Api("工位监控异常信息")
+public class MesWorkCellMonitorLog extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("工单")
+    private String workOrderNo;
+
+    @Column(name = "STEP_CODE")
+    @ApiParam("工步")
+    private String stepCode;
+
+    @Column(name = "PROCESS_CODE")
+    @ApiParam("工序")
+    private String processCode;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程")
+    private String routeCOde;
+
+    @Column(name="MESSAGE")
+    @ApiParam("异常信息")
+    private String message;
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java
new file mode 100644
index 0000000..eb8debf
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.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.MesProductData;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesProductDataRepository extends BaseRepository<MesProductData, Long> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java
new file mode 100644
index 0000000..672947b
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java
@@ -0,0 +1,13 @@
+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.MesWorkCellMonitorLog;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/27 1:58 PM
+ * @Description:
+ **/
+public interface MesWorkCellMonitorLogRepository extends BaseRepository<MesWorkCellMonitorLog, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
index dccf4fb..5505b11 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
@@ -14,10 +14,10 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
- * @Description :mes系统业务动作
+ * @Description :工位投料信息
  * @Reference :
- * @Author : jack.jia
- * @CreateDate : 2019-04-12
+ * @Author : Wynne.Lu
+ * @CreateDate : 2019-09-17
  * @Modify:
  **/
 @Data
@@ -54,7 +54,7 @@ public class MesCellFeed extends BaseBean {
 
     @Column(name = "RAW_QTY")
     @ApiParam("特殊批次")
-    private Long rawQty;
+    private Double rawQty;
 
     @Column(name = "LOT_NO")
     @ApiParam("关联批次")
@@ -65,7 +65,7 @@ public class MesCellFeed extends BaseBean {
     private String supplierCode;
 
 
-    public long getRawQtyVal() {
+    public double getRawQtyVal() {
         return this.rawQty == null ? 0l : this.rawQty;
     }
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java
new file mode 100644
index 0000000..ddd2dde
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java
@@ -0,0 +1,95 @@
+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 : Wynne.Lu
+ * @CreateDate : 2019-10-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PRODUCT_DATA")
+@Api("生产数据")
+public class MesProductData extends BaseBean {
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CENTER_NAME")
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name = "WORK_CELL_NAME")
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
+    @Column(name="SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_DESC")
+    @ApiParam("物料名称")
+    private String partDesc;
+
+    @Column(name = "EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+    @Column(name = "EQU_NAME")
+    @ApiParam("设备名称")
+    private String equName;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @Column(name = "FIELD_CODE")
+    @ApiParam("字段代码")
+    private String fieldCode;
+
+    @Column(name = "FIELD_NAME")
+    @ApiParam("字段名称")
+    private String fieldName;
+
+    @Column(name = "FIELD_VALUE")
+    @ApiParam("字段值")
+    private String fieldValue;
+
+    @Column(name = "ROW_NO")
+    @ApiParam("数据行号")
+    private String rowNo;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam("数据组号")
+    private String groupNo;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java
new file mode 100644
index 0000000..2aa0975
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java
@@ -0,0 +1,61 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/16 2:42 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_MONITOR_LOG")
+@Api("工位监控异常信息")
+public class MesWorkCellMonitorLog extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "workOrderNo")
+    @ApiParam("工单")
+    private String workOrderNo;
+
+    @Column(name = "STEP_CODE")
+    @ApiParam("工步")
+    private String stepCode;
+
+    @Column(name = "PROCESS_CODE")
+    @ApiParam("工序")
+    private String processCode;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程")
+    private String routeCOde;
+
+    @Column(name="MESSAGE")
+    @ApiParam("异常信息")
+    private String message;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductDataRepository.java
new file mode 100644
index 0000000..3f8880c
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductDataRepository.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.MesProductData;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesProductDataRepository extends BaseRepository<MesProductData, Long> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java
similarity index 90%
rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java
rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java
index da1d6ed..e6e47f3 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java
@@ -1,11 +1,12 @@
-package cn.estsh.i3plus.pojo.mes.pcn.model;
+package cn.estsh.i3plus.pojo.model.mes;
+
+
 
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Column;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description : 工位请求bean
@@ -64,4 +65,7 @@ public class StationRequestBean implements Serializable {
 
     @ApiParam("托盘号")
     private String tray;
+
+    @ApiParam("工步列表")
+    private List<StepModel> stepList;
 }
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java
index 19bf279..34409f4 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java
@@ -47,6 +47,18 @@ public class StepModel implements Serializable {
     private boolean isComplete;
 
     /**
+     * 工步颜色
+     */
+    @ApiParam
+    private String color;
+
+    /**
+     * 异常信息
+     */
+    @ApiParam
+    private String exMsg;
+
+    /**
      * 工位扫描业务所需使用字段
      */
     @ApiParam("工步是否跳过")