Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

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
      */
@@ -71,7 +83,6 @@ public class WmsHqlPack {
 
     /**
      * 工厂仓库模糊分页查询
-     *
      * @param wareHouse
      * @return
      */
@@ -101,7 +112,6 @@ public class WmsHqlPack {
 
     /**
      * 元数据信息 分页查询
-     *
      * @param wmsObject
      * @return
      */
@@ -122,7 +132,6 @@ public class WmsHqlPack {
 
     /**
      * 元数据字段分页查询
-     *
      * @param wmsField
      * @return
      */
@@ -137,7 +146,6 @@ public class WmsHqlPack {
 
     /**
      * 交易类型信息 分页查询
-     *
      * @param wmsTransType
      * @return
      */
@@ -154,7 +162,6 @@ public class WmsHqlPack {
 
     /**
      * 库存交易记录信息 分页查询
-     *
      * @param wmsTrans
      * @return
      */
@@ -171,7 +178,6 @@ public class WmsHqlPack {
 
     /**
      * 仓库分页查询条件
-     *
      * @param wareHouse
      * @return
      */
@@ -180,14 +186,84 @@ 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
      */
@@ -204,7 +280,6 @@ public class WmsHqlPack {
 
     /**
      * 客户信息 查询条件封装
-     *
      * @param basCustomer
      * @return
      */
@@ -221,7 +296,6 @@ public class WmsHqlPack {
 
     /**
      * 客户发往地信息 查询条件封装
-     *
      * @param wmsShippingFlag
      * @return
      */