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 fdf314e..a84d7d9 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
@@ -32,10 +32,23 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsPart.getPartGroup(), "partGroup", result);
         return result.toString();
     }
+    /**
+     * 抽点比例信息 分页查询
+     * @param wmsIbCheckPlan
+     * @return
+     */
+    public static String packHqlWmsIbCheckPlan(WmsIbCheckPlan wmsIbCheckPlan) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
+        HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
+
+        return result.toString();
+    }
 
     /**
      * 库位物料信息 分页查询
-     *
      * @param wmsLocatePart
      * @return
      */
@@ -52,7 +65,6 @@ public class WmsHqlPack {
 
     /**
      * 库位信息 分页查询
-     *
      * @param wmsLocate
      * @return
      */
@@ -60,18 +72,17 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
-        HqlPack.getStringLikerPack(wmsLocate.getLocateNo(), "locateNo", result);
-        HqlPack.getStringLikerPack(wmsLocate.getLocateName(), "locateName", result);
-        HqlPack.getStringLikerPack(wmsLocate.getLocateType(), "locateType", result);
-        HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result);
-        HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result);
+        HqlPack.getStringLikerPack(wmsLocate.getLocateNo(),"locateNo",result);
+        HqlPack.getStringLikerPack(wmsLocate.getLocateName(),"locateName",result);
+        HqlPack.getStringLikerPack(wmsLocate.getLocateType(),"locateType",result);
+        HqlPack.getStringLikerPack(wmsLocate.getWhNo(),"whNo",result);
+        HqlPack.getStringLikerPack(wmsLocate.getZoneNo(),"zoneNo",result);
 
         return result.toString();
     }
 
     /**
      * 工厂仓库模糊分页查询
-     *
      * @param wareHouse
      * @return
      */
@@ -79,9 +90,9 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         // 部门名称
-        HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result);
+        HqlPack.getStringLikerPack(wareHouse.getCode(),"code", result);
         // 部门代码
-        HqlPack.getStringLikerPack(wareHouse.getName(), "name", result);
+        HqlPack.getStringLikerPack(wareHouse.getName(),"name", result);
 
         return result.toString();
     }
@@ -90,54 +101,51 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         // 功能名称（name）
-        HqlPack.getStringLikerPack(wmsButton.getName(), "name", result);
+        HqlPack.getStringLikerPack(wmsButton.getName(),"name", result);
         // 前端实现（ui）
-        HqlPack.getStringLikerPack(wmsButton.getUi(), "ui", result);
+        HqlPack.getStringLikerPack(wmsButton.getUi(),"ui", result);
         // URI权限规则（bs）
-        HqlPack.getStringLikerPack(wmsButton.getBs(), "bs", result);
+        HqlPack.getStringLikerPack(wmsButton.getBs(),"bs", result);
 
         return result.toString();
     }
 
     /**
      * 元数据信息 分页查询
-     *
      * @param wmsObject
      * @return
      */
-    public static String packHqlWmsObject(WmsObject wmsObject) {
+    public static String packHqlWmsObject(WmsObject wmsObject){
         StringBuffer result = new StringBuffer();
 
         // 编码
-        HqlPack.getStringLikerPack(wmsObject.getCode(), "code", result);
-        // 名称
-        HqlPack.getStringEqualPack(wmsObject.getName(), "name", result);
+        HqlPack.getStringLikerPack(wmsObject.getCode(),"code",result);
+       // 名称
+        HqlPack.getStringEqualPack(wmsObject.getName(),"name",result);
         // 数据主表
-        HqlPack.getStringEqualPack(wmsObject.getTableName(), "tableName", result);
+        HqlPack.getStringEqualPack(wmsObject.getTableName(),"tableName",result);
         // 自定义业务拦截
-        HqlPack.getStringEqualPack(wmsObject.getBizIntercept(), "bizIntercept", result);
+        HqlPack.getStringEqualPack(wmsObject.getBizIntercept(),"bizIntercept",result);
 
         return result.toString();
     }
 
     /**
      * 元数据字段分页查询
-     *
      * @param wmsField
      * @return
      */
-    public static String packHqlWmsField(WmsField wmsField) {
+    public static String packHqlWmsField(WmsField wmsField){
         StringBuffer result = new StringBuffer();
         // 编码
-        HqlPack.getStringLikerPack(wmsField.getObjectCode(), "objectCode", result);
-        HqlPack.getStringLikerPack(wmsField.getTableName(), "tableName", result);
+        HqlPack.getStringLikerPack(wmsField.getObjectCode(),"objectCode",result);
+        HqlPack.getStringLikerPack(wmsField.getTableName(),"tableName",result);
         return result.toString();
     }
 
 
     /**
      * 交易类型信息 分页查询
-     *
      * @param wmsTransType
      * @return
      */
@@ -145,16 +153,15 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
-        HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result);
-        HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
-        HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result);
+        HqlPack.getNumEqualPack(wmsTransType.getIsValid(),"isValid",result);
+        HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(),"transTypeCode",result);
+        HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(),"transTypeName",result);
 
         return result.toString();
     }
 
     /**
      * 库存交易记录信息 分页查询
-     *
      * @param wmsTrans
      * @return
      */
@@ -162,16 +169,15 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
-        HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result);
-        HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result);
-        HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true);
+        HqlPack.getStringEqualPack(wmsTrans.getTransCode(),"transCode",result);
+        HqlPack.getStringEqualPack(wmsTrans.getSn(),"sn",result);
+        HqlPack.timeBuilder(wmsTrans.getCreateDatetime(),null,"createDatetime",result,true);
 
         return result.toString();
     }
 
     /**
      * 仓库分页查询条件
-     *
      * @param wareHouse
      * @return
      */
@@ -180,59 +186,127 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result);
         HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result);
         HqlPack.getStringLikerPack(wareHouse.getName(), "name", result);
-        HqlPack.getStringEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() + "", "isValid", result);
+        HqlPack.getNumEqualPack(wareHouse.getIsValid(),"isValid",result);
         return result.toString();
     }
 
+    /**
+     * 供应商分页查询
+     * @param basVendor
+     * @return
+     */
+    public static String packHqlBasVendor(BasVendor basVendor){
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", result);
+        HqlPack.getStringLikerPack(basVendor.getVendorName(), "vendorName", result);
+        HqlPack.getStringLikerPack(basVendor.getVendorOwner(), "vendorOwner", result);
+        HqlPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result);
+        HqlPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result);
+        HqlPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result);
+        if(basVendor.getIsAsn()!= null){
+            HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result);
+        }
+        HqlPack.getNumEqualPack(basVendor.getIsValid(),"isValid",result);
+        return result.toString();
+    }
+
+    /**
+     * 作业类型分页查询
+     * @param wmsOpType
+     * @return
+     */
+    public static String packHqlWmsOpType(WmsOpType wmsOpType){
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
+        HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(),"opTypeName",result);
+        HqlPack.getStringLikerPack(wmsOpType.getSeq().toString(),"seq",result);
+        HqlPack.getStringLikerPack(wmsOpType.getProCode(),"proCode",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();
+    }
 
     /**
      * 存储区信息 查询条件封装
-     *
      * @param wmsZones
      * @return
      */
     public static String packHqlWmsZones(WmsZones wmsZones) {
         StringBuffer result = new StringBuffer();
         //仓库代码
-        HqlPack.getStringLikerPack(wmsZones.getWhNo(), "whNo", result);
+        HqlPack.getStringLikerPack(wmsZones.getWhNo(),"whNo",result);
         //库存地代码
-        HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result);
+        HqlPack.getStringLikerPack(wmsZones.getAreaNo(),"areaNo",result);
         //存储区代码
-        HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result);
+        HqlPack.getStringLikerPack(wmsZones.getZoneNo(),"zoneNo",result);
         return result.toString();
     }
 
     /**
      * 客户信息 查询条件封装
-     *
      * @param basCustomer
      * @return
      */
-    public static String packHqlBasCustomer(BasCustomer basCustomer) {
+    public static String packHqlBasCustomer(BasCustomer basCustomer){
         StringBuffer result = new StringBuffer();
         //客户编号
-        HqlPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result);
+        HqlPack.getStringLikerPack(basCustomer.getCustNo(),"custNo",result);
         //客户简称
-        HqlPack.getStringLikerPack(basCustomer.getCustName(), "custName", result);
+        HqlPack.getStringLikerPack(basCustomer.getCustName(),"custName",result);
         //客户全称
-        HqlPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result);
+        HqlPack.getStringLikerPack(basCustomer.getCustDesc(),"custDesc",result);
         return result.toString();
     }
 
     /**
      * 客户发往地信息 查询条件封装
-     *
      * @param wmsShippingFlag
      * @return
      */
-    public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) {
+    public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag){
         StringBuffer result = new StringBuffer();
         //供应商编号
-        HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(), "flagNo", result);
+        HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(),"flagNo",result);
         //供应商简称
-        HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result);
-        //供应商全称
-        HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result);
+        HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(),"flagName",result);
+       //供应商全称
+        HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(),"flagDesc",result);
         return result.toString();
     }
 }