diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java
index c046242..440d49c 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java
@@ -1,15 +1,19 @@
+/*
 package cn.estsh.i3plus.pojo.platform.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
 import cn.estsh.i3plus.pojo.platform.bean.LogOperate;
 
+*/
 /**
  * @Description : 操作日志表(使用Mongodb)
  * @Reference   :
  * @Author      : wei.peng
  * @Date        : 2018-10-22 12:03:00.118
  * @Modify      :
- **/
+ **//*
+
 
 public interface LogOperateRepository extends BaseMongoRepository<LogOperate, Long> {
 }
+*/
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java
new file mode 100644
index 0000000..3cf7845
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java
@@ -0,0 +1,57 @@
+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 org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.prefs.BackingStoreException;
+
+/**
+ * @Description : 供应商
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-07 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="BAS_VENDOR")
+@Api("供应商")
+public class BasVendor extends BaseBean{
+
+    @Column(name="VENDOR_NO")
+    @ApiParam("供应商编号")
+    private String vendorNo;
+
+    @Column(name="VENDOR_NAME")
+    @ApiParam("供应商简称")
+    private String vendorName;
+
+    @Column(name="VENDOR_DESC")
+    @ApiParam("供应商全称")
+    private String vendorDesc;
+
+    @Column(name="VENDOR_ADDR")
+    @ApiParam("供应商地址")
+    private String vendorAddr;
+
+    @Column(name="VENDOR_OWNER")
+    @ApiParam("联系人")
+    private String vendorOwner;
+
+    @Column(name="VENDOR_EMAIL")
+    @ApiParam("邮箱")
+    private String vendorEmail;
+
+    @Column(name="IS_ASN")
+    @ApiParam("是否发ASN")
+    private Integer isAsn;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java
new file mode 100644
index 0000000..f3074ad
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java
@@ -0,0 +1,45 @@
+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 org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 作业类型
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-07 14:41
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_OP_TYPE")
+@Api("作业类型")
+public class WmsOpType extends BaseBean{
+
+    @Column(name="OP_TYPE_CODE")
+    @ApiParam("类型编号")
+    private String opTypeCode;
+
+    @Column(name="OP_TYPE_NAME")
+    @ApiParam("类型名称")
+    private String opTypeName;
+
+    @Column(name="SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+
+    @Column(name="PROG_CODE")
+    @ApiParam("处理程序")
+    private String proCode;
+
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasVendorRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasVendorRepository.java
new file mode 100644
index 0000000..4386df3
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasVendorRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.BasVendor;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-07 14:49
+ * @Modify:
+ **/
+@Repository
+public interface BasVendorRepository extends BaseRepository<BasVendor, Long> {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsOpTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsOpTypeRepository.java
new file mode 100644
index 0000000..59aad4c
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsOpTypeRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsOpType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 作业类型
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-07 14:46
+ * @Modify:
+ **/
+@Repository
+public interface WmsOpTypeRepository extends BaseRepository<WmsOpType, Long> {
+}
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 e350323..ba31919 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
@@ -157,14 +157,10 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result);
         HqlPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result);
         HqlPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result);
-        HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result);
-
-        // 默认有效
-        if(basVendor.getIsValid()==null){
-            HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",result);
-        }else{
-            HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.INVAILD.getValue()+"","isValid",result);
+        if(basVendor.getIsAsn()!= null){
+            HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result);
         }
+        HqlPack.getNumEqualPack(basVendor.getIsValid(),"isValid",result);
         return result.toString();
     }
 
@@ -179,12 +175,43 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(),"opTypeName",result);
         HqlPack.getStringLikerPack(wmsOpType.getSeq().toString(),"seq",result);
         HqlPack.getStringLikerPack(wmsOpType.getProCode(),"proCode",result);
-        // 默认有效
-        if(wmsOpType.getIsValid()==null){
-            HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",result);
-        }else{
-            HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.INVAILD.getValue()+"","isValid",result);
+        HqlPack.getNumEqualPack(wmsOpType.getIsValid(),"isValid",result);
+        return result.toString();
+    }
+
+    /**
+     * 仓库唯一性校验查询条件【用于添加和修改】
+     * @param wareHouse
+     * @return
+     */
+    public static String packHqlWareHouseUnique(WareHouse wareHouse){
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringEqualPack(wareHouse.getName(), "name", result);
+        HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result);
+        HqlPack.getNumNOEqualPack(wareHouse.getId(), "id", result);
+        return result.toString();
+    }
+
+    /**
+     * 供应商唯一性校验查询条件【用于添加和修改】
+     * @param basVendor
+     * @return
+     */
+    public static String packHqlBasVendorUnique(BasVendor basVendor){
+        StringBuffer result = new StringBuffer();
+        if(basVendor.getId()!=null){
+            HqlPack.getNumNOEqualPack(basVendor.getId(), "id", result);
         }
+        HqlPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result);
+        HqlPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result);
+        HqlPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result);
+        return result.toString();
+    }
+
+    public static String packHqlWmsOpTypeUnique(WmsOpType wmsOpType){
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
+        HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(),"opTypeName",result);
         return result.toString();
     }
 }