diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java index 6035ea3..b961226 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java @@ -101,6 +101,12 @@ public class Pager { } public int getTotalPages() { + if(pageSize > 0 && totalRows > 0){ + totalPages = totalRows / pageSize; + if (totalRows % pageSize > 0) { + totalPages++; + } + } return totalPages; } @@ -109,6 +115,13 @@ public class Pager { } public int getStartRow() { + if(pageSize > 0){ + if(currentPage >= 1){ + return currentPage * pageSize - pageSize; + }else { + return 0; + } + } return startRow; } @@ -125,6 +138,13 @@ public class Pager { } public int getEndRow() { + if(pageSize > 0){ + if(currentPage > 1){ + return currentPage * pageSize; + }else { + return pageSize; + } + } return endRow; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index 45b9c64..8e246ce 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java @@ -62,6 +62,10 @@ public class BfDataObjectProperty extends BaseBean { @ApiParam(value ="是否主键") private Integer isPrimaryKey; + @Column(name="IS_NULLABLE") + @ApiParam(value = "是否允许为空") + private Integer isNullable; + // 字段长度 @ApiParam(value = "字段长度") @Column(name="OBJECT_COLUMN_PRECISION") diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java index 822b260..9954438 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.form; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.form.bean.*; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -56,6 +57,9 @@ public class ElementModel{ @ApiParam(value = "元素类型") private Integer elementType; + @ApiParam(value = "分页信息") + private Pager pager; + @ApiParam(value = "排序属性") public String orderByParam; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index f18b307..61c8310 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -151,6 +151,9 @@ public class WmsPart extends BaseBean { @ApiParam("库存水平") private String stockLevelStatus; + public int getIqcValue(){ + return this.iqc == null ? 0 : this.iqc.intValue(); + } public WmsPart() { } 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 5812917..f074954 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 @@ -61,4 +61,11 @@ public class WmsTransType extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long tmId; + @Column(name = "PDA_ICON") + @ApiParam(value = "PDA图标") + private String pdaIcon; + + @Transient + @ApiParam("菜单URL") + private String menuUrl; }