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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -291,7 +291,7 @@ public class WmsEnumUtil {
     public enum QUEUE_NAME{
 
         SUCCESS_QUEUE(1,"success_queue","成功消息队列"),
-        FAIL_QUEUE(1,"fail_queue","成功消息队列");
+        FAIL_QUEUE(2,"fail_queue","成功消息队列");
 
         private int value;
         private String name;

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

@@ -281,9 +281,12 @@ 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.getStringLikerPack(wmsTransType.getProgCode(), "progCode", result);
+        HqlPack.getStringLikerPack(wmsTransType.getOrganizeCode(), "organizeCode", result);
+        HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(wmsTransType.getIsDeleted(), "isDeleted", result);
         return result.toString();
     }