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 98aca6c..1cd5189 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
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.sqlpack;
 
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.wms.bean.*;
 
@@ -209,7 +210,6 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsObject.getTableName(), "tableName", result);
         // 自定义业务拦截
         HqlPack.getStringEqualPack(wmsObject.getBizIntercept(), "bizIntercept", result);
-
         return result.toString();
     }
 
@@ -241,7 +241,6 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result);
         HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
         HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result);
-
         return result.toString();
     }
 
@@ -258,7 +257,6 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result);
         HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result);
         HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true);
-
         return result.toString();
     }
 
@@ -275,6 +273,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wareHouse.getName(), "name", result);
         HqlPack.getNumEqualPack(wareHouse.getIsValid(), "isValid", result);
         HqlPack.getStringEqualPack(wareHouse.getOrganizeCode(), "organizeCode", result);
+        HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result);
         return result.toString();
     }
 
@@ -298,6 +297,7 @@ public class WmsHqlPack {
             HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result);
         }
         HqlPack.getNumEqualPack(basVendor.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result);
         return result.toString();
     }
 
@@ -317,6 +317,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsOpType.getProCode(), "proCode", result);
         HqlPack.getNumEqualPack(wmsOpType.getIsValid(), "isValid", result);
         HqlPack.getStringEqualPack(wmsOpType.getOrganizeCode(), "organizeCode", result);
+        HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result);
         return result.toString();
     }
 
@@ -331,6 +332,7 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wareHouse.getName(), "name", result);
         HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result);
         HqlPack.getNumNOEqualPack(wareHouse.getId(), "id", result);
+        HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result);
         return result.toString();
     }
 
@@ -348,6 +350,7 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result);
         HqlPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result);
         HqlPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result);
+        HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result);
         return result.toString();
     }
 
@@ -355,6 +358,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
         HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
         HqlPack.getStringEqualPack(wmsOpType.getOpTypeName(), "opTypeName", result);
+        HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result);
         return result.toString();
     }
 
@@ -424,14 +428,15 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringLikerPack(wmsASNMaster.getOrderNo(),"orderNo",result);
-        HqlPack.getStringLikerPack(wmsASNMaster.getType(),"type",result);
-        HqlPack.getStringLikerPack(wmsASNMaster.getStatus().toString(),"status",result);
+        HqlPack.getStringLikerPack(wmsASNMaster.getAsnType(),"type",result);
+        HqlPack.getStringLikerPack(wmsASNMaster.getAsnStatus().toString(),"status",result);
         HqlPack.getStringLikerPack(wmsASNMaster.getVendorNo(),"vendorNo",result);
         HqlPack.getStringLikerPack(wmsASNMaster.getVersion(),"version",result);
         HqlPack.getStringLikerPack(wmsASNMaster.getSrc(),"src",result);
         HqlPack.getStringLikerPack(wmsASNMaster.getPoNo(),"poNo",result);
         //有效性
         HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result);
         HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result);
         return result.toString();
     }
@@ -456,4 +461,43 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsShopping.getStatus().toString(), "status", result);
         return result.toString();
     }
+
+    /**
+     * 明细表唯一性查询
+     * @return
+     */
+    public static String packHqlwmsASNMasterDetailsUnique(WmsASNMasterDetails wmsASNMasterDetails){
+        StringBuffer result = new StringBuffer();
+        //有效性
+        HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result);
+        return result.toString();
+    }
+
+    public static String packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails){
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringLikerPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result);
+        HqlPack.getStringLikerPack(wmsASNMasterDetails.getItem(), "item", result);
+        HqlPack.getStringLikerPack(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.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.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result);
+        return result.toString();
+    }
 }