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

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

@@ -393,7 +393,67 @@ public class CommonEnumUtil {
             return tmp;
         }
     }
+    /**
+     * 数据类型
+     * 1库存移动数据
+     * 2质检数据
+     * 3已配料待出库
+     * 4JIS发运扣减
+     * 5报工待汇总
+     * 6报工汇总待处理
+     * 7erp接口待同步
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum NUM_TYPE {
+        MOVE_DETAILS(1, "MOVE_DETAILS", "库存移动数据"),
+        QC_DETAILS(2, "QC_DETAILS", "质检数据"),
+        DOC_MOVEMENT(3, "DOC_MOVEMENT", "已配料待出库"),
+        DOC_SHIPPING(4, "DOC_SHIPPING", "JIS发运扣减"),
+        FG_DETAILS(5, "FG_DETAILS", "报工待汇总"),
+        FG_SUM(6, "FG_SUM", "报工汇总待处理"),
+        ERP_INTERFACE(7, "ERP_INTERFACE", "ERP接口待同步");
+        private int value;
+        private String code;
+        private String description;
+
+        private NUM_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;
+        }
+    }
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum USER_INFO_STATUS {
         INCUMBENT(1, "正常", "正常_NORMAL"),

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
@@ -417,6 +418,19 @@ public class DdlPreparedPack {
             packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, data);
         }
     }
+
+    /**
+     * 封装double对象成大于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getNumberBiggerPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, data);
+        }
+    }
+
     /**
      * 封装double对象成大于等于语句
      *
@@ -440,6 +454,7 @@ public class DdlPreparedPack {
             packBean.addColumnQuery(columnName, " and model." + columnName + " < :m_" + columnName, data);
         }
     }
+
     /**
      * 封装double对象成小于等于语句
      *
@@ -609,10 +624,11 @@ public class DdlPreparedPack {
 
     /**
      * 转换排序列
+     *
      * @param columnName 列名
      * @param basisType  基本类型
-     * @see CommonEnumUtil.BASIS_TYPE
      * @return
+     * @see CommonEnumUtil.BASIS_TYPE
      */
     public static String getOrderColConvertType(String columnName, int basisType) {
         String name = " model." + columnName;

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

@@ -2273,7 +2273,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result);
 
         //数量大于0
-        DdlPreparedPack.getNumberBiggerPack(0, "qty", result);
+        DdlPreparedPack.getNumberBiggerPackContainsZero(0d, "qty", result);
         DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
@@ -2372,7 +2372,6 @@ public class WmsHqlPack {
     }
 
 
-
     /**
      * 业务：库存查询封装
      *