解决冲突

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

@@ -1094,6 +1094,21 @@ public class WmsHqlPack {
     }
 
     /**
+     * 作业流程明细分页查询
+     * @return
+     */
+    public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails){
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getNumEqualPack(wmsActionGroupDetails.getAgId(), "agId", result);
+
+        getStringBuilderPack(wmsActionGroupDetails, result);
+
+        return result.toString();
+    }
+
+    /**
      * 作业记录参数信息 查询条件封装
      *
      * @param wmsActionLogData