diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index 004fb69..bc7071b 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index 650ee5b..f902a7c 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index 9f9717e..807bef5 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
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 8ffab7a..657a47e 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
@@ -707,7 +707,7 @@ public class MesEnumUtil {
         EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
         EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
         EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
-        BH_PACKAGE_TYPE_VALUE("EQU_DEFECT_PHENOMENON", "B&H包装条码赋值样品类型值");
+        BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值");
 
         private String value;
         private String description;
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 c22fa26..957ed64 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
@@ -3364,6 +3364,7 @@ public class WmsEnumUtil {
     public enum SRC_STATUS {
         ZMMES("ZMMES", "知明MES"),
         TBMES("TBMES", "MES接口"),
+        TGMES("TGMES", "泰国MES"),
         AMP("AMP", "AMP系统"),
         DR("DR", "直送拉动");
 
@@ -3382,6 +3383,16 @@ public class WmsEnumUtil {
         public String getDescription() {
             return description;
         }
+
+        public static String descriptionOfValue(String value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     public static Map<String, Object> getEnumByName(String enumName) throws Exception {
@@ -7554,16 +7565,16 @@ public class WmsEnumUtil {
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SCAN_CATEGORY {
-        ASN(10, "wmsDoMovementMasterRepository", "ASN"),
-        PO(20, "wmsDoMovementMasterRepository", "PO"),
-        SO(30, "wmsDoMovementMasterRepository", "SO"),
-        MOVE(40, "wmsDoMovementMasterRepository", "移库单"),
-        IN_STOCK(50, "wmsDoMovementMasterRepository", "入库单"),
-        SHIPPING(60, "wmsDoMovementMasterRepository", "发运单"),
-        QC(70, "wmsDoMovementMasterRepository", "质检单"),
+        ASN(10, "wmsDocMovementMasterRepository", "ASN"),
+        PO(20, "wmsDocMovementMasterRepository", "PO"),
+        SO(30, "wmsDocMovementMasterRepository", "SO"),
+        MOVE(40, "wmsDocMovementMasterRepository", "移库单"),
+        IN_STOCK(50, "wmsDocMovementMasterRepository", "入库单"),
+        SHIPPING(60, "wmsDocMovementMasterRepository", "发运单"),
+        QC(70, "wmsQCMasterRepository", "质检单"),
         CS(80, "wmsCSOrderMasterRepository", "盘点单"),
         SN(90, "wmsStockSnRepository", "条码"),
-        PO_SN(100, "wmsPoSnRepository", "收货条码");
+        PO_SN(100, "wmsPoSnRepository,wmsASNMasterDetailsRepository", "收货条码");
 
         private int value;
         private String code;
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
index 3d220a2..afd81eb 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
@@ -46,6 +46,8 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     private Class<T> persistentClass;
     private SnowflakeIdMaker snowflakeIdMaker;
+    /* 默认查询数据条数 */
+    private static final Pager DEFAULT_PAGER = new Pager(10,10);
 
     public BaseRepositoryImpl(Class<T> clz, EntityManager em, SnowflakeIdMaker snowflakeIdMaker) {
         super(clz, em);
@@ -507,7 +509,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     @Override
     public T getByProperty(DdlPackBean packBean) {
         try {
-            List<T> list = findByHqlWherePage(packBean,Pager.defaultMinPager());
+            List<T> list = findByHqlWherePage(packBean,DEFAULT_PAGER);
             return list != null && list.size() != 0 ? list.get(0) : null;
         }catch(NoResultException ne){
             LOGGER.error("数据不存在，DdlPackBean：{}",packBean);
@@ -520,17 +522,17 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public T getByProperty(String propertyName, Object value) {
-        return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, Pager.defaultMinPager());
+        return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, DEFAULT_PAGER);
     }
 
     @Override
     public T getByProperty(String[] propertyNames, Object[] values) {
-        return getByPropertyPager(propertyNames, values, Pager.defaultMinPager());
+        return getByPropertyPager(propertyNames, values, DEFAULT_PAGER);
     }
 
     @Override
     public T getByPropertyPager(String[] propertyNames, Object[] values, Pager pager) {
-        pager = pager == null ? Pager.defaultMinPager(): pager;
+        pager = pager == null ? DEFAULT_PAGER: pager;
 
         if(propertyNames.length != values.length){
             throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
@@ -601,7 +603,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         try {
             if(!StringUtil.isEmpty(vendorNoStr)){
                 String queryString = "from " + persistentClass.getSimpleName() + " as model where model.vendorNo= :vendorNo";
-               list=entityManager.createQuery(queryString)
+                list=entityManager.createQuery(queryString)
                         .setParameter("vendorNo", vendorNoStr)
                         .getResultList();
             }
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index a9e288f..b948580 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index a44418c..e12eaee 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml
index 2de88b5..c338f71 100644
--- a/modules/i3plus-pojo-ics/pom.xml
+++ b/modules/i3plus-pojo-ics/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index 123fdc9..1674a47 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index 50ab2c2..7637865 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml
index 7f94617..d98b7d8 100644
--- a/modules/i3plus-pojo-mdm/pom.xml
+++ b/modules/i3plus-pojo-mdm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index d800ecf..bf96e57 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java
new file mode 100644
index 0000000..6464445
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java
@@ -0,0 +1,74 @@
+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.io.Serializable;
+
+/**
+ * @Description :工位投料履历信息
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-06-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CELL_FEED_RECORD")
+@Api("工位投料履历信息")
+public class MesCellFeedRecord extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 1947971379489107783L;
+    @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 = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "RAW_TYPE")
+    @ApiParam("原料类型")
+    private String rawType;
+
+    @Column(name = "RAW_SN")
+    @ApiParam("原材料条码")
+    private String rawSn;
+
+    @Column(name = "RAW_QTY")
+    @ApiParam("原材料数量")
+    private Double rawQty;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("关联批次")
+    private String lotNo;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+
+    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/repository/MesCellFeedRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java
new file mode 100644
index 0000000..6153d23
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.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.MesCellFeedRecord;
+
+/**
+ * @Description : 工位投料履历持久化类
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-06-17 09:53
+ * @Modify:
+ **/
+public interface MesCellFeedRecordRepository extends BaseRepository<MesCellFeedRecord, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 60fc467..a758a6a 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
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
index 7158108..e02f6cf 100644
--- 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
@@ -40,9 +40,13 @@ public class IfPackageDetail extends BaseBean  implements Serializable {
     private String partName;
 
     @Column(name = "SERIAL_NUMBER")
-    @ApiParam("产品条码")
+    @ApiParam("过程条码")
     private String serialNumber;
 
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
     @Column(name = "PACKAGE_NO")
     @ApiParam("包装条码")
     private String packageNo;
@@ -100,11 +104,11 @@ public class IfPackageDetail extends BaseBean  implements Serializable {
     @ApiParam("容器编号")
     private String ctNo;
 
-    @Column(name = "SN_TYPE")
+    @Column(name = "SAMPLE_TYPE")
     @ApiParam("条码类型")
-    private String snType;
+    private String sampleType;
 
-    @Column(name = "SHIPPING_FLAG")
+    @Column(name = "CUST_DELIVERY_LOCATION")
     @ApiParam("客户发往地")
-    private String shippingFlag;
+    private String custDeliveryLocation;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java
new file mode 100644
index 0000000..9386832
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java
@@ -0,0 +1,74 @@
+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 : siliter.yuan
+ * @CreateDate : 2020-06-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CELL_FEED_RECORD")
+@Api("工位投料履历信息")
+public class MesCellFeedRecord extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 1947971369489107783L;
+    @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 = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "RAW_TYPE")
+    @ApiParam("原料类型")
+    private String rawType;
+
+    @Column(name = "RAW_SN")
+    @ApiParam("原材料条码")
+    private String rawSn;
+
+    @Column(name = "RAW_QTY")
+    @ApiParam("原材料数量")
+    private Double rawQty;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("关联批次")
+    private String lotNo;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+
+    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/MesCustomer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java
index f0851f2..129d45e 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java
@@ -54,7 +54,7 @@ public class MesCustomer extends BaseBean implements Serializable {
     @ApiParam("客户电话")
     private String telephone;
 
-    @Column(name = "SHIPPING_FLAG")
+    @Column(name = "CUST_DELIVERY_LOCATION")
     @ApiParam("客户发往地")
-    private String shippingFlag;
+    private String custDeliveryLocation;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java
index e3982b1..3bbe40e 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java
@@ -44,4 +44,8 @@ public class MesFiCfg extends BaseBean implements Serializable {
     @Column(name = "FI_QTY")
     @ApiParam("首检数量")
     private Double fiQty;
+
+    @Column(name = "CHECK_ITEM_TYPE")
+    @ApiParam("检测项类型")
+    private String checkItemType;
 }
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 c7d49ea..4b81afd 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
@@ -110,13 +110,13 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("容器编号")
     private String ctNo;
 
-    @Column(name = "SN_TYPE")
+    @Column(name = "SAMPLE_TYPE")
     @ApiParam("条码类型")
-    private String snType;
+    private String sampleType = "10";
 
     @Transient
     @ApiParam("客户发往地")
-    private String shippingFlag;
+    private String custDeliveryLocation;
 
     public MesPackage() {
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java
new file mode 100644
index 0000000..4b756ee
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java
@@ -0,0 +1,44 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/7/30 9:30 AM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PART_SAMPLE")
+@Api("产品样本配置")
+public class MesPartSample extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -9190123981329081945L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
index 90a96f1..66ba978 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
@@ -100,21 +100,30 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
     @ApiParam(value = "动作类型")
     private Integer actionType;
 
+    @Transient
     @ApiParam(value = "是否绑定关键件名称")
     private String isBindKeyName;
 
+    @Transient
     @ApiParam(value = "动作类型名称")
     private String actionTypeName;
 
+    @Transient
     @ApiParam("产品条码零件名称")
     private String partName;
 
+    @Column(name = "ITEM_PART_NAME")
     @ApiParam("原材料零件名称")
     private String itemPartName;
 
+    @Transient
     @ApiParam("生产队列号")
     private String orderNo;
 
+    @Transient
+    @ApiParam("产品条码")
+    private String productSn;
+
 
     public int getIsFeedVal() {
         return this.isFeed == null ? 0 : this.isFeed;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
index 9e98310..7a27711 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
@@ -104,6 +104,10 @@ public class MesQcOrder extends BaseBean  implements Serializable {
     @ApiParam("客户发运地")
     private String custDelieryLocation;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
     @ApiParam(value = "检测结果")
     @Transient
     private String reulstStatus;
@@ -112,10 +116,6 @@ public class MesQcOrder extends BaseBean  implements Serializable {
     @Transient
     private String serialNumber;
 
-    @ApiParam(value = "产线")
-    @Transient
-    private String workCenterCode;
-
     @ApiParam(value = "工单号")
     @Transient
     private String mesWorkNo;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java
index e0a1558..05466cb 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java
@@ -24,7 +24,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_SUB_PART")
-@Api("数据同步死信")
+@Api("替代料")
 public class MesSubPart extends BaseBean implements Serializable {
     private static final long serialVersionUID = 4636507477301700549L;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
index d2b83c3..27ad0ee 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
@@ -2,12 +2,14 @@ package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
+import com.alibaba.fastjson.JSONObject;
 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 org.springframework.util.StringUtils;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -270,7 +272,6 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam(value = "扩展数据MAP")
     public Map<String, Object> extendMap;
 
-
     @Transient
     @ApiParam("工单源序号")
     private Double srcSeq;
@@ -314,4 +315,16 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     public int getApprovalStatusVal() {
         return this.approvalStatus == null ? 0 : this.approvalStatus;
     }
+
+    public Map<String, Object> getExtendMap() {
+        try {
+            if (!StringUtils.isEmpty(this.extend)) {
+                return JSONObject.parseObject(this.extend, Map.class);
+            } else {
+                return null;
+            }
+        } catch (Exception e) {
+            return null;
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java
index a4b29ec..16d16db 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java
@@ -37,20 +37,27 @@ public class ButtonDynamicModel {
     private String paramValue;
 
 
-    public ButtonDynamicModel(Long id, String buttonCode, String buttonName){
+    public ButtonDynamicModel(Long id, String buttonCode, String buttonName) {
         this.id = id;
         this.buttonCode = buttonCode;
         this.buttonName = buttonName;
     }
 
 
-    public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode){
+    public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode) {
         this.buttonCode = buttonCode;
         this.buttonName = buttonName;
         this.paramCode = paramCode;
     }
 
-    public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue){
+    public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode, String paramValue) {
+        this.buttonCode = buttonCode;
+        this.buttonName = buttonName;
+        this.paramCode = paramCode;
+        this.paramValue = paramValue;
+    }
+
+    public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue) {
         this.id = id;
         this.buttonCode = buttonCode;
         this.windowNo = windowNo;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java
index d97a57a..6913759 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java
@@ -30,4 +30,6 @@ public class CellFeedModel {
 
     private String scanQty;
 
+    private String LineRemainQty;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSampleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSampleModel.java
new file mode 100644
index 0000000..33fd2aa
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSampleModel.java
@@ -0,0 +1,49 @@
+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.Map;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/16 14:21
+ * @desc 打包样本
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("打包样本")
+public class PackageSampleModel {
+
+    @ApiParam(name = "已打包数量")
+    private Double alreadyPackageCount;
+
+    @ApiParam(name = "标准打包数量")
+    private Double standardPackageCount;
+
+    @ApiParam(name = "样本类型")
+    private Map<String, String> sampleTypeMap;
+
+    @ApiParam(name = "样本类型代码")
+    private String lastSampleTypeCode;
+
+    @ApiParam(name = "选择的样本类型")
+    private String chooseSampleTypeCode;
+
+    @ApiParam(name = "强制执行工步")
+    private String forceStepCode;
+
+    @ApiParam(name = "强制打包密码")
+    private String password;
+
+    @ApiParam(name = "工厂")
+    private String organizeCode;
+
+    @ApiParam(name = "工单号")
+    private String workOrderNo;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
index cb0303b..1c5a88e 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
@@ -150,6 +150,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("特殊展示数据")
     private Map<String, Object> specialDisplayMap  = new HashMap<>();
 
+    @ApiParam("物料名称")
+    private String partName;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRecordRepository.java
new file mode 100644
index 0000000..5cb4185
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRecordRepository.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.MesCellFeedRecord;
+
+/**
+ * @Description : 工位投料履历持久化类
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-06-17 09:53
+ * @Modify:
+ **/
+public interface MesCellFeedRecordRepository extends BaseRepository<MesCellFeedRecord, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartSampleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartSampleRepository.java
new file mode 100644
index 0000000..881d274
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartSampleRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartSample;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesPartSampleRepository extends BaseRepository<MesPartSample, 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 da79ca8..275d38f 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
@@ -11,8 +11,10 @@ import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
 import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect;
 import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import java.util.List;
 /**
  * @Description:
  * @Reference: Mes 条件封装
@@ -2003,11 +2005,14 @@ public class MesHqlPack {
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode) {
+    public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode, List<String> serialNumbers) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdBindRecord, organizeCode);
         if (!StringUtils.isEmpty(mesProdBindRecord.getItemPartNo())) {
             DdlPreparedPack.getStringRightLikerPack(mesProdBindRecord.getItemPartNo(), "itemPartNo", packBean);
         }
+        if (!CollectionUtils.isEmpty(serialNumbers)) {
+            DdlPreparedPack.getInPackList(serialNumbers, "serialNumber", packBean);
+        }
         if (!StringUtils.isEmpty(mesProdBindRecord.getSerialNumber())) {
             DdlPreparedPack.getStringEqualPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean);
         }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
index 6efe0f4..9d81d04 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
@@ -111,12 +111,28 @@ public class MesPcnHqlPack {
         return packBean;
     }
 
+    /**
+     * 获取工作中心下所有的投料履历数据
+     *
+     * @param mesCellFeedRecord
+     * @param org
+     * @return
+     */
+    public static DdlPackBean getMesCellFeedRecord(MesCellFeedRecord mesCellFeedRecord, String org) {
+        DdlPackBean packBean = getAllBaseData(org);
+        DdlPreparedPack.getStringEqualPack(mesCellFeedRecord.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
+        return packBean;
+    }
+
 
     /**
      * 获取原材料扫描信息的对应工序BOM
      *
      * @param stationBom
-     * @param rawPartSn
+     * @param rawPartNo
      * @return
      */
     public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, String rawPartNo) {
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index d65e031..efacfd2 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index a785f21..dba12cc 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index d6d2f8e..81670b2 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index 0fbfb69..26a7311 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index 76739f9..eaf2544 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index 0368700..0f615b6 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index b2eedd4..9e5f745 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java
index c13b717..b816bfe 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java
@@ -126,10 +126,19 @@ public class SapDocFgSum extends BaseBean {
     @ApiParam(value = "产品报工orderNo")
     private String fGOrderNo;
 
+    @Column(name = "SEQ_NO")
+    @ApiParam(value = "父位置号")
+    private String seqNo;
+
+    @Column(name = "ITEM_SEQ_NO")
+    @ApiParam(value = "子位置号")
+    private String itemSeqNo;
+
     public SapDocFgSum(){}
 
     public SapDocFgSum(Long wdfdId, Double qty, String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo,
-                       String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock, String effStartTime, String bomVersion, String fGOrderNo) {
+                       String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock,
+                       String effStartTime, String bomVersion, String fGOrderNo, String seqNo, String itemSeqNo) {
         this.wdfdId = wdfdId;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
@@ -147,6 +156,8 @@ public class SapDocFgSum extends BaseBean {
         this.effStartTime = effStartTime;
         this.bomVersion = bomVersion;
         this.fGOrderNo = fGOrderNo;
+        this.seqNo = seqNo;
+        this.itemSeqNo = itemSeqNo;
     }
     public SapDocFgSum(Long wdfdId, Double qty,String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo,
                        String itemPartNo, String itemPartName, String itemUnit, Double itemQty,String outAreaNo, String src, Integer isLock, String effStartTime) {
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
index 48fcef0..223cded 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
@@ -156,13 +156,21 @@ public class WmsDocFgDetail extends BaseBean {
     @ApiParam(value = "BOM版本号")
     private String bomVersion;
 
+    @Column(name = "FIX_LOT_NO", nullable = false)
+    @ApiParam(value = "特殊批次")
+    private String fixLotNo = "";
+
     @Column(name = "PACKAGE_NO")
     @ApiParam(value = "包装编号")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String packageNo;
 
-    @Column(name = "FIX_LOT_NO", nullable = false)
-    @ApiParam(value = "特殊批次")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
-    private String fixLotNo = "";
+    @Column(name = "SEQ_NO")
+    @ApiParam(value = "父位置号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String seqNo;
+
+    @Column(name = "ITEM_SEQ_NO")
+    @ApiParam(value = "子位置号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String itemSeqNo;
 }
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 6c182e1..1a11e38 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
@@ -340,7 +340,7 @@ public class WmsMoveSn extends BaseBean {
     }
 
     public WmsMoveSn(Long id,String organizeCode,String outRefSrc,String rcRefSrc,String outSn,String rcSn,
-                     String rcPartNo,String outPartNo,String outUnit,String rcUnit, Double outQty ,Double rcQty,
+                     String outPartNo,String rcPartNo,String outUnit,String rcUnit, Double outQty ,Double rcQty,
                      String outDatetime,String rcDatetime ,String vendorNo, String modifyUser,String modifyDatetime) {
         this.id = id;
         this.organizeCode = organizeCode;
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 3b790fb..5ad3da6 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
@@ -745,7 +745,7 @@ public class WmsStockSn extends BaseBean {
                       String shippingFlag, String workCenterCode, Integer snType,
                       String packagePartNo, Integer useCount, Integer seqNo,
                       String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc,
-                      String prodCfgTypeName, String custNameRdd) {
+                      String prodCfgTypeName, String custNameRdd, String workOrderCode) {
         this.organizeCode = organizeCode;
         this.id = id;
         this.sn = sn;
@@ -791,7 +791,7 @@ public class WmsStockSn extends BaseBean {
         this.partTypeDesc = partTypeDesc;
         this.prodCfgTypeName = prodCfgTypeName;
         this.custNameRdd = custNameRdd;
-        this.vendorNameRdd = vendorNameRdd;
+        this.workOrderCode = workOrderCode;
     }
 
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
index be8dd7d..99716c7 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
@@ -9,8 +9,13 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @Description : 作业任务明细信息
@@ -140,6 +145,11 @@ public class WmsTaskDetails extends BaseBean {
     @ApiParam("交易类型")
     public String transTypeCodeRdd;
 
+    @Transient
+    @ApiParam("工厂代码集合")
+    private List<String> organizeCodeList;
+
+
     public Double getQty() {
         return this.qty == null ? 0 : this.qty;
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java
index a20ea25..2c5f6e1 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java
@@ -77,6 +77,10 @@ public class WmsTransType extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_BACK_TYPE.class, refForeignKey = "value", value = "description")
     private Integer orderBackType;
 
+    @Column(name = "TM_NAME")
+    @ApiParam(value = "交易处理组件名称")
+    private String tmName;
+
     @Transient
     @ApiParam("菜单URL")
     private String menuUrl;
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 d88c8fd..bb526fb 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
@@ -224,6 +224,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean);
         DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
+        DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getErpSrcNo(), "erpSrcNo", packBean);
         DdlPreparedPack.getInPackList(wmsDocMovementMaster.getOrganizeCodeList(), "organizeCode", packBean);
         getStringBuilderPack(wmsDocMovementMaster, packBean);
 
@@ -1912,6 +1913,7 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsTaskDetails(WmsTaskDetails taskDetails) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(taskDetails.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getInPackList(taskDetails.getOrganizeCodeList(), "organizeCode", result);
         getStringBuilderPack(taskDetails, result);
         return result;
     }
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index 5fcd08a..0fea52b 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 2eddf76..cc8fce6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>
diff --git a/sonar-project.properties b/sonar-project.properties
index 3428e74..932bdd9 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-PROD-SNAPSHOT
+sonar.projectVersion=1.0-TEST-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./