diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
index 86e527d..4a4bb65 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
@@ -1469,9 +1469,9 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_SECTION_TASK_TYPE {
-        CREATE(10, "CREATE", "JIT任务"),
-        RECEIPT(20, "IN_PROGRESS", "单据任务"),
-        RECEIPT_FINISH(30, "COMPLETED", "单点任务");
+        JIT_TASK(10, "JIT_TASK", "JIT任务"),
+        DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"),
+        SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务");
 
         private int value;
         private String code;
@@ -1560,9 +1560,9 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_TASK_TYPE {
-        CREATE(10, "JIT_TASK", "JIT任务"),
-        RECEIPT(20, "DOCUMENT_TASK", "单据任务"),
-        RECEIPT_FINISH(30, "SINGLE_POINT_TASK", "单点任务");
+        JIT_TASK(10, "JIT_TASK", "JIT任务"),
+        DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"),
+        SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务");
 
         private int value;
         private String code;
@@ -1606,9 +1606,9 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MAIN_TASK_TYPE {
-        CREATE(10, "JIT_TASK", "JIT任务"),
-        RECEIPT(20, "DOCUMENT_TASK", "单据任务"),
-        RECEIPT_FINISH(30, "SINGLE_POINT_TASK", "单点任务");
+        JIT_TASK(10, "JIT_TASK", "JIT任务"),
+        DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"),
+        SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务");
 
         private int value;
         private String code;
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 309bdcc..02f71d3 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
@@ -5152,13 +5152,14 @@ public class WmsEnumUtil {
     }
 
     /**
-     *  插件类型 10-PDA插件，20-交易处理插件
+     *  插件类型 10-PDA插件，20-按钮增强插件，30-交易处理插件
      * 默认为 10
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PLUGIN_TYPE {
         PDA_PLUGIN(10, "PDA_PLUGIN", "PDA插件"),
-        TRANS_PLUGIN(20, "TRANS_PLUGIN", "交易处理插件");
+        BTN_PLUGIN(20, "BTN_PLUGIN", "按钮增强插件"),
+        TRANS_PLUGIN(30, "TRANS_PLUGIN", "交易处理插件");
 
         private int value;
         private String code;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java
new file mode 100644
index 0000000..13e8069
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.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;
+import java.io.Serializable;
+
+/**
+ * @Description :物料校验项
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PART_CHECK")
+@Api("物料校验项")
+public class MesPartCheck extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -7706120594398072630L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "CHECK_SPEL_EXPRESS")
+    @ApiParam("校验表达式")
+    private String checkSpelExpress;
+
+    @Column(name = "TYPE_SPEL_EXPRESS")
+    @ApiParam("类型表达式")
+    private String typeSpelExpress;
+
+    @Column(name = "RECORD_NUM_SPEL_EXPRESS")
+    @ApiParam("记录数量表达式")
+    private String recordNumSpelExpress;
+
+    @Column(name = "RECORD_NUM_DESC")
+    @ApiParam("校验表达式")
+    private String recordNumDesc;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
index 4075384..b71bdbd 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
@@ -127,7 +127,7 @@ public class MesPlc extends BaseBean implements Serializable {
 
     @Transient
     @ApiParam("OPC值")
-    private List opcValue;
+    private String opcValue;
 
     @Column(name = "TOOLING_CODE ")
     @ApiParam("工装代码")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java
index 34389f0..6a40ee7 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java
@@ -42,4 +42,8 @@ public class MesProdCfg extends BaseBean implements Serializable {
     @Column(name = "PROD_CFG_Type_CODE")
     @ApiParam("产品配置类型代码")
     private String prodCfgTypeCode;
+
+    @Column(name = "PROD_CFG_TYPE")
+    @ApiParam("产品配置类型")
+    private String prodCfgType;
 }
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
index 5db7e04..cd951ae 100644
--- 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
@@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description :生产数据
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
index f8cb85f..1fe5536 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
@@ -76,7 +76,7 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("产品类型名称")
     private String pptCode;
 
-   @Column(name = "QUEUE_GROUP_NO")
+    @Column(name = "QUEUE_GROUP_NO")
     @ApiParam("分组队列编号")
     private String queueGroupNo;
 
@@ -84,6 +84,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("组内编号")
     private Integer groupNo;
 
+    @Column(name = "IS_GROUP_PRINTED")
+    @ApiParam("料架是否已打印")
+    private Integer isGroupPrinted;
+
     @Transient
     @ApiParam("队列序号")
     private Double queueSeq;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java
new file mode 100644
index 0000000..22a3440
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java
@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("数据复核model")
+public class DataReviewStepModel {
+
+    @ApiParam("关键件")
+    private String itemPartNo;
+
+    @ApiParam("需要数量")
+    private String needNum;
+
+    @ApiParam("实际数量")
+    private String realNum;
+
+    @ApiParam("对象代码")
+    private String objectCode;
+
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java
new file mode 100644
index 0000000..eaba2fa
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java
@@ -0,0 +1,87 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch;
+import cn.estsh.i3plus.pojo.mes.annotation.Json4Es;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/3/20 5:51 下午
+ * @Modify:
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ElasticSearch
+public class EsProductData extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4514407617515827040L;
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("产品条码")
+    private String productSn;
+
+    @ApiParam("工单号")
+    private String orderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partDesc;
+
+    @ApiParam("设备代码")
+    private String equCode;
+
+    @ApiParam("设备名称")
+    private String equName;
+
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @ApiParam("字段代码")
+    private String fieldCode;
+
+    @ApiParam("字段名称")
+    private String fieldName;
+
+    @ApiParam("字段值")
+    private String fieldValue;
+
+    @ApiParam("数据行号")
+    private String rowNo;
+
+    @ApiParam("数据组号")
+    private String groupNo;
+
+    @Json4Es
+    @ApiParam("生产数据")
+    private String lineData;
+
+    @ApiParam("字段总数")
+    private Integer fieldNum;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java
new file mode 100644
index 0000000..16d5f94
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java
@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("生产数据缓存model")
+public class ProductDataCacheModel {
+
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @ApiParam("字段名称")
+    private List<ProductDataModel> productDataModelList;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java
new file mode 100644
index 0000000..5ae7b20
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java
@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/3/20 9:02 下午
+ * @Modify:
+ */
+@Data
+public class QueueJitActualModule {
+
+    private Long id;
+    @ApiParam("vin")
+    private String vinCode;
+    @ApiParam("排序号")
+    private Double seq;
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+    @ApiParam("组内编号")
+    private Integer groupNo;
+
+    public QueueJitActualModule() {
+
+    }
+
+    public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo) {
+        this.id = id;
+        this.vinCode = vinCode;
+        this.seq = seq;
+        this.queueGroupNo = queueGroupNo;
+        this.groupNo = groupNo;
+    }
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
index 4e6fc54..195d0d4 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
@@ -58,6 +58,15 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("包装数量")
     private Double qty;
 
+    @ApiParam("生产组代码")
+    private String pgCode;
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+    @ApiParam("组内编号")
+    private Integer groupNo;
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+
     public QueueOrderModel() {
     }
 
@@ -106,4 +115,13 @@ public class QueueOrderModel implements Serializable {
         this.snStatus = snStatus;
         this.workType = workType;
     }
+
+    public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode) {
+        this.id = id;
+        this.queDetailSeq = queDetailSeq;
+        this.pgCode = pgCode;
+        this.queueGroupNo = queueGroupNo;
+        this.groupNo = groupNo;
+        this.prodCfgCode = prodCfgCode;
+    }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java
index 2004603..91cd118 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java
@@ -72,4 +72,24 @@ public class StepPrintSnModel extends MesProduceSn {
     @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层")
     private Integer packLevel;
 
+    @ApiParam("生产组代码")
+    private String pgCode;
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+    @ApiParam("组内编号")
+    private Integer groupNo;
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+    @ApiParam("队列生产明细序号")
+    private Double queDetailSeq;
+
+    @ApiParam("vin")
+    private String vinCode;
+    @ApiParam("客户JIT生产队列排序号")
+    private Double seq;
+    @ApiParam("jit车号")
+    private String jitCarNo;
+    @ApiParam("车型代码")
+    private String carModuleCode;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartCheckRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartCheckRepository.java
new file mode 100644
index 0000000..ca12e5b
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartCheckRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartCheck;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesPartCheckRepository extends BaseRepository<MesPartCheck, Long> {
+}
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java
index 41fc4d0..05b54f6 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java
@@ -33,6 +33,10 @@ public class PtlMainTask extends BaseBean implements Serializable {
     @ApiParam("主任务编号")
     private String taskNo;
 
+    @Column(name = "ORDER_NO")
+    @ApiParam("业务单号")
+    private String orderNo;
+
     @Column(name = "SEQ")
     @ApiParam("主任务顺序号")
     private Integer seq;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java
index ba3146c..a0eb09b 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java
@@ -38,9 +38,17 @@ public class PtlMainTaskDetail extends BaseBean implements Serializable {
     private String partNo;
 
     @Column(name = "PART_NAME")
-    @ApiParam("产品物料名称")
+    @ApiParam("产品物料号名称")
     private String partName;
 
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("拣选物料号")
+    private String itemPartNo;
+
+    @Column(name = "ITEM_PART_NAME")
+    @ApiParam("拣选物料名称")
+    private String itemPartName;
+
     @Column(name = "QTY")
     @ApiParam("数量")
     private Integer qty;
@@ -49,4 +57,12 @@ public class PtlMainTaskDetail extends BaseBean implements Serializable {
     @ApiParam("物料种类")
     private Integer partCategory;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
 }
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java
new file mode 100644
index 0000000..167a62d
--- /dev/null
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java
@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.ptl.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 生产队列主表
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-04-16-17:36
+ * @Modify:
+ **/
+@Data
+@ApiModel("生产队列主表")
+public class  MesQueueOrder implements Serializable {
+
+    private static final long serialVersionUID = -3124113504001270712L;
+
+    @ApiParam("主队列编号")
+    private String orderNo;
+
+    @ApiParam("Vin")
+    private String vinCode;
+
+    @ApiParam("客户标识号")
+    private String custFlagNo;
+
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+
+    @ApiParam("产品配置名称")
+    private String prodCfgNameRdd;
+
+    @ApiParam("排序")
+    private Double seq;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("状态")
+    private Integer status;
+
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
+
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @ApiParam("锁定标识")
+    private Integer isLock;
+
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @ApiParam("工单类型")
+    private String workType;
+
+    @ApiParam("队列类型")
+    private Integer queueType;
+
+    @ApiParam("生产组代码")
+    private String pgCode;
+
+    @ApiParam(value = "id")
+    public Long id;
+
+    @ApiParam(value ="组织代码")
+    public String organizeCode;
+
+    @ApiParam(value = "有效性")
+    public Integer isValid;
+
+    @ApiParam(value = "是否已删除")
+    public Integer isDeleted;
+
+    @ApiParam(value = "创建用户")
+    public String createUser;
+
+    @ApiParam(value = "创建日期")
+    public String createDatetime;
+
+    @ApiParam(value = "修改人")
+    public String modifyUser;
+
+    @ApiParam(value = "修改日期")
+    public String modifyDatetime;
+
+}
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java
new file mode 100644
index 0000000..48d66be
--- /dev/null
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java
@@ -0,0 +1,90 @@
+package cn.estsh.i3plus.pojo.ptl.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 生产队列明细
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-04-16-17:36
+ * @Modify:
+ **/
+@Data
+@ApiModel("生产队列明细")
+public class MesQueueOrderDetail implements Serializable {
+
+    private static final long serialVersionUID = 1945173626511595078L;
+
+    @ApiParam("主队列编号")
+    private String orderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("队列明细序号")
+    private Double seq;
+
+    @ApiParam("数量")
+    private Double qty;
+
+    @ApiParam("状态")
+    private Integer status;
+
+    @ApiParam("生产类型")
+    private String workType;
+
+    @ApiParam("产品类型代码")
+    private String produceCategoryCode;
+
+    @ApiParam("产品类型名称")
+    private String produceCategoryNameRdd;
+
+    @ApiParam("产品类型名称")
+    private String pptCode;
+
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @ApiParam("组内编号")
+    private Integer groupNo;
+
+    @ApiParam("料架是否已打印")
+    private Integer isGroupPrinted;
+
+    @ApiParam("已生产数量")
+    private Double finsihQty;
+
+    @ApiParam(value = "id")
+    public Long id;
+
+    @ApiParam(value ="组织代码")
+    public String organizeCode;
+
+    @ApiParam(value = "有效性")
+    public Integer isValid;
+
+    @ApiParam(value = "是否已删除")
+    public Integer isDeleted;
+
+    @ApiParam(value = "创建用户")
+    public String createUser;
+
+    @ApiParam(value = "创建日期")
+    public String createDatetime;
+
+    @ApiParam(value = "修改人")
+    public String modifyUser;
+
+    @ApiParam(value = "修改日期")
+    public String modifyDatetime;
+}
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java
new file mode 100644
index 0000000..fdfb332
--- /dev/null
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java
@@ -0,0 +1,83 @@
+package cn.estsh.i3plus.pojo.ptl.model;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description :工位物料清单
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@ApiModel("工位物料清单")
+public class MesStationBom implements Serializable {
+
+    private static final long serialVersionUID = -2658812944873600461L;
+
+    @ApiParam("零件号")
+    private String partNo;
+
+    @ApiParam("产品物料名称")
+    private String partName;
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @ApiParam("子零件")
+    private String itemPartNo;
+
+    @ApiParam("原材料物料名称")
+    private String itemPartName;
+
+    @ApiParam(value = "子零件数量")
+    private Double qty;
+
+    @ApiParam(value = "是否可重复")
+    private Integer isRepeat;
+
+    @ApiParam(value = "是否检查")
+    private Integer isCheck;
+
+    @ApiParam(value = "是否投料配置")
+    private Integer isFeed;
+
+    @ApiParam(value = "是否绑定关键件")
+    private Integer isBindKey;
+
+    @ApiParam(value = "匹配规则")
+    private Integer matchRule;
+
+    @ApiParam(value = "id")
+    public Long id;
+
+    @ApiParam(value ="组织代码")
+    public String organizeCode;
+
+    @ApiParam(value = "有效性")
+    public Integer isValid;
+
+    @ApiParam(value = "是否已删除")
+    public Integer isDeleted;
+
+    @ApiParam(value = "创建用户")
+    public String createUser;
+
+    @ApiParam(value = "创建日期")
+    public String createDatetime;
+
+    @ApiParam(value = "修改人")
+    public String modifyUser;
+
+    @ApiParam(value = "修改日期")
+    public String modifyDatetime;
+
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java
index 6942fee..af83020 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java
@@ -76,10 +76,6 @@ public class BasPlugin extends BaseBean{
     @ApiParam(value = "插件状态", example = "1")
     private Integer pluginStatus;
 
-    @Column(name = "PLUGIN_DIRECTORY")
-    @ApiParam(value = "本地插件文件夹")
-    private String pluginDirectory;
-
     @Column(name = "PLUGIN_PACKAGE_NAME")
     @ApiParam(value = "插件项目包名称")
     private String pluginPackName;