diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 97b1a55..784e830 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -57,7 +57,7 @@ public abstract class BaseBean implements Serializable { public Integer isValid; //EnumUtil.isValid; @Column(name="create_user") - @ApiParam(value = "创建日期") + @ApiParam(value = "创建用户") public String createUser; @Column(name="create_date") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsField.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsField.java new file mode 100644 index 0000000..9ec77db --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsField.java @@ -0,0 +1,125 @@ +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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 元数据字段表 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-02 10:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "WMS_FIELD") +@Api("元数据字段表") +public class WmsField extends BaseBean{ + + @Column(name = "OBJECT_CODE") + @ApiParam("对象编码") + private String objectCode; + + @Column(name = "FIELD_NUM") + @ApiParam(value = "表单分组序号",example = "-1") + private Integer fieldNum; + + @Column(name = "ORDER_NUM") + @ApiParam(value = "排序索引",example = "-1") + private Integer orderNum; + + @Column(name = "FIELD_SET") + @ApiParam("表单分组") + private String fieldSet; + + @Column(name = "TABLE_NAME") + @ApiParam("字段表名") + private String tableName; + + @Column(name = "FIELD_EN") + @ApiParam("英文名") + private String fieldEn; + + @Column(name = "FIELD_CN") + @ApiParam("中文名") + private String fieldCn; + + @Column(name = "TYPE") + @ApiParam("控件类型") + private String type; + + @Column(name = "EXP") + @ApiParam("控件表达式") + private String exp; + + @Column(name = "IS_QUERY") + @ApiParam(value = "是否可查询", example = "2") + private Integer isQuery; + + @Column(name = "IS_SHOW") + @ApiParam(value = "是否可显", example = "1") + private Integer isShow; + + @Column(name = "IS_DISABLE") + @ApiParam(value = "是否禁用", example = "2") + private Integer isDisable; + + @Column(name = "IS_ORDER") + @ApiParam(value = "是否可排序", example = "1") + private Integer isOrder; + + @Column(name = "IS_EDIT") + @ApiParam(value = "是否可编辑字段", example = "1") + private Integer isEdit; + + @Column(name = "IS_REQURIED") + @ApiParam(value = "是否必填", example = "1") + private Integer isRequried; + + @Column(name = "IS_MULTIPLE") + @ApiParam(value = "是否多选项", example = "2") + private Integer isMultiple; + + @Column(name = "PLACEHOLDER") + @ApiParam("输入提示") + private String placeholder; + + @Column(name = "VALIDATOR") + @ApiParam(value = "是否可编辑字段", example = "2") + private Integer validator; + + @Column(name = "DEFAULTER") + @ApiParam("默认值") + private String defaulter; + + @Column(name = "ADD_STATUS") + @ApiParam("状态") + private Integer addStatus; + + @Column(name = "DATA_TYPE") + @ApiParam("数据类型") + private Integer dataType; + + @Column(name = "DATA_TYPE_NAME") + @ApiParam("数据类型名称") + private String dataTypeName; + + @Column(name = "DATA_SIZE") + @ApiParam("整数位长度") + private Integer dataSize; + + @Column(name = "DATA_DECIMAL") + @ApiParam("小数位长度") + private Integer dataDecimal; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsObject.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsObject.java new file mode 100644 index 0000000..d4c7576 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsObject.java @@ -0,0 +1,81 @@ +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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-02 10:37 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "WMS_OBJECT") +@Api("元数据信息表") +public class WmsObject extends BaseBean { + + @Column(name = "CODE") + @ApiParam("对象编码") + private String code; + + @Column(name = "NAME") + @ApiParam("对象名称") + private String name; + + @Column(name = "VIEW_NAME") + @ApiParam("查询数据视图") + private String viewName; + + @Column(name = "TABLE_NAME") + @ApiParam("保存数据主表") + private String tableName; + + @Column(name = "PK_NAME") + @ApiParam("主键") + private String pkName; + + @Column(name = "DATA_SOURCE") + @ApiParam("数据源") + private String dataSource; + + @Column(name = "IS_SINGLE") + @ApiParam(value = "是否单选", example = "1") + private Integer isSingle; + + @Column(name = "IS_CELL_EDIT") + @ApiParam(value = "是否可行内编辑", example = "2") + private Integer isCellEdit; + + @Column(name = "IS_SHOW_NUM") + @ApiParam(value = "是否显示行号", example = "1") + private Integer isShowNum; + + @Column(name = "IS_FIRST_LOAD") + @ApiParam(value = "是否初始加载", example = "1") + private Integer isFirstLoad; + + @Column(name = "FILTER") + @ApiParam("初始数据过滤条件") + private String filter; + + @Column(name = "DEFAULT_ORDER") + @ApiParam("默认排序字段(desc)") + private String defaultOrder; + + @Column(name = "BIZ_INTERCEPT") + @ApiParam("自定义业务拦截") + private String bizIntercept; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldRepository.java new file mode 100644 index 0000000..e550040 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldRepository.java @@ -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.WmsField; +import org.springframework.stereotype.Service; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-02 11:24 + * @Modify: + **/ +@Service +public interface WmsFieldRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsObjectRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsObjectRepository.java new file mode 100644 index 0000000..2d4fcc7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsObjectRepository.java @@ -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.WmsObject; +import org.springframework.stereotype.Service; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-02 11:23 + * @Modify: + **/ +@Service +public interface WmsObjectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index b86c36e..74c7091 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1,10 +1,7 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.wms.bean.InterfaceDevice; -import cn.estsh.i3plus.pojo.wms.bean.WareHouse; -import cn.estsh.i3plus.pojo.wms.bean.WmsButton; -import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; +import cn.estsh.i3plus.pojo.wms.bean.*; /** * @Description : 仓库管理对象封装 @@ -56,6 +53,40 @@ public class WmsHqlPack { return null; } + /** + * 元数据信息 分页查询 + * @param wmsObject + * @return + */ + public static String packHqlWmsObject(WmsObject wmsObject){ + StringBuffer result = new StringBuffer(); + + // 编码 + HqlPack.getStringLikerPack(wmsObject.getCode(),"code",result); + // 名称 + HqlPack.getStringEqualPack(wmsObject.getName(),"name",result); + // 数据主表 + HqlPack.getStringEqualPack(wmsObject.getTableName(),"tableName",result); + // 自定义业务拦截 + HqlPack.getStringEqualPack(wmsObject.getBizIntercept(),"bizIntercept",result); + + return result.toString(); + } + + /** + * 元数据字段分页查询 + * @param wmsField + * @return + */ + public static String packHqlWmsField(WmsField wmsField){ + StringBuffer result = new StringBuffer(); + // 编码 + HqlPack.getStringLikerPack(wmsField.getObjectCode(),"objectCode",result); + HqlPack.getStringLikerPack(wmsField.getTableName(),"tableName",result); + return result.toString(); + } + + public static String packHqlWmsTransType(WmsTransType wmsTransType) { StringBuffer result = new StringBuffer();