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

@@ -283,6 +283,8 @@ public class WmsEnumUtil {
         }
     }
 
+
+
     /**
      * 消息队列，队列名称
      * 1: success_queue
@@ -380,4 +382,59 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 库位类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LOCATE_TYPE {
+        COLLECT_LOCATE(10, "I", "收货库"),
+        BASICS_LOCATE(20, "P", "基础库"),
+        maneuver_LOCATE(30, "R", "机动库"),
+        COMBINATION_LOCATE(40, "D", "组合库"),
+        LINE_LOCATE(50, "L", "线边库"),
+        NC_LOCATE(60, "N", "NC库");
+
+        private int value;
+        private String code;
+        private String description;
+
+        LOCATE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.base.tool.SqlPack;
 import cn.estsh.i3plus.pojo.wms.bean.*;
 import org.apache.commons.lang3.StringUtils;
 
@@ -24,13 +25,14 @@ public class WmsHqlPack {
      */
     public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) {
 
+        // 判断工厂代码是否为空
         if (StringUtils.isNotBlank(bean.getOrganizeCode())) {
-            hqlStr.append(" and model.organizeCode = " + bean.getOrganizeCode());
-        } else if (bean.getIsValid() > 0) {
-            hqlStr.append(" and model.isValid = " + bean.getIsValid());
+            SqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
         }
 
-        hqlStr.append(" and model.isDeleted = " + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
+        // 封装有效状态和删除状态
+        SqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
+        SqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
 
         return hqlStr.toString();
     }
@@ -113,11 +115,9 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result);
         HqlPack.getStringLikerPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
         HqlPack.getStringLikerPack(wmsPOMaster.getSrc(), "src", result);
-//        HqlPack.getNumEqualPack(wmsPOMaster.getIsValid(), "isValid", result);
-//        HqlPack.getNumEqualPack(wmsPOMaster.getIsDeleted(), "isDeleted", result);
+        HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
 
         getStringBuilderPack(wmsPOMaster, result);
-
         return result.toString();
     }