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 1486a84..4609c69 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
@@ -70,8 +70,8 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
 
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
-                "isDeleted", result);
+        getStringBuilderPack(wmsDocMovementDetails, result);
+
         return result.toString();
     }
 
@@ -90,10 +90,8 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", result);
         HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustomerNo(), "customerNo", result);
 
-        HqlPack.getStringEqualPack(wmsDocMovementMaster.getOrganizeCode(), "organizeCode", result);
-        HqlPack.getNumEqualPack(wmsDocMovementMaster.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
-                "isDeleted", result);
+        getStringBuilderPack(wmsDocMovementMaster, result);
+
         return result.toString();
     }
 
@@ -115,6 +113,7 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
 
         getStringBuilderPack(wmsPOMaster, result);
+
         return result.toString();
     }
 
@@ -126,10 +125,11 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsRoutingChildren(String routingCode) {
         StringBuffer result = new StringBuffer();
-        HqlPack.getStringEqualPack(routingCode, "routingCode", result);
 
+        HqlPack.getStringEqualPack(routingCode, "routingCode", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
                 "isDeleted", result);
+
         return result.toString();
     }
 
@@ -145,10 +145,8 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result);
         HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result);
 
-        HqlPack.getStringEqualPack(wmsRoutingMaster.getOrganizeCode(), "organizeCode", result);
-        HqlPack.getNumEqualPack(wmsRoutingMaster.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
-                "isDeleted", result);
+        getStringBuilderPack(wmsRoutingMaster, result);
+
         return result.toString();
     }
 
@@ -166,10 +164,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
         HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
 
-        HqlPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", result);
-        HqlPack.getNumEqualPack(wmsPart.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
-                "isDeleted", result);
+        getStringBuilderPack(wmsPart, result);
 
         return result.toString();
     }
@@ -188,9 +183,8 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
         HqlPack.timeBuilder(wmsIbCheckPlan.getStartDate(), null, "startDate", result, true);
         HqlPack.timeBuilder(wmsIbCheckPlan.getEndDate(), null, "endDate", result, true);
-        HqlPack.getNumEqualPack(wmsIbCheckPlan.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
-        HqlPack.getStringEqualPack(wmsIbCheckPlan.getOrganizeCode(),"organizeCode",result);
+
+        getStringBuilderPack(wmsIbCheckPlan, result);
 
         return result.toString();
     }
@@ -208,9 +202,8 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result);
         HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result);
-        HqlPack.getNumEqualPack(wmsLocatePart.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
-        HqlPack.getStringEqualPack(wmsLocatePart.getOrganizeCode(),"organizeCode",result);
+
+        getStringBuilderPack(wmsLocatePart, result);
 
         return result.toString();
     }
@@ -231,78 +224,12 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result);
         HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result);
         HqlPack.getNumEqualPack(wmsLocate.getIsEmpty(), "isEmpty", result);
-        HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
-        HqlPack.getStringEqualPack(wmsLocate.getOrganizeCode(),"organizeCode",result);
 
-        return result.toString();
-    }
-
-    /**
-     * 工厂仓库模糊分页查询
-     *
-     * @param wareHouse
-     * @return
-     */
-    public static String packHqlFactoryStore(WareHouse wareHouse) {
-        StringBuffer result = new StringBuffer();
-
-        // 部门名称
-        HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result);
-        // 部门代码
-        HqlPack.getStringLikerPack(wareHouse.getName(), "name", result);
+        getStringBuilderPack(wmsLocate, result);
 
         return result.toString();
     }
 
-    public static String packHqlWmsButton(WmsButton wmsButton) {
-        StringBuffer result = new StringBuffer();
-
-        // 功能名称（name）
-        HqlPack.getStringLikerPack(wmsButton.getName(), "name", result);
-        // 前端实现（ui）
-        HqlPack.getStringLikerPack(wmsButton.getUi(), "ui", result);
-        // URI权限规则（bs）
-        HqlPack.getStringLikerPack(wmsButton.getBs(), "bs", result);
-
-        return result.toString();
-    }
-
-    /**
-     * 元数据信息 分页查询
-     *
-     * @param wmsObject
-     * @return
-     */
-    public static String packHqlWmsObject(WmsObject wmsObject) {
-        StringBuffer result = new StringBuffer();
-
-        // 编码
-        HqlPack.getStringLikerPack(wmsObject.getCode(), "code", result);
-        // 名称
-        HqlPack.getStringEqualPack(wmsObject.getName(), "name", result);
-        // 数据主表
-        HqlPack.getStringEqualPack(wmsObject.getTableName(), "tableName", result);
-        // 自定义业务拦截
-        HqlPack.getStringEqualPack(wmsObject.getBizIntercept(), "bizIntercept", result);
-        return result.toString();
-    }
-
-    /**
-     * 元数据字段分页查询
-     *
-     * @param wmsField
-     * @return
-     */
-    public static String packHqlWmsField(WmsField wmsField) {
-        StringBuffer result = new StringBuffer();
-        // 编码
-        HqlPack.getStringLikerPack(wmsField.getObjectCode(), "objectCode", result);
-        HqlPack.getStringLikerPack(wmsField.getTableName(), "tableName", result);
-        return result.toString();
-    }
-
-
     /**
      * 交易类型信息 分页查询
      *
@@ -316,10 +243,8 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
         HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result);
         HqlPack.getStringLikerPack(wmsTransType.getProgCode(), "progCode", result);
-        HqlPack.getStringLikerPack(wmsTransType.getOrganizeCode(), "organizeCode", result);
-        HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
-        HqlPack.getStringEqualPack(wmsTransType.getOrganizeCode(),"organizeCode",result);
+
+        getStringBuilderPack(wmsTransType, result);
 
         return result.toString();
     }
@@ -337,8 +262,8 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result);
         HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result);
         HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true);
-        HqlPack.getNumEqualPack(wmsTrans.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+
+        getStringBuilderPack(wmsTrans, result);
 
         return result.toString();
     }
@@ -351,12 +276,13 @@ public class WmsHqlPack {
      */
     public static String packHqlWareHouse(WareHouse wareHouse) {
         StringBuffer result = new StringBuffer();
+
         HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result);
         HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result);
         HqlPack.getStringLikerPack(wareHouse.getName(), "name", result);
-        HqlPack.getNumEqualPack(wareHouse.getIsValid(), "isValid", result);
-        HqlPack.getStringEqualPack(wareHouse.getOrganizeCode(), "organizeCode", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+
+        getStringBuilderPack(wareHouse, result);
+
         return result.toString();
     }
 
@@ -375,12 +301,10 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result);
         HqlPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result);
         HqlPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result);
-        HqlPack.getStringEqualPack(basVendor.getOrganizeCode(), "organizeCode", result);
-        if (basVendor.getIsAsn() != null) {
-            HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result);
-        }
-        HqlPack.getNumEqualPack(basVendor.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        HqlPack.getNumEqualPack(basVendor.getIsAsn(), "isAsn", result);
+
+        getStringBuilderPack(basVendor, result);
+
         return result.toString();
     }
 
@@ -392,15 +316,14 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsOpType(WmsOpType wmsOpType) {
         StringBuffer result = new StringBuffer();
-        HqlPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
+
+        HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
         HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
-        if (wmsOpType.getSeq() != null) {
-            HqlPack.getStringLikerPack(wmsOpType.getSeq().toString(), "seq", result);
-        }
-        HqlPack.getStringLikerPack(wmsOpType.getProCode(), "proCode", result);
-        HqlPack.getNumEqualPack(wmsOpType.getIsValid(), "isValid", result);
-        HqlPack.getStringEqualPack(wmsOpType.getOrganizeCode(), "organizeCode", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        HqlPack.getStringEqualPack(wmsOpType.getProCode(), "proCode", result);
+        HqlPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result);
+
+        getStringBuilderPack(wmsOpType, result);
+
         return result.toString();
     }
 
@@ -412,10 +335,13 @@ public class WmsHqlPack {
      */
     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);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+
+        getStringBuilderPack(wareHouse, result);
+
         return result.toString();
     }
 
@@ -427,21 +353,25 @@ public class WmsHqlPack {
      */
     public static String packHqlBasVendorUnique(BasVendor basVendor) {
         StringBuffer result = new StringBuffer();
-        if (basVendor.getId() != null) {
-            HqlPack.getNumNOEqualPack(basVendor.getId(), "id", result);
-        }
+
+        HqlPack.getNumNOEqualPack(basVendor.getId(), "id", result);
         HqlPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result);
         HqlPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result);
         HqlPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+
+        getStringBuilderPack(basVendor, result);
+
         return result.toString();
     }
 
     public static String packHqlWmsOpTypeUnique(WmsOpType wmsOpType) {
         StringBuffer result = new StringBuffer();
+
         HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
-        HqlPack.getStringEqualPack(wmsOpType.getOpTypeName(), "opTypeName", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
+
+        getStringBuilderPack(wmsOpType, result);
+
         return result.toString();
     }
 
@@ -454,16 +384,14 @@ public class WmsHqlPack {
     public static String packHqlWmsZones(WmsZones wmsZones) {
         StringBuffer result = new StringBuffer();
 
-        //有效性
-        HqlPack.getNumEqualPack(wmsZones.getIsValid(), "isValid", result);
         //仓库代码
-        HqlPack.getStringLikerPack(wmsZones.getWhNo(), "whNo", result);
+        HqlPack.getNumEqualPack(wmsZones.getWhNo(), "whNo", result);
         //库存地代码
-        HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result);
+        HqlPack.getNumEqualPack(wmsZones.getAreaNo(), "areaNo", result);
         //存储区代码
-        HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result);
-        //删除标记
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        HqlPack.getNumEqualPack(wmsZones.getZoneNo(), "zoneNo", result);
+
+        getStringBuilderPack(wmsZones, result);
 
         return result.toString();
     }
@@ -478,13 +406,14 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //客户编号
-        HqlPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result);
+        HqlPack.getNumEqualPack(basCustomer.getCustNo(), "custNo", result);
         //客户简称
         HqlPack.getStringLikerPack(basCustomer.getCustName(), "custName", result);
         //客户全称
         HqlPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result);
 
         getStringBuilderPack(basCustomer, result);
+
         return result.toString();
     }
 
@@ -498,11 +427,12 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //供应商编号
-        HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(), "flagNo", result);
+        HqlPack.getStringEqualPack(wmsShippingFlag.getFlagNo(), "flagNo", result);
         //供应商简称
         HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result);
         //供应商全称
         HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result);
+
         getStringBuilderPack(wmsShippingFlag, result);
 
         return result.toString();
@@ -517,20 +447,16 @@ public class WmsHqlPack {
     public static String packHqlWmsASNMaster(WmsASNMaster wmsASNMaster) {
         StringBuffer result = new StringBuffer();
 
-        HqlPack.getStringLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result);
-        HqlPack.getStringLikerPack(wmsASNMaster.getAsnType(), "asnType", result);
-        if (wmsASNMaster.getAsnStatus() != null) {
-            HqlPack.getStringLikerPack(wmsASNMaster.getAsnStatus().toString(), "asnStatus", result);
-        }
-        HqlPack.getStringLikerPack(wmsASNMaster.getVendorNo(), "vendorNo", result);
-        HqlPack.getStringLikerPack(wmsASNMaster.getVersion(), "version", result);
+        HqlPack.getStringEqualPack(wmsASNMaster.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result);
+        HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus().toString(), "asnStatus", result);
+        HqlPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result);
+        HqlPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result);
         HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);
-        HqlPack.getStringLikerPack(wmsASNMaster.getPoNo(), "poNo", result);
-        //有效性
-        HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
-        HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result);
-//        getStringBuilderPack(wmsASNMaster,result);
+        HqlPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result);
+
+        getStringBuilderPack(wmsASNMaster,result);
+
         return result.toString();
     }
 
@@ -542,19 +468,22 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsShipping(WmsShopping wmsShopping) {
         StringBuffer result = new StringBuffer();
+
         //发运单号
-        HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsShopping.getOrderNo(), "orderNo", result);
         //客户编码
         HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result);
         //物料编码
         HqlPack.getStringEqualPack(wmsShopping.getPartNo(), "partNo", result);
         //条码
-        HqlPack.getStringLikerPack(wmsShopping.getSn(), "sn", result);
+        HqlPack.getStringEqualPack(wmsShopping.getSn(), "sn", result);
         //发运状态
         HqlPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result);
         //特殊发货标志
         HqlPack.getStringEqualPack(wmsShopping.getShippingFlag(), "shippingFlag", result);
+
         getStringBuilderPack(wmsShopping, result);
+
         return result.toString();
     }
 
@@ -566,55 +495,47 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsCheckFactRecord(WmsCheckFactRecord wmsCheckFactRecord) {
         StringBuffer result = new StringBuffer();
+
         //采购单号
-        HqlPack.getStringLikerPack(wmsCheckFactRecord.getPoNo(), "poNo", result);
+        HqlPack.getStringEqualPack(wmsCheckFactRecord.getPoNo(), "poNo", result);
         //ASN单号
-        HqlPack.getStringLikerPack(wmsCheckFactRecord.getAsnNo(), "asnNo", result);
+        HqlPack.getStringEqualPack(wmsCheckFactRecord.getAsnNo(), "asnNo", result);
         //条码
-        HqlPack.getStringLikerPack(wmsCheckFactRecord.getSn(), "getSn", result);
+        HqlPack.getStringEqualPack(wmsCheckFactRecord.getSn(), "getSn", result);
         //物料编码
         HqlPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result);
         //供应商编号
         HqlPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result);
+
         getStringBuilderPack(wmsCheckFactRecord, result);
-        return result.toString();
-    }
 
-    /**
-     * 明细表唯一性查询
-     *
-     * @return
-     */
-    public static String packHqlwmsASNMasterDetailsUnique(WmsASNMasterDetails wmsASNMasterDetails) {
-        StringBuffer result = new StringBuffer();
-        //有效性
-        HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
         return result.toString();
     }
 
     public static String packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails) {
         StringBuffer result = new StringBuffer();
+
         HqlPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result);
         HqlPack.getStringEqualPack(wmsASNMasterDetails.getItem(), "item", result);
-        HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNo(), "partNo", result);
+        HqlPack.getStringEqualPack(wmsASNMasterDetails.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result);
-        HqlPack.getNumLikerPack(wmsASNMasterDetails.getQty(), "qty", result);
-        HqlPack.getStringLikerPack(wmsASNMasterDetails.getPoItem(), "poItem", result);
-        HqlPack.getStringLikerPack(wmsASNMasterDetails.getUnit(), "unit", result);
-        HqlPack.getStringLikerPack(wmsASNMasterDetails.getZDate(), "zDate", result);
-        HqlPack.getStringLikerPack(wmsASNMasterDetails.getZTime(), "zTime", result);
-        HqlPack.getNumLikerPack(wmsASNMasterDetails.getItemStatus(), "itemStatus", result);
-        HqlPack.getStringLikerPack(wmsASNMasterDetails.getPackAge(), "packAge", result);
-        HqlPack.getNumLikerPack(wmsASNMasterDetails.getIsFree(), "isFree", result);
+        HqlPack.getNumEqualPack(wmsASNMasterDetails.getQty(), "qty", result);
+        HqlPack.getStringEqualPack(wmsASNMasterDetails.getPoItem(), "poItem", result);
+        HqlPack.getStringEqualPack(wmsASNMasterDetails.getUnit(), "unit", result);
+        HqlPack.getStringEqualPack(wmsASNMasterDetails.getZDate(), "zDate", result);
+        HqlPack.getStringEqualPack(wmsASNMasterDetails.getZTime(), "zTime", result);
+        HqlPack.getNumEqualPack(wmsASNMasterDetails.getItemStatus(), "itemStatus", result);
+        HqlPack.getStringEqualPack(wmsASNMasterDetails.getPackAge(), "packAge", result);
+        HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsFree(), "isFree", result);
         HqlPack.getStringLikerPack(wmsASNMasterDetails.getDock(), "dock", result);
-        HqlPack.getStringLikerPack(wmsASNMasterDetails.getSnOneBarCode(), "snOneBarCode", result);
-        HqlPack.getStringLikerPack(wmsASNMasterDetails.getSnTwoBarCode(), "snTwoBarCode", result);
-        HqlPack.getStringLikerPack(wmsASNMasterDetails.getGroupNo(), "groupNo", result);
-        HqlPack.getStringLikerPack(wmsASNMasterDetails.getErpWhNo(), "erpWhNo", result);
-        HqlPack.getStringLikerPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result);
+        HqlPack.getStringEqualPack(wmsASNMasterDetails.getSnOneBarCode(), "snOneBarCode", result);
+        HqlPack.getStringEqualPack(wmsASNMasterDetails.getSnTwoBarCode(), "snTwoBarCode", result);
+        HqlPack.getStringEqualPack(wmsASNMasterDetails.getGroupNo(), "groupNo", result);
+        HqlPack.getStringEqualPack(wmsASNMasterDetails.getErpWhNo(), "erpWhNo", result);
+        HqlPack.getStringEqualPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result);
 
         getStringBuilderPack(wmsASNMasterDetails,result);
+
         return result.toString();
     }
 
@@ -627,22 +548,23 @@ public class WmsHqlPack {
     public static String packHqlWmsFGInStock(WmsFGInStock wmsFGInStock) {
         StringBuffer result = new StringBuffer();
 
-        HqlPack.getStringLikerPack(wmsFGInStock.getOrderNo(), "orderNo", result);
-        HqlPack.getStringLikerPack(wmsFGInStock.getWoNo(), "woNo", result);
-        HqlPack.getStringLikerPack(wmsFGInStock.getPartNo(), "partNo", result);
+        HqlPack.getStringEqualPack(wmsFGInStock.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsFGInStock.getWoNo(), "woNo", result);
+        HqlPack.getStringEqualPack(wmsFGInStock.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsFGInStock.getPartNameRdd(), "partNameRdd", result);
         HqlPack.getNumEqualPackDouble(wmsFGInStock.getQty(), "qty", result);
-        HqlPack.getStringLikerPack(wmsFGInStock.getUnit(), "unit", result);
-        HqlPack.getStringLikerPack(wmsFGInStock.getSn(), "sn", result);
+        HqlPack.getStringEqualPack(wmsFGInStock.getUnit(), "unit", result);
+        HqlPack.getStringEqualPack(wmsFGInStock.getSn(), "sn", result);
         HqlPack.getNumEqualPack(wmsFGInStock.getOrderStatus(), "orderStatus", result);
         HqlPack.getStringLikerPack(wmsFGInStock.getReMark(), "reMark", result);
         HqlPack.getStringLikerPack(wmsFGInStock.getSrc(), "src", result);
-        HqlPack.getStringLikerPack(wmsFGInStock.getErpWhNo(), "erpWhno", result);
-        HqlPack.getStringLikerPack(wmsFGInStock.getLineNo(), "lineNo", result);
-        HqlPack.getStringLikerPack(wmsFGInStock.getWhNo(), "whNo", result);
-        HqlPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result);
-        HqlPack.getStringLikerPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result);
-        HqlPack.getStringLikerPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result);
+        HqlPack.getStringEqualPack(wmsFGInStock.getErpWhNo(), "erpWhno", result);
+        HqlPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result);
+        HqlPack.getStringEqualPack(wmsFGInStock.getWhNo(), "whNo", result);
+        HqlPack.getStringEqualPack(wmsFGInStock.getCustNo(), "custNo", result);
+        HqlPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result);
+        HqlPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result);
+
         getStringBuilderPack(wmsFGInStock, result);
 
         return result.toString();
@@ -657,11 +579,12 @@ public class WmsHqlPack {
     public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo) {
         StringBuffer result = new StringBuffer();
 
-        HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result);
-        HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result);
-        HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result);
+        HqlPack.getStringEqualPack(wmsTaskInfo.getMoveNo(), "moveNo", result);
+        HqlPack.getStringEqualPack(wmsTaskInfo.getUserNo(), "userNo", result);
+        HqlPack.getStringEqualPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(), "reMark", result);
         HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result);
+
         getStringBuilderPack(wmsTaskInfo, result);
 
         return result.toString();
@@ -699,6 +622,7 @@ public class WmsHqlPack {
 
         HqlPack.getStringEqualPack(wmsCSLocate.getOrderNo(), "orderNo", result);
         HqlPack.getStringEqualPack(wmsCSLocate.getLocateNo(), ";locateNo", result);
+
         getStringBuilderPack(wmsCSLocate, result);
 
         return result.toString();
@@ -715,6 +639,7 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(),"orderNo", result);
         HqlPack.getStringEqualPack(wmsCSPart.getPartNo(),"partNo", result);
         HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(),"partNameRdd", result);
+
         getStringBuilderPack(wmsCSPart, result);
 
         return result.toString();
@@ -730,6 +655,7 @@ public class WmsHqlPack {
 
         HqlPack.getStringEqualPack(wmsCSZone.getOrderNo(), "orderNo", result);
         HqlPack.getStringEqualPack(wmsCSZone.getZoneNo(), "zoneNo", result);
+
         getStringBuilderPack(wmsCSZone, result);
 
         return result.toString();
@@ -744,7 +670,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         // 仓库代码
-        HqlPack.getStringLikerPack(wmsAreaOwner.getWhNo(), "whNo", result);
+        HqlPack.getStringEqualPack(wmsAreaOwner.getWhNo(), "whNo", result);
         // 来源单据号
         HqlPack.getStringEqualPack(wmsAreaOwner.getZoneNo(), "zoneNo", result);
         // 供应商编码
@@ -770,7 +696,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         // 订单号
-        HqlPack.getStringLikerPack(wmsTempOrderLock.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsTempOrderLock.getOrderNo(), "orderNo", result);
         // 业务类型
         HqlPack.getStringEqualPack(wmsTempOrderLock.getBizType(), "bizType", result);
 
@@ -792,6 +718,7 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
 
         getStringBuilderPack(wmsStockSn, result);
+
         return result.toString();
     }
 
@@ -803,13 +730,15 @@ public class WmsHqlPack {
      */
     public static String packWmsStockQuan(WmsStockQuan wmsStockQuan) {
         StringBuffer result = new StringBuffer();
+
         //查询参数封装
-        HqlPack.getStringLikerPack(wmsStockQuan.getWhNo(), "whNo", result);
-        HqlPack.getStringLikerPack(wmsStockQuan.getZoneNo(), "zoneNo", result);
-        HqlPack.getStringLikerPack(wmsStockQuan.getLocateNo(), "locateNo", result);
-        HqlPack.getStringLikerPack(wmsStockQuan.getPartNo(), "partNo", result);
+        HqlPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result);
+        HqlPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result);
+        HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
+        HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result);
 
         getStringBuilderPack(wmsStockQuan, result);
+
         return result.toString();
     }
 
@@ -821,9 +750,11 @@ public class WmsHqlPack {
      */
     public static String packWmsTransSn(Long tranNo) {
         StringBuffer result = new StringBuffer();
+
         //查询参数封装
         HqlPack.getNumEqualPack(tranNo, "transNo", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+
         return result.toString();
     }
 
@@ -835,13 +766,15 @@ public class WmsHqlPack {
      */
     public static String packWmsTransQuan(WmsTransQuan wmsTransQuan) {
         StringBuffer result = new StringBuffer();
+
         //查询参数封装
-        HqlPack.getStringLikerPack(wmsTransQuan.getWhNo(), "whNo", result);
-        HqlPack.getStringLikerPack(wmsTransQuan.getZoneNo(), "zoneNo", result);
-        HqlPack.getStringLikerPack(wmsTransQuan.getLocateNo(), "locateNo", result);
-        HqlPack.getStringLikerPack(wmsTransQuan.getPartNo(), "partNo", result);
+        HqlPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result);
+        HqlPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result);
+        HqlPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result);
+        HqlPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result);
 
         getStringBuilderPack(wmsTransQuan, result);
+
         return result.toString();
     }
 
@@ -872,8 +805,9 @@ public class WmsHqlPack {
     public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster){
         StringBuffer result = new StringBuffer();
 
-        HqlPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
         HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(),"id",result);
+
         getStringBuilderPack(wmsMoveMaster, result);
 
         return result.toString();
@@ -887,8 +821,9 @@ public class WmsHqlPack {
     public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster){
         StringBuffer result = new StringBuffer();
 
-        HqlPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
         HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result);
+
         getStringBuilderPack(wmsMoveMaster, result);
 
         return result.toString();
@@ -902,19 +837,20 @@ public class WmsHqlPack {
     public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails){
         StringBuffer result = new StringBuffer();
 
-        HqlPack.getStringLikerPack(wmsMoveDetails.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", result);
         HqlPack.getNumEqualPack(wmsMoveDetails.getItem(), "item", result);
-        HqlPack.getStringLikerPack(wmsMoveDetails.getPartNo(), "partNo", result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", result);
-        HqlPack.getStringLikerPack(wmsMoveDetails.getVendorNo(), "vendorNo", result);
-        HqlPack.getStringLikerPack(wmsMoveDetails.getCustNo(), "custNo", result);
-        HqlPack.getStringLikerPack(wmsMoveDetails.getUnit(), "unit", result);
-        HqlPack.getStringLikerPack(wmsMoveDetails.getWhNo(),"whNo",result);
-        HqlPack.getStringLikerPack(wmsMoveDetails.getZoneNo(),"zoneNo",result);
-        HqlPack.getStringLikerPack(wmsMoveDetails.getLocateNo(),"locateNo",result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getWhNo(),"whNo",result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getZoneNo(),"zoneNo",result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getLocateNo(),"locateNo",result);
         HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(),"itemStatus",result);
         HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(),"refType",result);
         HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(),"refSrc",result);
+
         getStringBuilderPack(wmsMoveDetails, result);
 
         return result.toString();
@@ -928,10 +864,11 @@ public class WmsHqlPack {
     public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn){
         StringBuffer result = new StringBuffer();
 
-        HqlPack.getStringLikerPack(wmsMoveSn.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result);
         HqlPack.getNumEqualPack(wmsMoveSn.getItem(), "item", result);
-        HqlPack.getStringLikerPack(wmsMoveSn.getPartNo(), "partNo", result);
+        HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result);
+
         getStringBuilderPack(wmsMoveSn, result);
 
         return result.toString();
@@ -945,18 +882,20 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsQCMaster(WmsQCMaster wmsQCMaster) {
         StringBuffer result = new StringBuffer();
+
         //单号
-        HqlPack.getStringLikerPack(wmsQCMaster.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
         //业务类型
         HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result);
         //采购单号
-        HqlPack.getStringLikerPack(wmsQCMaster.getPoNo(), "poNo", result);
+        HqlPack.getStringEqualPack(wmsQCMaster.getPoNo(), "poNo", result);
         //ASN单号
-        HqlPack.getStringLikerPack(wmsQCMaster.getAsnNo(), "asnNo", result);
+        HqlPack.getStringEqualPack(wmsQCMaster.getAsnNo(), "asnNo", result);
         //入库单号
-        HqlPack.getStringLikerPack(wmsQCMaster.getIbNo(), "ibNo", result);
+        HqlPack.getStringEqualPack(wmsQCMaster.getIbNo(), "ibNo", result);
 
         getStringBuilderPack(wmsQCMaster, result);
+
         return result.toString();
     }
 
@@ -968,9 +907,12 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsQCDetails(WmsQCDetails wmsQCDetails) {
         StringBuffer result = new StringBuffer();
+
         //单号
         HqlPack.getStringEqualPack(wmsQCDetails.getOrderNo(), "orderNo", result);
+
         getStringBuilderPack(wmsQCDetails, result);
+
         return result.toString();
     }
 
@@ -982,11 +924,14 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsQCTrans(WmsQCTrans wmsQCTrans) {
         StringBuffer result = new StringBuffer();
+
         //单号
         HqlPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result);
         //行号
         HqlPack.getStringEqualPack(wmsQCTrans.getItem(), "item", result);
+
         getStringBuilderPack(wmsQCTrans, result);
+
         return result.toString();
     }
 
@@ -1000,7 +945,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
-        HqlPack.getStringLikerPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result);
         HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderType(), "orderType", result);
         HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderStatus(), "orderStatus", result);
 
@@ -1019,7 +964,8 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
-        HqlPack.getStringLikerPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result);
+
         getStringBuilderPack(wmsCSOrderDetails, result);
 
         return result.toString();
@@ -1035,7 +981,8 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
-        HqlPack.getStringLikerPack(wmsCSFactTrans.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result);
+
         getStringBuilderPack(wmsCSFactTrans, result);
 
         return result.toString();