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

yun-zuoyi
Silliter 6 years ago
commit dd0af51d8f

@ -417,7 +417,7 @@ public class BlockFormEnumUtil {
}
/**
*
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ELEMENT_DEL_STATUS {
@ -898,7 +898,8 @@ public class BlockFormEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum EXECUTION_TYPE {
SQL(10, "SQL", "SQL脚本"),
CLASS_METHOD(20, "ClassMethod", "类方法");
CLASS_METHOD(20, "ClassMethod", "类方法"),
SCRIPT(30, "Script", "脚本"),;
private int value;
private String code;

@ -1589,8 +1589,8 @@ public class WmsEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRINT_ORDER_TYPE {
PO(10, "PO"),
MOVEMENT(20, "MOVEMENT"),
ASN(30, "ASN");
ASN(30, "ASN"),
MOVEMENT(20, "MOVEMENT");
private int value;
private String description;

@ -0,0 +1,54 @@
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;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 20:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_BUTTON")
@Api(value="表单按钮",description = "表单按钮")
public class BfButton extends BaseBean {
@Column(name="BUTTON_NAME")
@ApiParam(value ="按钮名称")
private String buttonName;
// 枚举:BlockFormEnumUtil.TRIGGER_EFFECT
@Column(name="TRIGGER_MODE")
@ApiParam(value ="触发方式")
private Integer triggerMode;
// 关联表单功能表id
@Column(name="METHOD_ID")
@ApiParam(value ="表单功能id")
private Long methodId;
@Column(name="METHOD_NAME_RDD")
@ApiParam(value ="表单功能名称")
private String methodNameRdd;
// 执行类方法,sql,脚本
@Column(name="METHOD_CONTENT")
@ApiParam(value ="执行内容")
private String methodContent;
}

@ -0,0 +1,57 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 14:13
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="bf_cascade")
@Api(value="级联元素",description = "级联元素")
public class BfCascade extends BaseBean {
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementId;
@Column(name="CASCADE_NAME")
@ApiParam(value ="级联名称")
private String cascadeName;
@Column(name="CASCADE_GRADE")
@ApiParam(value ="级联层级")
private Integer cascadeGrade;
@Column(name="CASCADE_DESCRIPTION")
@ApiParam(value ="级联描述")
private String cascadeDescription;
@Transient
@ApiParam(value = "元素详细")
@AnnoOutputColumn(hidden = true)
private List<BfCascadeDetail> detailList;
}

@ -0,0 +1,69 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 14:35
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="bf_cascade_detail")
@Api(value="级联元素明细",description = "级联元素")
public class BfCascadeDetail extends BaseBean {
@Column(name = "CASCADE_ID")
@ApiParam(value = "级联ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long cascade_id;
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementId;
@Column(name="ELEMENT_NAME")
@ApiParam(value ="元素名称")
private String elementName;
@Column(name="DETAIL_GRADE")
@ApiParam(value ="当前级联层级")
private Integer detail_grade;
@Column(name = "PARENT_ID")
@ApiParam(value = "父级ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parent_id;
@Column(name = "ELEMENT_PROPERTY_VALUE_ID")
@ApiParam(value = "对象属性-元素属性ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementPropertyValueId;
@Column(name = "ELEMENT_PROPERTY_TEXT_ID")
@ApiParam(value = "显示属性-元素属性ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementPropertyTextId;
@Column(name="CASCADE_DETAIL_DESCRIPTION")
@ApiParam(value ="级联描述")
private String cascadeDetailDescription;
}

@ -1,8 +1,7 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -13,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :
@ -27,19 +28,39 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="bf_data_object")
@Api(value="数据对象",description = "用来存储动态对象的相关属性")
@Api(value="数据对象",description = "原数据对象,最原始数据")
public class BfDataObject extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="中文名称")
@Column(name="OBJECT_NAME")
@ApiParam(value ="数据名称")
private String objectName;
@Column(name="TABLE_NAME")
@ApiParam(value ="表名")
private String tableName;
@Column(name="OBJECT_CLASS_NAME")
@ApiParam(value ="中文名称")
private String objectClassName;
@Column(name="OBJECT_TABLE_NAME")
@ApiParam(value ="数据表名")
private String objectTableName;
@Column(name="OBJECT_CONTENT")
@ApiParam(value ="数据内容")
private String objectContent;
@Column(name="OBJECT_TYPE")
@ApiParam(value ="数据类型")
private Integer objectType;
@Column(name="OBJECT_COLUMN_NUM")
@ApiParam(value ="数据列名数量")
private Integer objectColumnNum;
@Column(name="OBJECT_DESCRIPTION")
@ApiParam(value ="描述")
private String objectDescription;
@Column(name="is_view")
@ApiParam(value ="是否视图",access = "判断是否是视图,如果不是视图,则是表名")
//EnunmUtil.TRUE_OR_FALSE
private int isView;
@Transient
@ApiParam(value = "数据对象属性")
@AnnoOutputColumn(hidden = true)
private List<BfDataObjectProperty> propertyList;
}

@ -26,28 +26,46 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="bf_data_object_property")
@Api(value="数据对象属性表",description = "数据对象的属性明细表")
@Table(name = "bf_data_object_property")
@Api(value = "数据对象属性表", description = "数据对象的属性明细表")
public class BfDataObjectProperty extends BaseBean {
@Column(name="DATA_OBJECT_ID")
@ApiParam(value ="数据对象ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
//外键关联数据对象主键
@Column(name = "DATA_OBJECT_ID")
@ApiParam(value = "数据对象ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long dataObjectId;
@Column(name="PROP_NAME")
@ApiParam(value ="属性中文名称")
private String propName;
@Column(name="OBJECT_NAME_RDD")
@ApiParam(value ="数据对象名称")
private String objectNameRdd;
@Column(name="OBJECT_TABLE_NAME_RDD")
@ApiParam(value ="数据表名称")
private String objectTableNameRdd;
@Column(name="OBJECT_COLUMN_NAME")
@ApiParam(value ="数据对象列名称")
private String objectColumnName;
@Column(name="OBJECT_COLUMN_TYPE")
@ApiParam(value ="数据对象类型")
private Integer objectColumnType;
@Column(name="PROPERTY_NAME")
@ApiParam(value ="类属性名称")
private String propertyName;
@Column(name="PROPERTY_CODE")
@ApiParam(value ="类属性名称")
private String propertyCode;
@Column(name="PROP_OBJECT_NAME")
@ApiParam(value ="对象中的属性名")
//在动态对象中的属性名
private String propObjectName;
@Column(name="PROPERTY_TYPE")
@ApiParam(value ="属性类型")
private Integer propertyType;
@Column(name="PROP_COLUMN_NAME")
@ApiParam(value ="属性字段名")
//属性在数据库中的字段名
private String propColumnName;
@Column(name="PROPERTY_DESCRIPTION")
@ApiParam(value ="属性描述")
private String propertyDescription;
}

@ -1,43 +0,0 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
/**
* @Description :
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2019-02-27 10:53
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="bf_data_object")
@Api(value="数据对象表",description = "用来存储动态对象的相关属性")
public class BfDataObjectRefer extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="中文名称")
private String objectName;
@Column(name="TABLE_NAME")
@ApiParam(value ="表名")
private String tableName;
@Column(name="is_view")
@ApiParam(value ="是否视图",access = "判断是否是视图,如果不是视图,则是表名")
//EnunmUtil.TRUE_OR_FALSE
private int isView;
}

@ -0,0 +1,85 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
import javax.persistence.Transient;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 13:14
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BF_ELEMENT")
@Api(value = "对象元素基础", description = "元素基础表")
public class BfElement extends BaseBean {
//外键关联数据对象主键
@Column(name = "ELEMENT_INFO_ID")
@ApiParam(value = "对象元素明细ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementInfoId;
//外键关联数据对象主键
@Column(name = "DATA_OBJECT_ID")
@ApiParam(value = "数据对象ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long dataObjectId;
@Column(name="ELEMENT_TYPE")
@ApiParam(value ="元素类型")
private Integer elementType;
@Column(name="ELEMENT_NAME")
@ApiParam(value ="元素名称")
private String elementName;
@Column(name="ELEMENT_ATTR_ID")
@ApiParam(value ="默认排序属性")
private String elementAttrId;
@Column(name="ELEMENT_SORT_TYPE")
@ApiParam(value ="默认排序规则")
private String elementSortType;
@Column(name="ELEMENT_CSS_STYLE")
@ApiParam(value ="元素样式")
private String elementCssStyle;
@Column(name="ELEMENT_DESCRIPTION")
@ApiParam(value ="元素描述")
private String elementDescription;
@Transient
@ApiParam(value = "数据对象")
@AnnoOutputColumn(hidden = true)
private BfDataObject dataObject;
@Transient
@ApiParam(value = "元素表单")
@AnnoOutputColumn(hidden = true)
private BfElementGrid elementGrid;
@Transient
@ApiParam(value = "元素树")
@AnnoOutputColumn(hidden = true)
private BfElementTree elementTree;
}

@ -0,0 +1,63 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 13:24
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BF_ELEMENT_GRID")
@Api(value = "对象元素表格", description = "对象元素表格")
public class BfElementGrid extends BaseBean {
//外键关联数据对象主键
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementId;
@Column(name = "IS_LINE_SHOW_NUMBER")
@ApiParam(value = "显示行号")
private Integer isLineShowNumber;
@Column(name = "IS_OBJECT_ADD")
@ApiParam(value = "是否新增")
private Integer isObjectAdd;
@Column(name = "IS_OBJECT_EDIT")
@ApiParam(value = "是否编辑")
private Integer isObject_edit;
@Column(name = "IS_OBJECT_DEL")
@ApiParam(value = "是否删除")
private Integer isObjectDel;
@Column(name = "ELEMENT_TYPE")
@ApiParam(value = "是否查询")
private Integer elementType;
@Column(name = "IS_OBJECT_FIND")
@ApiParam(value = "元素类型")
private Integer isObjectFind;
}

@ -0,0 +1,119 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
import javax.persistence.Transient;
/**
* @Description :
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2019-02-27 10:53
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="bf_element_property")
@Api(value="对象元素属性",description = "对象元素属性 相当于数据对象属性的扩展")
public class BfElementProperty extends BaseBean {
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementId;
@Column(name = "OBJECT_ID")
@ApiParam(value = "数据对象ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long objectId;
@Column(name = "DATA_OBJECT_PROPERTY_ID")
@ApiParam(value = "数据对象属性ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long dataObjectPropertyId;
@Column(name="PROPERTY_NAME")
@ApiParam(value ="元素描述")
private String propertyName;
@Column(name="PROPERTY_DEFAULT_VALUE")
@ApiParam(value ="元素描述")
private String propertyDefaultValue;
@Column(name = "PROPERTY_VALUE_NOT_NULL")
@ApiParam(value = "是否必填")
private Integer propertyValueNotNull;
@Column(name = "PROPERTY_IS_FIND")
@ApiParam(value = "是否查询条件")
private Integer propertyIsFind;
@Column(name = "PROPERTY_SHOW_STATUS")
@ApiParam(value = "显示状态")
private Integer propertyShowStatus;
@Column(name = "PROPERTY_INPUT_TXT")
@ApiParam(value = "输入提示")
private Integer propertyInputTxt;
@Column(name = "PROPERTY_LENGTH")
@ApiParam(value = "属性长度")
private Integer propertyLength;
@Column(name = "PROPERTY_ADD_STATUS")
@ApiParam(value = "新增可见状态")
private Integer propertyAddStatus;
@Column(name = "PROPERTY_EDIT_STATUS")
@ApiParam(value = "编辑可见状态")
private Integer propertyEditStatus;
@Column(name = "PROPERTY_IS_SORT")
@ApiParam(value = "是否可排序")
private Integer propertyIsSort;
@Column(name = "PROPERTY_SORT")
@ApiParam(value = "显示顺序")
private Integer propertySort;
@Column(name = "PROPERTY_CONTROL_TYPE")
@ApiParam(value = "控件类型")
private Integer propertyControlType;
@Column(name = "PROPERTY_CONTROL_FORMAT")
@ApiParam(value = "控件显示格式")
private String propertyControlFormat;
@Column(name = "PROPERTY_CONTROL_REF_ID")
@ApiParam(value = "控件引用RefId")
@JsonSerialize(using = ToStringSerializer.class)
private Long propertyControlRefId;
@Column(name = "PROPERTY_DESCRIPTION")
@ApiParam(value = "属性描述")
private String propertyDescription;
@Column(name="PROPERTY_CSS_STYLE")
@ApiParam(value ="元素样式")
private String propertyCssStyle;
@Transient
@ApiParam(value = "对象属性信息")
@AnnoOutputColumn(hidden = true)
private BfDataObjectProperty objectProperty;
}

@ -0,0 +1,65 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 14:02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="bf_element_property_virtual")
@Api(value="对象元素虚拟属性",description = "对象元素虚拟属性")
public class BfElementPropertyVirtual extends BaseBean {
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementId;
@Column(name = "PROPERTY_VIRTUAL_TYPE")
@ApiParam(value = "虚拟元素类型")
private Integer propertyVirtualType;
@Column(name = "PROPERTY_SHOW_FORMAT")
@ApiParam(value = "显示格式")
private String propertyShowFormat;
@Column(name = "PROPERTY_LABEL_TEXT")
@ApiParam(value = "提示信息")
private String propertyLabelText;
@Column(name = "PROPERTY_SORT")
@ApiParam(value = "显示顺序")
private Integer propertySort;
@Column(name = "PROPERTY_DESCRIPTION")
@ApiParam(value = "属性描述")
private String propertyDescription;
@Transient
@ApiParam(value = "虚拟属性列表")
@AnnoOutputColumn(hidden = true)
private List<BfCascadeDetail> detailList;
}

@ -0,0 +1,58 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 13:24
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BF_ELEMENT_TREE")
@Api(value = "对象元素基础", description = "元素基础表")
public class BfElementTree extends BaseBean {
//外键关联数据对象主键
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementId;
@Column(name = "TREE_PARENT_ID")
@ApiParam(value = "父级属性ID")
private Integer treeParentId;
@Column(name = "TREE_ATTR_NAME_ID")
@ApiParam(value = "显示属性ID")
private Integer treeAttrNameId;
@Column(name = "TREE_ATTR_VALUE_ID")
@ApiParam(value = "取值属性ID")
private Integer treeAttrValueId;
@Column(name="TREE_DEFAULT_DIRECTION")
@ApiParam(value ="树默认方向")
private Integer treeDefaultDirection;
@Column(name = "TREE_IS_DIRECTION")
@ApiParam(value = "树是否开启切换方向")
private Integer treeIsDirection;
}

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 16:25
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_INTERCEPT")
@Api(value="拦截器主体")
public class BfIntercept extends BaseBean {
@Column(name="INTERCEPT_NAME")
@ApiParam(value ="拦截器名称")
private String interceptName;
@Column(name="EXECUTE_MODE")
@ApiParam(value ="执行方式")
private Integer executeMode;
@Column(name="EXECUTE_CONTENT")
@ApiParam(value ="执行内容")
private Integer executeContent;
}

@ -0,0 +1,59 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 19:07
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_INTERCEPT_DETAIL")
@Api(value="拦截器明细")
public class BfInterceptDetail extends BaseBean {
@Column(name="INTERCEPT_ID")
@ApiParam(value ="拦截器id")
private Long interceptId;
@Column(name="INTERCEPT_NAME_RDD")
@ApiParam(value ="拦截器名称")
private String interceptNameRdd;
@Column(name="INTERCEPT_TYPE")
@ApiParam(value ="拦截器类型")
private Integer interceptType;
@Column(name="INTERCEPT_POSITION")
@ApiParam(value ="拦截器位置")
private Integer interceptPosition;
@Column(name="INTERCEPT_TARGET_ID")
@ApiParam(value ="拦截目标id")
private Long interceptTargetId;
@Column(name="INTERCEPT_TARGET_NAME_RDD")
@ApiParam(value ="拦截目标名称")
private String interceptTargetNameRdd;
@Column(name="INTERCEPT_PROCESS_RESULT")
@ApiParam(value ="拦截器业务结果处理")
private Integer interceptProcessResult;
}

@ -0,0 +1,64 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 13:54
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_LAYOUT")
@Api(value="自定义表单布局")
public class BfLayout extends BaseBean {
@Column(name="LAYOUT_NAME")
@ApiParam(value ="名称")
private String layoutName;
@Column(name="LAYOUT_WIDTH")
@ApiParam(value ="布局宽度")
private Double layoutWidth;
@Column(name="LAYOUT_HEIGHT")
@ApiParam(value ="布局高度")
private Double layoutHeight;
@Column(name="LAYOUT_ROW_COUNT")
@ApiParam(value ="行数")
private Integer layoutRowCount;
@Column(name="LAYOUT_COLUMN_COUNT")
@ApiParam(value ="列数")
private Integer layoutColumnCount;
@Column(name="LAYOUT_REPORT_COUNT")
@ApiParam(value ="引用报表数量")
private Integer layoutReportCount;
@Column(name = "LAYOUT_DESCRIPTION",columnDefinition = "TEXT")
@ApiParam(value ="布局描述")
private String layoutDescription;
@Transient
@ApiParam(value ="模板行集合")
private List<BfLayoutRow> brLayoutRows;
}

@ -0,0 +1,66 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 13:54
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_LAYOUT_COLUMN")
@Api(value="自定义表单布局-列")
public class BfLayoutColumn extends BaseBean {
@Column(name="LAYOUT_ID")
@ApiParam(value ="布局主键")
@JsonSerialize(using = ToStringSerializer.class)
private Long layoutId;
@Column(name="LAYOUT_ROW_ID")
@ApiParam(value ="行主键")
@JsonSerialize(using = ToStringSerializer.class)
private Long layoutRowId;
@Column(name="COLUMN_COLSPAN")
@ApiParam(value ="跨列数")
private Integer columnColspan;
@Column(name="COLUMN_ROWSPAN")
@ApiParam(value ="跨行数")
private Integer columnRowspan;
@Column(name="COLUMN_WIDTH")
@ApiParam(value ="列宽")
private Integer columnWidth;
@Column(name="COLUMN_STYLE")
@ApiParam(value ="列样式")
private String columnStyle;
@Column(name="COLUMN_SORT")
@ApiParam(value ="排序,降序")
private Integer columnSort;
@Column(name = "COLUMN_DESCRIPTION",columnDefinition = "TEXT")
@ApiParam(value ="列描述")
private String columnDescription;
}

@ -0,0 +1,59 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 13:54
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_LAYOUT_ROW")
@Api(value="自定义表单布局-行")
public class BfLayoutRow extends BaseBean {
@Column(name="LAYOUT_ID")
@ApiParam(value ="布局主键")
@JsonSerialize(using = ToStringSerializer.class)
private Long layoutId;
@Column(name="ROW_HEIGHT")
@ApiParam(value ="行高")
private Integer rowHeight;
@Column(name="ROW_SORT")
@ApiParam(value ="排序")
private Integer rowSort;
@Column(name="ROW_STYLE",columnDefinition = "TEXT")
@ApiParam(value ="行样式")
private String rowStyle;
@Column(name="ROW_COL_NUM")
@ApiParam(value ="行所关联列数")
private Integer rowColNum;
@Transient
@ApiParam(value ="行所包含的列")
private List<BfLayoutColumn> brLayoutColumns;
}

@ -0,0 +1,70 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 15:33
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_MENU")
@Api(value="表单菜单目录",description = "表单菜单目录")
public class BfMenu extends BaseBean {
@Column(name="MENU_NAME")
@ApiParam(value ="菜单名称")
private String menuName;
@Column(name="PARENT_ID")
@ApiParam(value ="父级菜单id")
private Long parentId;
@Column(name="PARENT_NAME_RDD")
@ApiParam(value ="父级菜单名称")
private String parentNameRdd;
@Column(name="MENU_SORT")
@ApiParam(value ="菜单排序")
private Integer menuSort;
@Column(name="MENU_ICON")
@ApiParam(value ="菜单图标")
private String menuIcon;
@Column(name="MENU_STYLE", columnDefinition = "TEXT")
@ApiParam(value ="菜单样式")
private String menuStyle;
@Column(name="MENU_TYPE")
@ApiParam(value ="菜单类型")
private Integer menuType;
@Column(name="MENU_URL")
@ApiParam(value ="菜单url")
private String menuUrl;
@Column(name="METHOD_ID")
@ApiParam(value ="功能id")
private String methodId;
@Column(name = "MENU_STATUS")
@ApiParam(value = "菜单状态")
private Integer menuStatus;
}

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 20:40
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_METHOD")
@Api(value="表单功能",description = "表单功能")
public class BfMethod extends BaseBean {
@Column(name="METHOD_NAME")
@ApiParam(value ="功能名称")
private String methodName;
@Column(name="LAYOUT_ID")
@ApiParam(value ="布局id")
private Long layoutId;
@Column(name="LAYOUT_NAME_RDD")
@ApiParam(value ="布局名称")
private String layoutNameRdd;
@Column(name="METHOD_DESCRIPTION")
@ApiParam(value ="功能描述")
private String methodDescription;
}

@ -0,0 +1,56 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 20:56
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_METHOD_DETAIL")
@Api(value="表单功能明细",description = "表单功能明细")
public class BfMethodDetail extends BaseBean {
@Column(name="METHOD_ID")
@ApiParam(value ="功能id")
private Long methodId;
@Column(name="METHOD_NAME_RDD")
@ApiParam(value ="功能名称")
private String methodNameRdd;
@Column(name="layout_column_id")
@ApiParam(value ="布局列id")
private Long layoutColumnId;
@Column(name="METHOD_DETAIL_NAME")
@ApiParam(value ="表单功能明细名称")
private String methodDetailName;
@Column(name="ELEMENT_ID")
@ApiParam(value ="表单元素id")
private Long elementId;
@Column(name="ELEMENT_NAME_RDD")
@ApiParam(value ="表单元素名称")
private String elementNameRdd;
}

@ -0,0 +1,77 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 21:03
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BR_METHOD_DETAIL_PROPERTY")
@Api(value="表单功能明细关联属性",description = "表单功能明细关联属性")
public class BfMethodDetailProperty extends BaseBean {
@Column(name="METHOD_ID")
@ApiParam(value ="功能id")
private Long methodId;
// 关联功能明细表id
@Column(name="PRI_METHOD_DETAIL_ID")
@ApiParam(value ="主功能明细id")
private Long priMethodDetailId;
@Column(name="PRI_METHOD_DETAIL_NAME_RDD")
@ApiParam(value ="主功能明细名称")
private String priMethodDetailNameRdd;
@Column(name="PRI_ELEMENT_ID")
@ApiParam(value ="主对象元素id")
private Long priElementId;
@Column(name="PRI_ELEMENT_NAME_RDD")
@ApiParam(value ="主对象元素名称")
private String priElementNameRdd;
// 枚举:BlockFormEnumUtil.TRIGGER_EVENT
@Column(name="PRI_ELEMENT_EVENT")
@ApiParam(value ="主对象元素事件")
private Integer priElementEvent;
// 枚举:BlockFormEnumUtil.SQL_REF_TYPE
@Column(name="ASSOCIATE_TYPE")
@ApiParam(value ="关联类型")
private Integer associateType;
@Column(name="SEC_METHOD_DETAIL_ID")
@ApiParam(value ="关联功能明细id")
private Long secMethodDetailId;
@Column(name="SEC_METHOD_DETAIL_NAME_RDD")
@ApiParam(value ="关联功能明细名称")
private String secMethodDetailNameRdd;
@Column(name="SEC_ELEMENT_ID")
@ApiParam(value ="关联对象元素id")
private Long secElementId;
@Column(name="sec_element_name_rdd")
@ApiParam(value ="关联对象元素名称")
private String secElementNameRdd;
}

@ -0,0 +1,52 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 20:29
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_REF_BUTTON_METHOD")
@Api(value="按钮功能关系",description = "按钮功能关系")
public class BfRefButtonMethod extends BaseBean {
@Column(name="BUTTON_ID")
@ApiParam(value ="按钮id")
private Long buttonId;
@Column(name="BUTTON_NAME_RDD")
@ApiParam(value ="按钮名称")
private String buttonNameRdd;
// 枚举 关联位置类型枚举
@Column(name="BUTTON_POSITION_TYPE")
@ApiParam(value ="按钮位置类型")
private Integer buttonPositionType;
@Column(name="BUTTON_POSITION_REF_ID")
@ApiParam(value ="按钮位置关联id")
private String buttonPositionRefId;
@Column(name="BUTTON_POSITION_REF_NAME_RDD")
@ApiParam(value ="按钮位置关联名称")
private String buttonPositionRefNameRdd;
}

@ -0,0 +1,48 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 14:08
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="bf_ref_element_property_virtual_detail")
@Api(value="对象元素虚拟属性",description = "对象元素虚拟属性")
public class BfRefElementPropertyVirtualDetail extends BaseBean {
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementId;
@Column(name = "element_property_virtual_id")
@ApiParam(value = "对象元素虚拟属性ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementPropertyVirtualId;
@Column(name = "element_property_id")
@ApiParam(value = "对象元素属性", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementPropertyId;
}

@ -0,0 +1,47 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
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;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 18:45
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_REF_METHOD_ROLE")
@Api(value="功能角色关系",description = "功能角色关系")
public class BfRefMethodRole extends BaseBean {
@Column(name="METHOD_ID")
@ApiParam(value ="表单功能id")
private Long methodId;
@Column(name="METHOD_NAME_RDD")
@ApiParam(value ="表单功能名称")
private String methodNameRdd;
@Column(name="ROLE_ID")
@ApiParam(value ="角色id")
private Long roleId;
@Column(name="ROLE_NAME_RDD")
@ApiParam(value ="角色名称")
private String roleNameRdd;
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfButton;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 20:27
* @Modify:
**/
public interface BfButtonRepository extends BaseRepository<BfButton,Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfCascadeDetail;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 15:17
* @Modify:
**/
public interface BfCascadeDetailRepository extends BaseRepository<BfCascadeDetail,Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfCascade;
/**
* @Description :
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-12-26 20:23
* @Modify:
**/
public interface BfCascadeRepository extends BaseRepository<BfCascade,Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfDataObjectProperty;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 15:23
* @Modify:
**/
public interface BfDataObjectPropertyRepository extends BaseRepository<BfDataObjectProperty,Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfDataObject;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 15:18
* @Modify:
**/
public interface BfDataObjectRepository extends BaseRepository<BfDataObject,Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfElementGrid;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 15:24
* @Modify:
**/
public interface BfElementGridRepository extends BaseRepository<BfElementGrid,Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfElementProperty;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 15:24
* @Modify:
**/
public interface BfElementPropertyRepository extends BaseRepository<BfElementProperty,Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfElementPropertyVirtual;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 15:26
* @Modify:
**/
public interface BfElementPropertyVirtualRepository extends BaseRepository<BfElementPropertyVirtual,Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfElement;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 15:24
* @Modify:
**/
public interface BfElementRepository extends BaseRepository<BfElement,Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfElementTree;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 15:25
* @Modify:
**/
public interface BfElementTreeRepository extends BaseRepository<BfElementTree,Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfInterceptDetail;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 20:16
* @Modify:
**/
public interface BfInterceptDetailRepository extends BaseRepository<BfInterceptDetail,Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfIntercept;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 20:15
* @Modify:
**/
public interface BfInterceptRepository extends BaseRepository<BfIntercept,Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfLayoutColumn;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 20:18
* @Modify:
**/
public interface BfLayoutColumnRepository extends BaseRepository<BfLayoutColumn,Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfLayout;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 20:17
* @Modify:
**/
public interface BfLayoutRepository extends BaseRepository<BfLayout, Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfLayoutRow;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 20:18
* @Modify:
**/
public interface BfLayoutRowRepository extends BaseRepository<BfLayoutRow, Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfMenu;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 20:19
* @Modify:
**/
public interface BfMenuRepository extends BaseRepository<BfMenu, Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfMethodDetailProperty;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 21:14
* @Modify:
**/
public interface BfMethodDetailPropertyRepository extends BaseRepository<BfMethodDetailProperty, Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfMethodDetail;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 21:12
* @Modify:
**/
public interface BfMethodDetailRepository extends BaseRepository<BfMethodDetail, Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfMethod;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 20:54
* @Modify:
**/
public interface BfMethodRepository extends BaseRepository<BfMethod, Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfRefButtonMethod;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 20:38
* @Modify:
**/
public interface BfRefButtonMethodRepository extends BaseRepository<BfRefButtonMethod, Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfRefElementPropertyVirtualDetail;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 15:25
* @Modify:
**/
public interface BfRefElementPropertyVirtualDetailRepository extends BaseRepository<BfRefElementPropertyVirtualDetail,Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfRefMethodRole;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 20:20
* @Modify:
**/
public interface BfRefMethodRoleRepository extends BaseRepository<BfRefMethodRole, Long> {
}

@ -0,0 +1,11 @@
package cn.estsh.i3plus.pojo.form.sqlpack;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 15:16
* @Modify:
**/
public class FormHqlPack {
}

@ -40,9 +40,9 @@ public class SysDictionary extends BaseBean {
private String dictionaryCode;
//枚举 CommonEnumUtil.SOFT_TYPE
@Column(name="SOFT_TYPE")
@ApiParam(value ="微服务软件类型")
private Integer softType;
@Column(name="DICTIONARY_SOFT_TYPE")
@ApiParam(value ="字典所属模块")
private Integer dictionarySoftType;
// 根节点-1
@Column(name="PARENT_ID")

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -32,6 +33,11 @@ public class SysTask extends BaseBean {
@ApiParam(value ="名称")
private String name;
// 软件类型 CommonEnumUtil.SOFT_TYPE
@Column(name="TASK_SOFT_TYPE")
@ApiParam(value = "软件类型")
private Integer taskSoftType;
@Column(name="TASK_PACKAGE")
@ApiParam(value ="任务包名")
private String taskPackage;

@ -71,6 +71,10 @@ public class SysTaskPlan extends BaseBean {
@ApiParam(value ="定时任务名称")
private String taskNameRdd;
@Column(name="TASK_SOFT_TYPE_RDD")
@ApiParam(value ="任务所属模块")
private Integer taskSoftTypeRdd;
@Column(name="TASK_CYCLE_START_DATE_TIME_RDD")
@ApiParam(value ="任务开始时间")
private String taskCycleStartDateTimeRdd;

@ -21,11 +21,11 @@ public class CoreHqlPack {
* @param columnName
* @return
*/
public static String packHqlIds(String columnName,String[] params){
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);
HqlPack.getInPack(String.join(",", params), columnName, result);
return result.toString();
}
@ -35,7 +35,7 @@ public class CoreHqlPack {
* @param columnName
* @return
*/
public static String packHqlIds(String columnName,Long[] params){
public static String packHqlIds(String columnName, Long[] params){
StringBuffer result = new StringBuffer();
// 参数数组 [1,2,3] -> "1,2,3"
@ -230,13 +230,14 @@ public class CoreHqlPack {
StringBuffer result = new StringBuffer();
// hql拼接
HqlPack.getStringLikerPack(dictionary.getName(),"name",result);
HqlPack.getStringLikerPack(dictionary.getDictionaryCode(),"dictionaryCode",result);
HqlPack.getStringLikerPack(dictionary.getName(), "name", result);
HqlPack.getStringLikerPack(dictionary.getDictionaryCode(), "dictionaryCode", result);
HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result);
// 默认查询非顶级字典
if(dictionary.getParentId() == null || dictionary.getParentId() < 1){
HqlPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(),"parentId",result);
if (dictionary.getParentId() == null || dictionary.getParentId() < 1){
HqlPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result);
}
HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
HqlPack.getNumEqualPack(dictionary.getParentId(), "parentId", result);
// 添加默认排序
HqlPack.getOrderDefault(dictionary);
@ -407,7 +408,7 @@ public class CoreHqlPack {
// and
HqlPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result);
HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
HqlPack.getNumEqualPack(dictionary.getSoftType(),"softType",result);
HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result);
// not
HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
@ -428,7 +429,7 @@ public class CoreHqlPack {
// and
HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result);
HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
HqlPack.getNumEqualPack(dictionary.getSoftType(),"softType",result);
HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result);
// not
HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);

@ -0,0 +1,82 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
/**
* @Description :
* @Reference :
* @Author : siliter
* @CreateDate : 2019-03-21 14:50
* @Modify:
**/
@Data
@Entity
@Table(name = "WMS_SN_PRINT_RCD")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value = "条码补打印记录表", description = "条码补打印记录表")
public class WmsSnPrintRcd extends BaseBean {
@Column(name = "WH_NO")
@ApiParam(value = "仓库代码")
private String whNo;
@Column(name = "ZONE_NO")
@ApiParam(value = "存储区编号")
private String zoneNo;
@Column(name = "LOCATE_NO")
@ApiParam(value = "库位代码")
private String locateNo;
@Column(name = "PART_NO")
@ApiParam(value = "物料编号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam(value = "物料名称")
private String partNameRdd;
@Column(name = "SN")
@ApiParam(value = "条码")
private String sn;
@Column(name = "UNIT")
@ApiParam(value = "单位")
private String unit;
@Column(name = "QTY")
@ApiParam(value = "数量", example = "0")
private Double qty;
@Column(name = "PDATE")
@ApiParam(value = "打印时间")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date pdate;
@ApiParam(value = "仓库名称")
@Transient
public String whNameRdd;
@ApiParam(value = "存储区名称")
@Transient
public String zoneNameRdd;
@ApiParam(value = "库位名称")
@Transient
public String locateNameRdd;
}

@ -12,6 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
/**
@ -134,4 +135,16 @@ public class WmsStockSn extends BaseBean {
@Column(name = "CUST_SN")
@ApiParam(value = "客户条码")
private String custSn;
@ApiParam(value = "仓库名称")
@Transient
public String whNameRdd;
@ApiParam(value = "存储区名称")
@Transient
public String zoneNameRdd;
@ApiParam(value = "库位名称")
@Transient
public String locateNameRdd;
}

@ -62,4 +62,9 @@ public class WmsTaskInfo extends BaseBean {
@Column(name = "PRE_USE_TIME")
@ApiParam(value = "预计作业时间(分钟)", example = "1")
public Integer preUseTime;
@Column(name = "IS_ONE_STEP")
@ApiParam("是否一步法操作")
public Integer isOneStep;
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsSnPrintRcd;
import org.springframework.stereotype.Repository;
/**
* @Description :Repository
* @Reference :
* @Author : siliter
* @CreateDate : 2019-03-21 10:19
* @Modify:
**/
@Repository
public interface WmsSnPrintRcdRepository extends BaseRepository<WmsSnPrintRcd, Long> {
}

@ -1248,6 +1248,10 @@ public class WmsHqlPack {
HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result);
// 单据编号
HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result);
// 设备编号
HqlPack.getStringEqualPack(wmsActionLog.getFixId(), "fixId", result);
// 流程状态
HqlPack.getNumEqualPack(wmsActionLog.getActionStatus(), "actionStatus", result);
getStringBuilderPack(wmsActionLog, result);
@ -1320,14 +1324,37 @@ public class WmsHqlPack {
public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result);
HqlPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
HqlPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
HqlPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
HqlPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
getStringBuilderPack(wmsStockSn, result);
return result.toString();
}
/**
*
*
* @param wmsSnPrintRcd
* @return
*/
public static String packHqlWmsSnPrintRcd(WmsSnPrintRcd wmsSnPrintRcd) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wmsSnPrintRcd.getSn(), "sn", result);
HqlPack.getStringEqualPack(wmsSnPrintRcd.getZoneNo(), "zoneNo", result);
HqlPack.getStringEqualPack(wmsSnPrintRcd.getWhNo(), "whNo", result);
HqlPack.getStringEqualPack(wmsSnPrintRcd.getPartNo(), "partNo", result);
HqlPack.getStringEqualPack(wmsSnPrintRcd.getLocateNo(), "locateNo", result);
getStringBuilderPack(wmsSnPrintRcd, result);
return result.toString();
}
/**
*
*
* @param wmsStockSn
@ -1413,10 +1440,11 @@ public class WmsHqlPack {
* @param vals
* @return
*/
public static String packHqlAndIn(BaseBean 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.getNumEqualPack(bean.getTaskStatus(), "taskStatus", result);
getStringBuilderPack(bean, result);
return result.toString();
}

Loading…
Cancel
Save