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

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

@@ -561,7 +561,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
                                     + " as model where 1=1 " + packBean.getPackedHql());
 
         for (String key : packBean.getHqlPreparedMap().keySet()) {
-            query.setParameter(key,packBean.getHqlPreparedMap().get(key));
+            query.setParameter("m_" + key,packBean.getHqlPreparedMap().get("m_" + key));
         }
 
         return query.getResultList();

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

@@ -1,13 +1,16 @@
 package cn.estsh.i3plus.pojo.wms.sqlpack;
 
 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 cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.base.tool.SqlPack;
 import cn.estsh.i3plus.pojo.wms.bean.*;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Strings;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
@@ -27,12 +30,13 @@ public class WmsHqlPack {
     public static String packInParams(String colnumName, String[] params) {
         StringBuffer sb = new StringBuffer();
         HqlPack.getInPackString(String.join(",", params), colnumName, sb);
-        HqlPack.getNumEqualPack( WmsEnumUtil.IS_PART.IS_ADJUST.getValue(),"snControl", sb);
+        HqlPack.getNumEqualPack(WmsEnumUtil.IS_PART.IS_ADJUST.getValue(), "snControl", sb);
         return sb.toString();
     }
 
     /**
      * 封装公用查询参数
+     *
      * @param bean   实体对象
      * @param hqlStr 查询语句
      * @return 封装完成的查询语句
@@ -97,17 +101,20 @@ public class WmsHqlPack {
      * @param orderNos
      * @return
      */
-    public static String packWmsOrderDetailsByOrderNos(String colName, List<String> orderNos) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packWmsOrderDetailsByOrderNos(String colName, List<String> orderNos) {
+        DdlPackBean packBean = new DdlPackBean();
         StringBuffer orderNoStr = new StringBuffer();
         for (int i = 0; i < orderNos.size(); i++) {
             orderNoStr.append("'" + orderNos.get(i) + "',");
         }
         orderNoStr.deleteCharAt(orderNoStr.length() - 1);
-        result.append(" and model.isDeleted=" + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() +
-                " and model.isValid=" + CommonEnumUtil.IS_VAILD.VAILD.getValue() +
-                " and model.orderNo in (" + orderNoStr + ")" + " order by model." + colName + ",model.orderNo");
-        return result.toString();
+        DdlPreparedPack.getInPack(orderNoStr.toString(), "orderNo", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
+        DdlPreparedPack.getOrderByPack(
+                new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},
+                new String[]{colName, "orderNo"}, packBean);
+        return packBean;
     }
 
     /**
@@ -163,8 +170,8 @@ public class WmsHqlPack {
 
         //查询参数封装
         HqlPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "",
-                WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""),"poStatus",result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isPart", result);
+                WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""), "poStatus", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result);
         HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result);
         HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result);
         HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
@@ -702,6 +709,7 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询打印机队列信息封装类
+     *
      * @param wmsSnPrint 打印机队列信息
      * @return 打印机队列信息
      */
@@ -724,6 +732,7 @@ public class WmsHqlPack {
 
     /**
      * 盘点库位 条件封装
+     *
      * @param wmsCSLocate
      * @return
      */
@@ -740,6 +749,7 @@ public class WmsHqlPack {
 
     /**
      * 盘点物料 条件封装
+     *
      * @param wmsCSPart
      * @return
      */
@@ -758,6 +768,7 @@ public class WmsHqlPack {
 
     /**
      * 盘点存储区 条件封装
+     *
      * @param wmsCSZone
      * @return
      */
@@ -774,6 +785,7 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询责任区分配信息封装类
+     *
      * @param wmsAreaOwner 责任区分配信息
      * @return 责任区分配信息
      */
@@ -800,6 +812,7 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询责任区分配信息封装类
+     *
      * @param wmsTempOrderLock 责任区分配信息
      * @return 责任区分配信息
      */
@@ -918,6 +931,7 @@ public class WmsHqlPack {
 
     /**
      * 内部单据：库存移动单主表唯一性查询
+     *
      * @param wmsMoveMaster
      * @return
      */
@@ -935,6 +949,7 @@ public class WmsHqlPack {
 
     /**
      * 内部单据：库存移动单主表分页查询
+     *
      * @param wmsMoveMaster
      * @return
      */
@@ -951,6 +966,7 @@ public class WmsHqlPack {
 
     /**
      * 内部单据：库存移动单明细表分页查询
+     *
      * @param wmsMoveDetails
      * @return
      */
@@ -981,6 +997,7 @@ public class WmsHqlPack {
 
     /**
      * 内部单据：库存移动单条码信息分页查询
+     *
      * @param wmsMoveSn
      * @return
      */
@@ -1033,8 +1050,8 @@ public class WmsHqlPack {
 
         //查询参数封装
         HqlPack.getInPack(String.join(",", WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue() + "",
-                WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue() + ""),"orderStatus",result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isPart",result);
+                WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue() + ""), "orderStatus", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result);
         //单号
         HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
         getStringBuilderPack(wmsQCMaster, result);
@@ -1225,6 +1242,7 @@ public class WmsHqlPack {
 
     /**
      * 作业流程分页查询
+     *
      * @return
      */
     public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup) {
@@ -1240,6 +1258,7 @@ public class WmsHqlPack {
 
     /**
      * 作业流程明细分页查询
+     *
      * @return
      */
     public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails) {
@@ -1289,6 +1308,7 @@ public class WmsHqlPack {
 
     /**
      * 作业记录 查询条件封装
+     *
      * @param wmsActionLog
      * @return
      */
@@ -1323,6 +1343,7 @@ public class WmsHqlPack {
 
     /**
      * 作业记录明细 查询条件封装
+     *
      * @param wmsActionLogDetails
      * @return
      */
@@ -1461,6 +1482,7 @@ public class WmsHqlPack {
 
     /**
      * 根据权限数据拼查询任务详情sql
+     *
      * @param groupDataAuth
      * @return
      */
@@ -1499,14 +1521,15 @@ public class WmsHqlPack {
 
     /**
      * 给定字段动态in sql
+     *
      * @param columnName
      * @param vals
      * @return
      */
-    public static String packHqlAndIn(WmsTaskInfo bean,String columnName,List<String> vals) {
+    public static String packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> vals) {
         StringBuffer result = new StringBuffer();
         String data = String.join(",", vals);
-        HqlPack.getInPackString(data,columnName,result);
+        HqlPack.getInPackString(data, columnName, result);
         HqlPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", result);
         getStringBuilderPack(bean, result);
         return result.toString();
@@ -1514,6 +1537,7 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询dataAuth
+     *
      * @param wmsDataAuth
      * @return
      */
@@ -1534,6 +1558,7 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询任务明细信息
+     *
      * @param taskDetails
      * @return
      */
@@ -1581,6 +1606,7 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询系统配置信息
+     *
      * @param wmsConfig
      * @return
      */