diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index ebd53c3..f8fa98e 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 c052a9d..b0a3f82 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 e97c0bb..d790ef1 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/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
index 08085ad..ef05abd 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
@@ -2,10 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiParam;
@@ -65,12 +62,12 @@ public abstract class BaseBean implements Serializable {
 //    @AnnoOutputColumn(hidden = true)
     public String organizeCode;
 
-    @Column(name="IS_VALID")
+    @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)
     @ApiParam(value = "有效性",example = "1")
     @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
     public Integer isValid;    //CommonEnumUtil.IS_VAILD;
 
-    @Column(name="IS_DELETED")
+    @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false)
     @ApiParam(value = "是否已删除",example = "2")
     @AnnoOutputColumn(hidden = true)
     //逻辑删除，软删除
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 69259c5..3a5133e 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
@@ -644,7 +644,8 @@ public class WmsEnumUtil {
 		VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"),
         KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货"),
         KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货"),
-        FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运");
+        FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"),
+        KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货");
 
         private int value;
         private String code;
@@ -823,11 +824,12 @@ public class WmsEnumUtil {
         VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"),
         VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错"),
         VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"),
-        VDA_SN_("VDA_SN_MERGE", "VDA条码合并"),
+        VDA_SN_MERGE("VDA_SN_MERGE", "VDA条码合并"),
         VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"),
         VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询"),
 		VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"),
-        VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理");
+        VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"),
+        KT_PICK_RC("KT_PICK_RC", "坤泰拣货");
         private String value;
         private String description;
 
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index 90e744d..c6141da 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 0ba3645..23e5bee 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-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index 6706323..c1e2cb9 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 ffcac19..856da5f 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-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index e388a1d..09f2c4a 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/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 62ebe64..82fdbe8 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/model/IfRawPartDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java
index 65b038b..a55a07f 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java
@@ -57,7 +57,7 @@ public class IfRawPartDataModel extends BaseBean {
     private String supplierCode;
 
     @ApiParam("工厂代码")
-    private String organizationCode;
+    private String organizeCode;
 
     @ApiParam("同步状态")
     private Integer syncStatus;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java
new file mode 100644
index 0000000..d958a07
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java
@@ -0,0 +1,116 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\29 11:34
+ * @Modify:
+ **/
+@Data
+public class QcCheckDataModel {
+
+    private Long id;
+    public String organizeCode;
+    public String createUser;
+    public String createDatetime;
+
+    @ApiParam("检测id")
+    private String checkId;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("检测类型")
+    private Integer checkType;
+
+    @ApiParam("检测项")
+    private String checkItem;
+
+    @ApiParam("检测标准")
+    private String checkStandard;
+
+    @ApiParam("检测指导")
+    private String checkGuide;
+
+    @ApiParam("频率")
+    private String checkFrequency;
+
+    @ApiParam("检测值")
+    private String checkValue;
+
+    @ApiParam("判定结果")
+    private String checkResult;
+
+    @ApiParam("产品条码")
+    private String sn;
+
+    @ApiParam("产品数量")
+    private Integer qty;
+
+    @ApiParam("备注")
+    private String memo;
+
+    @ApiParam("工单号")
+    private String orderNo;
+
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @ApiParam("班次")
+    private String shiftCode;
+
+    @ApiParam("班组")
+    private String shiftGroupName;
+
+    @ApiParam("班长")
+    private String squadLeader;
+
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
+    @ApiParam("物料名称")
+    private String partNoName;
+
+    public QcCheckDataModel() {
+
+    }
+
+    public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String checkId, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String checkValue, String checkResult, String sn, Integer qty, String memo, String orderNo, String custCode, String shiftCode, String shiftGroupName, String squadLeader, String workCellName, String partNoName) {
+        this.id = id;
+        this.organizeCode = organizeCode;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.checkId = checkId;
+        this.partNo = partNo;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.checkType = checkType;
+        this.checkItem = checkItem;
+        this.checkStandard = checkStandard;
+        this.checkGuide = checkGuide;
+        this.checkFrequency = checkFrequency;
+        this.checkValue = checkValue;
+        this.checkResult = checkResult;
+        this.sn = sn;
+        this.qty = qty;
+        this.memo = memo;
+        this.orderNo = orderNo;
+        this.custCode = custCode;
+        this.shiftCode = shiftCode;
+        this.shiftGroupName = shiftGroupName;
+        this.squadLeader = squadLeader;
+        this.workCellName = workCellName;
+        this.partNoName = partNoName;
+    }
+}
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 23d69d6..ae7e52e 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
@@ -2048,4 +2048,28 @@ public class MesHqlPack {
                 "createDatetime", packBean, true);
         return packBean;
     }
+
+    /**
+     * 物料对象
+     *
+     * @param partObject
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesPartObject(MesPartObject partObject, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(partObject, organizeCode);
+        if (!StringUtils.isEmpty(partObject.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(partObject.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(partObject.getObjectCode())) {
+            DdlPreparedPack.getStringLikerPack(partObject.getObjectCode(), "objectCode", packBean);
+        }
+        if (!StringUtils.isEmpty(partObject.getObjectName())) {
+            DdlPreparedPack.getStringLikerPack(partObject.getObjectName(), "objectName", packBean);
+        }
+        if (!StringUtils.isEmpty(partObject.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(partObject.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        return packBean;
+    }
 }
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index 39d9423..b7b2dfc 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-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java
similarity index 95%
rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java
rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java
index 9a5fb95..5940720 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.wms.bean.iotio;
+package cn.estsh.i3plus.pojo.model.wms;
 
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index e310bfd..ec9e100 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-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index e36fcf7..bd09726 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 81fb02b..4c96781 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 1f622d9..2c24e41 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 bc41914..18c811c 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/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java
index 9efc5aa..1cb16f8 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java
@@ -22,96 +22,96 @@ import javax.persistence.Table;
  **/
 @Data
 @Entity
-@Table(name="AMP_JIS_REC")
+@Table(name = "AMP_JIS_REC")
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Api(value="AMP_JIS收货",description = "AMP_JIS收货")
-public class AmpJisRec extends BaseBean{
+@Api(value = "AMP_JIS收货", description = "AMP_JIS收货")
+public class AmpJisRec extends BaseBean {
 
     private static final long serialVersionUID = 4460727160153551089L;
-    @Column(name="ORDER_NO")
+    @Column(name = "ORDER_NO", columnDefinition = "varchar(225) default ''", nullable = false)
     @ApiParam("JIS单号")
     public String orderNo;
 
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO", columnDefinition = "varchar(225) default ''", nullable = false)
     @ApiParam("物料编码")
     public String partNo;
 
-    @Column(name="PART_NAME_RDD")
+    @Column(name = "PART_NAME_RDD", columnDefinition = "varchar(225) default ''", nullable = false)
     @ApiParam("物料名称")
     public String partNameRdd;
 
-    @Column(name="QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "数量", example = "0")
     public Double qty;
 
-    @Column(name="UNIT")
+    @Column(name = "UNIT", columnDefinition = "varchar(225) default ''", nullable = false)
     @ApiParam("单位")
     public String unit;
 
-    @Column(name="SN")
+    @Column(name = "SN", columnDefinition = "varchar(225) default ''", nullable = false)
     @ApiParam("条码")
     public String sn;
 
     /**
      * 状态:10=新建,20=已处理,30=处理出错
      */
-    @Column(name="ORDER_STATUS")
+    @Column(name = "ORDER_STATUS", columnDefinition = "int default 0", nullable = false)
     @ApiParam(value = "状态", example = "10")
     public Integer orderStatus;
 
-    @Column(name="VENDOR_NO")
+    @Column(name = "VENDOR_NO", columnDefinition = "varchar(225) default ''", nullable = false)
     @ApiParam(value = "供应商编码", example = "10")
     public String vendorNo;
 
-    @Column(name="REMARK")
+    @Column(name = "REMARK", columnDefinition = "varchar(225) default ''", nullable = false)
     @ApiParam("备注")
     public String remark;
 
-    @Column(name="SRC")
+    @Column(name = "SRC", columnDefinition = "varchar(225) default ''", nullable = false)
     @ApiParam("单据来源")
     public String src;
 
-    @Column(name="SHIPPING_FLAG")
+    @Column(name = "SHIPPING_FLAG", columnDefinition = "varchar(225) default ''", nullable = false)
     @ApiParam("特殊发货标志")
     public String shippingFlag;
 
-    @Column(name="ERROR_MESSAGE")
+    @Column(name = "ERROR_MESSAGE", columnDefinition = "varchar(225) default ''", nullable = false)
     @ApiParam("错误信息")
     public String errorMessage;
 
-    @Column(name="AREA_NO")
+    @Column(name = "AREA_NO", columnDefinition = "varchar(225) default ''", nullable = false)
     @ApiParam("ERP库存地")
     public String areaNo;
 
-    @Column(name="CAR_NO")
+    @Column(name = "CAR_NO", columnDefinition = "varchar(225) default ''", nullable = false)
     @ApiParam("车号")
     public String carNo;
 
-    @Column(name="VIN")
+    @Column(name = "VIN", columnDefinition = "varchar(225) default ''", nullable = false)
     @ApiParam("VIN号")
     public String vin;
 
-    @Column(name="SHIPPING_TIME")
+    @Column(name = "SHIPPING_TIME", columnDefinition = "varchar(225) default ''", nullable = false)
     @ApiParam("发运时间")
     public String shippingTime;
 
-    @Column(name="SID")
+    @Column(name = "SID", columnDefinition = "varchar(225) default ''", nullable = false)
     @ApiParam("sid")
     public String sid;
 
-    @Column(name="IS_LOCK")
-    @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定" )
+    @Column(name = "IS_LOCK", columnDefinition = "int default 0", nullable = false)
+    @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定")
     public Integer isLock;
 
-    @Column(name="ERP_SYNC_FLAG")
-    @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" )
+    @Column(name = "ERP_SYNC_FLAG", columnDefinition = "int default 0", nullable = false)
+    @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败")
     public Integer erpSyncFlag;
 
-    public AmpJisRec(Long id,String partNo, String partNameRdd,String vendorNo,Double qty,String unit){
-        this.id= id;
+    public AmpJisRec(Long id, String partNo, String partNameRdd, String vendorNo, Double qty, String unit) {
+        this.id = id;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.vendorNo = vendorNo;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
index 34d1a36..12dff4c 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
@@ -159,6 +159,10 @@ public class WmsPOMaster extends BaseBean {
     @Transient
     private List<String> orderNoList;
 
+    @Column(name = "DOCK")
+    @ApiParam("道口")
+    public String dock;
+
     public int getPoStatusVal() {
         return this.poStatus == null ? 0 : this.poStatus;
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java
new file mode 100644
index 0000000..69e19ef
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java
@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.wms.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 : gcj
+ * @CreateDate : 2019-11-27 16:06
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PICK_COUNT")
+@Api("供应商物料每月数量")
+public class WmsPickCount extends BaseBean {
+
+    private static final long serialVersionUID = 4849044986767609486L;
+    @Column(name = "YEAR")
+    @ApiParam(value = "年")
+    private String year;
+
+    @Column(name = "MONTH")
+    @ApiParam(value = "月")
+    private String month;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编码")
+    private String vendorNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料号")
+    private String partNo;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "数量")
+    private Double qty;
+
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java
index 738ffbc..1a5b744 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java
@@ -21,7 +21,7 @@ public class WmsCheckPoint extends BaseBean {
 
     private static final long serialVersionUID = 5589497687871639189L;
 
-    @Column(name="SNAPSHOT_TIME")
+    @Column(name="SNAPSHOT_TIME", columnDefinition="varchar(225) default ''",nullable=false)
     @ApiParam("快照时间")
     public String snapshotTime;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java
index 4bd50f1..865ca6e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsPartQtyDto.java
@@ -26,10 +26,10 @@ public class WmsPartQtyDto {
     }
 
     public Double getRcQty() {
-        return rcQty == null? 0.0:qty;
+        return rcQty == null? 0.0:rcQty;
     }
 
     public Double getDueQty() {
-        return dueQty == null? 0.0:qty;
+        return dueQty == null? 0.0:dueQty;
     }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickCountRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickCountRepository.java
new file mode 100644
index 0000000..a62056a
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickCountRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPickCount;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(拣货数量)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 13:40
+ * @Modify:
+ **/
+@Repository
+public interface WmsPickCountRepository extends BaseRepository<WmsPickCount, Long>{
+
+}
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index 93f9732..1171f4e 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 aea4d9c..5345a36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,8 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>
-    <modules>
+    <version>1.0-TEST-SNAPSHOT</version>    <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>
         <module>modules/i3plus-pojo-model</module>
@@ -198,4 +197,27 @@
             <url>http://mvn.estsh.com/repository/maven-snapshots/</url>
         </snapshotRepository>
     </distributionManagement>
+
+    <!--<build>-->
+        <!--<plugins>-->
+            <!--<plugin>-->
+                <!--<groupId>org.springframework.boot</groupId>-->
+                <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
+            <!--</plugin>-->
+
+            <!--&lt;!&ndash;  添加编译插件 &ndash;&gt;-->
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-compiler-plugin</artifactId>-->
+                <!--<version>3.5.1</version>-->
+                <!--<configuration>-->
+                    <!--<source>1.8</source>-->
+                    <!--<target>1.8</target>-->
+                    <!--<encoding>UTF-8</encoding>-->
+                <!--</configuration>-->
+            <!--</plugin>-->
+        <!--</plugins>-->
+    <!--</build>-->
+
+
 </project>
\ No newline at end of file