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

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

@@ -33,13 +33,17 @@ public class BfCascadeDetail extends BaseBean {
     @Column(name = "CASCADE_ID")
     @ApiParam(value = "级联ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long cascade_id;
+    private Long cascadeId;
 
     @Column(name = "ELEMENT_ID")
     @ApiParam(value = "对象元素ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long elementId;
 
+    @Column(name = "DETAIL_LABEL_TEXT")
+    @ApiParam(value = "提示信息")
+    private String detailLabelText;
+
     @Column(name="ELEMENT_NAME")
     @ApiParam(value ="元素名称")
     private String elementName;
@@ -51,7 +55,7 @@ public class BfCascadeDetail extends BaseBean {
     @Column(name = "PARENT_ID")
     @ApiParam(value = "父级ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long parent_id;
+    private Long parentId;
 
     @Column(name = "ELEMENT_PROPERTY_VALUE_ID")
     @ApiParam(value = "对象属性-元素属性ID", example = "-1")

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

@@ -46,7 +46,7 @@ public class BfElementGrid extends BaseBean {
 
     @Column(name = "IS_OBJECT_EDIT")
     @ApiParam(value = "是否编辑")
-    private Integer isObject_edit;
+    private Integer isObjectEdit;
 
     @Column(name = "IS_OBJECT_DEL")
     @ApiParam(value = "是否删除")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.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;
@@ -26,26 +25,26 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="BF_REF_METHOD_ROLE")
-@Api(value="功能角色关系",description = "功能角色关系")
+@Table(name = "BF_REF_METHOD_ROLE")
+@Api(value = "功能角色关系", description = "功能角色关系")
 public class BfRefMethodRole extends BaseBean {
 
-    @Column(name="METHOD_ID")
-    @ApiParam(value ="表单功能id")
+    @Column(name = "METHOD_ID")
+    @ApiParam(value = "表单功能id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long methodId;
 
-    @Column(name="METHOD_NAME_RDD")
-    @ApiParam(value ="表单功能名称")
+    @Column(name = "METHOD_NAME_RDD")
+    @ApiParam(value = "表单功能名称")
     private String methodNameRdd;
 
-    @Column(name="ROLE_ID")
-    @ApiParam(value ="角色id")
+    @Column(name = "ROLE_ID")
+    @ApiParam(value = "角色id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long roleId;
 
-    @Column(name="ROLE_NAME_RDD")
-    @ApiParam(value ="角色名称")
+    @Column(name = "ROLE_NAME_RDD")
+    @ApiParam(value = "角色名称")
     private String roleNameRdd;
 
 }

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

@@ -45,6 +45,35 @@ public final class FormHqlPack {
     }
 
     /**
+     * In 参数封装
+     * @param columnName 列名
+     * @param params 参数
+     * @param isDeleted 数据状态
+     * @return hql
+     */
+    public static String packHqlIdsAndIsDeleted(String columnName, String[] params, Integer isDeleted) {
+        StringBuffer result =  new StringBuffer(FormHqlPack.packHqlIds(columnName, params));
+
+        HqlPack.getNumEqualPack(isDeleted, "isDeleted", result);
+        return result.toString();
+    }
+
+
+    /**
+     * In 参数封装
+     * @param columnName 列名
+     * @param params 参数
+     * @param isDeleted 数据状态
+     * @return hql
+     */
+    public static String packHqlIdsAndIsDeleted(String columnName, Long[] params, Integer isDeleted) {
+        StringBuffer result =  new StringBuffer(FormHqlPack.packHqlIds(columnName, params));
+
+        HqlPack.getNumEqualPack(isDeleted, "isDeleted", result);
+        return result.toString();
+    }
+
+    /**
      * 表单布局复杂查询
      * @param bfLayout 表单布局
      * @return hql

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

@@ -177,4 +177,6 @@ public class WmsStockSn extends BaseBean {
     }
 
     public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); }
+
+    public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();}
 }

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

@@ -1036,15 +1036,6 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsQCMaster.getIsPart(),"isPart",result);
         //单号
         HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
-        //业务类型
-        HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result);
-        //关联单据类型
-        HqlPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
-        //关联单据号
-        HqlPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result);
-        //入库单号
-        HqlPack.getStringEqualPack(wmsQCMaster.getIbNo(), "ibNo", result);
-
         getStringBuilderPack(wmsQCMaster, result);
 
         return result.toString();