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 4ba5c32..6e44e58 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/WmsButton.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsButton.java new file mode 100644 index 0000000..22a3e99 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsButton.java @@ -0,0 +1,68 @@ +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 : hansen.ke + * @CreateDate : 2018-11-02 9:33 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_BUTTON") +@DynamicInsert +@DynamicUpdate +@Api(value="元数据按钮信息表",description = "元数据按钮信息表") +public class WmsButton extends BaseBean { + + @Column(name = "CODE") + @ApiParam(value = "元数据编码") + private String code; + + @Column(name = "NAME") + @ApiParam(value = "按钮名称") + private String name; + + @Column(name = "ICON") + @ApiParam(value = "图标") + private String icon; + + @Column(name = "UI") + @ApiParam(value = "按钮UI路径") + private String ui; + + @Column(name = "BS") + @ApiParam(value = "按钮BS路径") + private String bs; + + @Column(name = "URL") + @ApiParam(value = "服务端URL") + private String url; + + @Column(name = "ORDER_NUM") + @ApiParam(value = "排序号",example = "1") + private Integer orderNum; + + @Column(name = "GROUP_NUM") + @ApiParam(value = "分组号",example = "1") + private Integer groupNum; + + @Column(name = "IS_BASE") + @ApiParam(value = "是否基础功能",example = "2") + private Integer isBase; + + @Column(name = "IS_HIDE") + @ApiParam(value = "是否删除",example = "2") + private Integer isHide; +} 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/bean/WmsStockQuant.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java new file mode 100644 index 0000000..8d4de62 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java @@ -0,0 +1,132 @@ +package cn.estsh.i3plus.pojo.wms.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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 库存表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-11-02 11:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_STOCK_QUANT") +@DynamicInsert +@DynamicUpdate +@Api(value="库存表",description = "库存表") +public class WmsStockQuant extends BaseBean{ + + @Column(name="CUST_ID") + @ApiParam(value ="客户编号") + @JsonSerialize(using = ToStringSerializer.class) + private Long custId; + + @Column(name="CUST_CODE") + @ApiParam(value ="客户代码") + private String custCode; + + @Column(name="SUPP_ID") + @ApiParam(value ="供应商编号") + @JsonSerialize(using = ToStringSerializer.class) + private Long suppId; + + @Column(name="SUPP_CODE") + @ApiParam(value ="供应商代码") + private String suppCode; + + @Column(name="PART_ID") + @ApiParam(value ="零件id") + @JsonSerialize(using = ToStringSerializer.class) + private Long partId; + + @Column(name="PART_NO") + @ApiParam(value ="零件编号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam(value ="零件名称") + private String partNameRdd; + + @Column(name="UNIT") + @ApiParam(value ="采购单位") + private String unit; + + @Column(name="QIT") + @ApiParam(value ="库存数") + private Double qit; + + @Column(name="ERP_WAREHOUSE") + @ApiParam(value ="收货库存地") + private String erpWareHouse; + + @Column(name="WH_ID") + @ApiParam(value ="仓库编号") + @JsonSerialize(using = ToStringSerializer.class) + private Long whId; + + @Column(name="WH_CODE") + @ApiParam(value ="仓库代码") + private String whCode; + + @Column(name="LOC_ID") + @ApiParam(value ="库位编号") + @JsonSerialize(using = ToStringSerializer.class) + private Long locId; + + @Column(name="LOC_CODE") + @ApiParam(value ="库位代码") + private String locCode; + + public Long getCustId() { + if(custId != null) { + return custId.longValue(); + }else{ + return custId; + } + } + + public Long getSuppId() { + if(suppId != null) { + return suppId.longValue(); + }else{ + return suppId; + } + } + + public Long getPartId() { + if(partId != null) { + return partId.longValue(); + }else{ + return partId; + } + } + + public Long getWhId() { + if(whId != null) { + return whId.longValue(); + }else{ + return whId; + } + } + + public Long getLocId() { + if(locId != null) { + return locId.longValue(); + }else{ + return locId; + } + } + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java index c0bd9ef..1342814 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java @@ -5,7 +5,6 @@ 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 io.swagger.models.auth.In; import lombok.Data; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -15,7 +14,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description : 仓库交易记录表 + * @Description : 库存交易记录表 * @Reference : * @Author : jimmy.zeng * @CreateDate : 2018-11-01 13:21 @@ -26,7 +25,7 @@ import javax.persistence.Table; @Table(name="WMS_TRANS") @DynamicInsert @DynamicUpdate -@Api(value="仓库交易记录表",description = "仓库交易记录表") +@Api(value="库存交易记录表",description = "库存交易记录表") public class WmsTrans extends BaseBean{ @Column(name="ORDER_NO") @@ -38,11 +37,11 @@ public class WmsTrans extends BaseBean{ private String sn; @Column(name="PART_ID") - @ApiParam(value ="零件id") + @ApiParam(value ="零件id",example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long partId; - @Column(name="PART_No") + @Column(name="PART_NO") @ApiParam(value ="零件编号") private String partNo; @@ -51,8 +50,8 @@ public class WmsTrans extends BaseBean{ private String partNameRdd; @Column(name="TRANS_STATUS") - @ApiParam(value ="交易状态") - private String Trans_status; + @ApiParam(value ="交易状态",example = "1") + private Integer transStatus; @Column(name="QTY") @ApiParam(value ="需求数") @@ -70,29 +69,25 @@ public class WmsTrans extends BaseBean{ @ApiParam(value ="单位") private String unit; - @Column(name="SRC_LOC_ID") - @ApiParam(value ="来源库位id") + @Column(name="LOC_ID") + @ApiParam(value ="库位id",example = "-1") @JsonSerialize(using = ToStringSerializer.class) - private Long srcLocId; + private Long locId; - @Column(name="SRC_LOC_CODE") - @ApiParam(value ="来源库位代码") - private String srcLocCode; + @Column(name="LOC_CODE") + @ApiParam(value ="库位代码") + private String locCode; - @Column(name="DEST_LOC_ID") - @ApiParam(value ="目标库位id") + @Column(name="GROUP_ID") + @ApiParam(value ="分组id",example = "-1") @JsonSerialize(using = ToStringSerializer.class) - private Long destLocId; + private Long groupId; - @Column(name="DEST_LOC_CODE") - @ApiParam(value ="目标库位代码") - private String destLocCode; - - public Long getSrcLocId() { - if(srcLocId != null) { - return srcLocId.longValue(); + public Long getLocId() { + if(locId != null) { + return locId.longValue(); }else{ - return srcLocId; + return locId; } } @@ -103,12 +98,4 @@ public class WmsTrans extends BaseBean{ return partId; } } - - public Long getDestLocId() { - if(destLocId != null) { - return destLocId.longValue(); - }else{ - return destLocId; - } - } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java index 8b49c9f..2581c03 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java @@ -37,11 +37,11 @@ public class WmsTransRcd extends BaseBean{ private String sn; @Column(name="PART_ID") - @ApiParam(value ="零件id") + @ApiParam(value ="零件id",example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long partId; - @Column(name="PART_No") + @Column(name="PART_NO") @ApiParam(value ="零件编号") private String partNo; @@ -50,8 +50,8 @@ public class WmsTransRcd extends BaseBean{ private String partNameRdd; @Column(name="TRANS_STATUS") - @ApiParam(value ="交易状态") - private Integer TransStatus; + @ApiParam(value ="交易状态",example = "1") + private Integer transStatus; @Column(name="QTY") @ApiParam(value ="需求数") @@ -69,29 +69,25 @@ public class WmsTransRcd extends BaseBean{ @ApiParam(value ="单位") private String unit; - @Column(name="SRC_LOC_ID") - @ApiParam(value ="来源库位id") + @Column(name="LOC_ID") + @ApiParam(value ="库位id",example = "-1") @JsonSerialize(using = ToStringSerializer.class) - private Long srcLocId; + private Long locId; - @Column(name="SRC_LOC_CODE") - @ApiParam(value ="来源库位代码") - private String srcLocCode; + @Column(name="LOC_CODE") + @ApiParam(value ="库位代码") + private String locCode; - @Column(name="DEST_LOC_ID") - @ApiParam(value ="目标库位id") + @Column(name="GROUP_ID") + @ApiParam(value ="分组id",example = "-1") @JsonSerialize(using = ToStringSerializer.class) - private Long destLocId; + private Long groupId; - @Column(name="DEST_LOC_CODE") - @ApiParam(value ="目标库位代码") - private String destLocCode; - - public Long getSrcLocId() { - if(srcLocId != null) { - return srcLocId.longValue(); + public Long getLocId() { + if(locId != null) { + return locId.longValue(); }else{ - return srcLocId; + return locId; } } @@ -102,12 +98,4 @@ public class WmsTransRcd extends BaseBean{ return partId; } } - - public Long getDestLocId() { - if(destLocId != null) { - return destLocId.longValue(); - }else{ - return destLocId; - } - } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index 91f6cda..b14a8ca 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.wms.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; @@ -30,7 +28,6 @@ public class WmsTransType extends BaseBean{ @Column(name="TRANS_CODE") @ApiParam(value ="交易代码") - @JsonSerialize(using = ToStringSerializer.class) private String transCode; @Column(name="TRANS_NAME") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsButtonRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsButtonRepository.java new file mode 100644 index 0000000..a8afed4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsButtonRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsButton; + +/** + * @Description :对象持久层仓用方法控制(元数据按钮按钮信息) + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-02 10:22 + * @Modify: + **/ +public interface WmsButtonRepository extends BaseRepository { +} 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/repository/WmsStockQuantRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockQuantRepository.java new file mode 100644 index 0000000..f11c7dd --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockQuantRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockQuant; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransRcd; + +/** + * @Description : 库存表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-11-02 17:08 + * @Modify: + **/ +public interface WmsStockQuantRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java index f58d5e0..0c453f1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; +import org.springframework.stereotype.Repository; /** * @Description : 交易类型表 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 3bc083a..c41b762 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,8 +1,11 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.wms.bean.*; import cn.estsh.i3plus.pojo.wms.bean.InterfaceDevice; import cn.estsh.i3plus.pojo.wms.bean.WareHouse; +import cn.estsh.i3plus.pojo.wms.bean.WmsTrans; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; /** * @Description : 仓库管理对象封装 @@ -29,6 +32,19 @@ public class WmsHqlPack { return result.toString(); } + public static String packHqlWmsButton(WmsButton wmsButton) { + StringBuffer result = new StringBuffer(); + + // 功能名称(name) + HqlPack.getStringLikerPack(wmsButton.getName(),"name", result); + // 前端实现(ui) + HqlPack.getStringLikerPack(wmsButton.getUi(),"ui", result); + // URI权限规则(bs) + HqlPack.getStringLikerPack(wmsButton.getBs(),"bs", result); + + return result.toString(); + } + /** * 接口驱动类信息 分页查询 * @return @@ -40,4 +56,69 @@ 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(); + } + + + /** + * 交易类型信息 分页查询 + * @param wmsTransType + * @return + */ + public static String packHqlWmsTransType(WmsTransType wmsTransType) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringEqualPack(wmsTransType.getTransCode(),"transCode",result); + HqlPack.getStringEqualPack(wmsTransType.getTransName(),"transName",result); + + return result.toString(); + } + + /** + * 库存交易记录信息 分页查询 + * @param wmsTrans + * @return + */ + public static String packHqlWmsTrans(WmsTrans wmsTrans) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringEqualPack(wmsTrans.getTransCode(),"transCode",result); + HqlPack.getNumEqualPack(wmsTrans.getSn(),"sn",result); + HqlPack.timeBuilder(wmsTrans.getCreateDatetime(),null,"createDatetime",result,true); + + return result.toString(); + } }