Merge remote-tracking branch 'remotes/origin/dev' into test

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

@@ -390,7 +390,7 @@ public class WmsEnumUtil {
     public enum LOCATE_TYPE {
         COLLECT_LOCATE(10, "I", "收货库"),
         BASICS_LOCATE(20, "P", "基础库"),
-        maneuver_LOCATE(30, "R", "机动库"),
+        MANEUVER_LOCATE(30, "R", "机动库"),
         COMBINATION_LOCATE(40, "D", "组合库"),
         LINE_LOCATE(50, "L", "线边库"),
         NC_LOCATE(60, "N", "NC库");

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

@@ -1027,17 +1027,19 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     @Override
     public double findSumByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) {
         if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) {
-            StringBuffer sb = new StringBuffer("select sum(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 ");
-            appendQL(sb,paramName,paramValue);
-            sb.append(" group by :groupByName");
-
+            StringBuffer sb = new StringBuffer("select sum(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 ");
+            appendQL(sb, paramName, paramValue);
+            sb.append(" group by model." + groupByName);
             Query query = entityManager.createQuery(sb.toString());
-            query.setParameter(":sumPropertyName", sumPropertyName);
             setParameter(query,paramName,paramValue);
-            query.setParameter(":groupByName", groupByName);
 
-            Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult();
-            return sumResult == null ? 0.0 : sumResult.doubleValue();
+            double sumResult = 0.0;
+            List<?> objList = query.getResultList();
+//            query.getSingleResult()
+            if(objList.size() > 0){
+                sumResult = Double.parseDouble(objList.iterator().next().toString());
+            }
+            return sumResult;
         }else{
             throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue);
         }

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

@@ -77,7 +77,7 @@ public class WmsMoveDetails extends BaseBean {
     public String srcLocateNo;
 
     @Column(name="DEST_WH_NO")
-    @ApiParam("目标库位代码")
+    @ApiParam("目标仓库代码")
     public String destWhNo;
 
     @Column(name="DEST_ZONE_NO")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.util.List;
+
 /**
  * @Description : 库存移动单明细信息
  * @Reference :