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

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.form.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
@@ -58,7 +57,7 @@ public class BfLayout extends BaseBean {
     @ApiParam(value = "布局描述")
     private String layoutDescription;
 
+    // 布局行集合
     @Transient
-    @ApiParam(value ="模板行集合")
-    private List<BfLayoutRow> brLayoutRows;
+    private List<BfLayoutRow> bfLayoutRows;
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java

@@ -9,7 +9,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java

@@ -9,7 +9,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
@@ -53,7 +52,7 @@ public class BfLayoutRow extends BaseBean {
     @ApiParam(value = "行所关联列数")
     private Integer rowColNum;
 
+    // 行所包含的列
     @Transient
-    @ApiParam(value ="行所包含的列")
-    private List<BfLayoutColumn> brLayoutColumns;
+    private List<BfLayoutColumn> bfLayoutColumns;
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java

@@ -1,5 +1,10 @@
 package cn.estsh.i3plus.pojo.form.sqlpack;
 
+import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.form.bean.BfLayout;
+import cn.estsh.i3plus.pojo.form.bean.BfLayoutRow;
+import org.apache.commons.lang3.StringUtils;
+
 /**
  * @Description :
  * @Reference :
@@ -7,5 +12,81 @@ package cn.estsh.i3plus.pojo.form.sqlpack;
  * @CreateDate : 2019-03-21 15:16
  * @Modify:
  **/
-public class FormHqlPack {
+public final class FormHqlPack {
+
+    private FormHqlPack() {
+    }
+
+    /**
+     * In 参数封装
+     * @param columnName 列名
+     * @param params 参数
+     * @return hql
+     */
+    public static String packHqlIds(String columnName, String[] params) {
+        StringBuffer result =  new StringBuffer();
+
+        // 参数数组 [1,2,3] -> "1,2,3"
+        HqlPack.getInPack(String.join(",", params), columnName, result);
+        return result.toString();
+    }
+
+    /**
+     * In 参数封装
+     * @param columnName 列名
+     * @param params 参数
+     * @return hql
+     */
+    public static String packHqlIds(String columnName, Long[] params) {
+        StringBuffer result =  new StringBuffer();
+
+        // 参数数组 [1,2,3] -> "1,2,3"
+        HqlPack.getInPack(StringUtils.join(params, ","), columnName, result);
+        return result.toString();
+    }
+
+    /**
+     * 表单布局复杂查询
+     * @param bfLayout 表单布局
+     * @return hql
+     */
+    public static String packHqlBfLayout(BfLayout bfLayout) {
+        StringBuffer result =  new StringBuffer();
+
+        HqlPack.getStringLikerPack(bfLayout.getLayoutName(), "layoutName", result);
+        HqlPack.getNumEqualPack(bfLayout.getIsDeleted(), "isDeleted", result);
+
+        return result.toString();
+    }
+
+    /**
+     * 根据表单布局查询表单布局行
+     * @param bfLayout 表单布局
+     * @return hql
+     */
+    public static String packHqlBfLayoutRowByBfLayout(BfLayout bfLayout) {
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.getNumEqualPack(bfLayout.getId(), "layoutId", result);
+        HqlPack.getNumEqualPack(bfLayout.getIsDeleted(), "isDeleted", result);
+
+        result.append(bfLayout.orderBy());
+        return result.toString();
+    }
+
+    /**
+     * 根据表单布局行查询表单布局列
+     * @param bfLayoutRow 表单布局行
+     * @return hql
+     */
+    public static String packHqlBfLayoutColumnByBfLayoutRow(BfLayoutRow bfLayoutRow) {
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.getNumEqualPack(bfLayoutRow.getLayoutId(), "layoutId", result);
+        HqlPack.getNumEqualPack(bfLayoutRow.getId(), "layoutRowId", result);
+        HqlPack.getNumEqualPack(bfLayoutRow.getIsDeleted(), "isDeleted", result);
+
+        result.append(bfLayoutRow.orderBy());
+        return result.toString();
+    }
 }

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

@@ -128,6 +128,10 @@ public class WmsMoveDetails extends BaseBean {
         this.transQty = transQty;
     }
 
+    public WmsMoveDetails(String orderNo){
+        this.orderNo = orderNo;
+    }
+
     public Long getWaitingCounts() {
         return waitingCounts == null ? 0L : this.waitingCounts;
     }