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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java

@@ -27,11 +27,14 @@ public class DdlPackBean {
     //是否是hql
     private boolean isHql;
 
-    //排序内容
-    private String orderByStr;
+    //手动hql，尽量避免直接传参，使用？代替
+    private String hqlAppend;
 
     //where后跟着的hql/sql
-    private String whereAppend;
+    private StringBuilder whereAppend;
+
+    //排序内容
+    private String orderByStr;
 
     //需要拼接的hql
     private StringBuilder sb = null;
@@ -39,11 +42,13 @@ public class DdlPackBean {
     public DdlPackBean(){
         this.isHql = true;
         sb = new StringBuilder();
+        whereAppend = new StringBuilder();
     }
 
     public DdlPackBean(boolean isHql){
         this.isHql = isHql;
         sb = new StringBuilder();
+        whereAppend = new StringBuilder();
     }
 
     public boolean isHql() {
@@ -62,12 +67,20 @@ public class DdlPackBean {
         this.orderByStr = orderByStr;
     }
 
+    public String getHqlAppend() {
+        return hqlAppend;
+    }
+
+    public void setHqlAppend(String hqlAppend) {
+        this.hqlAppend = hqlAppend;
+    }
+
     public String getWhereAppend() {
-        return whereAppend;
+        return whereAppend.toString();
     }
 
     public void setWhereAppend(String whereAppend) {
-        this.whereAppend = whereAppend;
+        this.whereAppend = new StringBuilder(whereAppend);
     }
 
     public HashMap<String, Object> getHqlPreparedMap() {
@@ -87,7 +100,7 @@ public class DdlPackBean {
             hqlPreparedMap.put(column, val);
         }
 
-        sb.append(hql);
+        whereAppend.append(hql);
     }
 
     /**
@@ -99,6 +112,24 @@ public class DdlPackBean {
     }
 
     /**
+     * 获取包含hql的最终的ddl
+     * @return
+     */
+    public String getPackedHqlAll(){
+        if(hqlAppend != null){
+            sb.append(hqlAppend);
+        }
+        if(whereAppend != null){
+            sb.append(whereAppend);
+        }
+        if(orderByStr != null){
+            sb.append(orderByStr);
+        }
+        System.out.println("===" + sb.toString());
+        return sb.toString();
+    }
+
+    /**
      * 获取最终的ddl
      * @return
      */

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -894,8 +894,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     @Override
     public double findByHqlDouble(DdlPackBean packBean) {
         try{
-            Query query = entityManager.createQuery("from " + persistentClass.getSimpleName()
-                    + " as model where 1=1 " + packBean.getPackedHql(),Double.class);
+            Query query = entityManager.createQuery(packBean.getPackedHqlAll(),Double.class);
 
             for (String key : packBean.getHqlPreparedMap().keySet()) {
                 query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key));

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java

@@ -163,4 +163,8 @@ public class WmsDocMovementDetails extends BaseBean {
     public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); }
 
     public Double getOutQty() {return outQty == null ? 0L : this.outQty.doubleValue(); }
+
+    public Double getPickQty() {return pickQty == null ? 0L : this.pickQty.doubleValue(); }
+
+    public Double getActualQty() {return actualQty == null ? 0L : this.actualQty.doubleValue(); }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java

@@ -96,19 +96,19 @@ public class WmsLocate extends BaseBean {
     private Double partQty;
 
     public Integer getMaxPackageQty() {
-        return this.maxPackageQty == null ? 0 : this.maxPackageQty;
+        return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue();
     }
 
     public Double getMaxPartQty() {
-        return this.maxPartQty == null ? 0 : this.maxPartQty;
+        return this.maxPartQty == null ? 0 : this.maxPartQty.doubleValue();
     }
 
     public Integer getBoxQty() {
-        return this.boxQty == null ? 0 : this.boxQty;
+        return this.boxQty == null ? 0 : this.boxQty.intValue();
     }
 
     public Double getPartQty() {
-        return this.partQty == null ? 0 : this.partQty;
+        return this.partQty == null ? 0 : this.partQty.doubleValue();
     }
 
 }