From 1ac5542541885cf4a1f23c9007d19fa5ef701fdc Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 1 Jul 2019 20:46:00 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/common/Pager.java | 20 ++++++++++++++++++++ .../i3plus/pojo/form/bean/BfDataObjectProperty.java | 4 ++++ .../estsh/i3plus/pojo/model/form/ElementModel.java | 4 ++++ 3 files changed, 28 insertions(+) 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; From 681ca7eebe13f084d4530b0c8bbd8c31f51f1223 Mon Sep 17 00:00:00 2001 From: jiajack Date: Mon, 1 Jul 2019 20:56:49 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=96=E5=80=BC?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 3 +++ 1 file changed, 3 insertions(+) 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() { } From 97b60f090661b7476f1862e8ef048ca39e3a49fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 1 Jul 2019 21:06:33 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E7=BB=93=E7=AE=97HQL?= =?UTF-8?q?=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java | 7 +++++++ 1 file changed, 7 insertions(+) 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; } From 2c28d6303f99c74a441652166f832588da5ad8c2 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Tue, 2 Jul 2019 11:08:14 +0800 Subject: [PATCH 4/6] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 14 ++++++++++++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index a4b9feb..24e000d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -68,4 +68,18 @@ public class WmsLocatePart extends BaseBean { public Integer getIsGeneratePicklist() { return this.isGeneratePicklist == null ? 0 : this.isGeneratePicklist; } + + public double getPullQtyValue(){ + return this.pullQty ==null?0d:this.pullQty.doubleValue(); + } + + public double getMaxValue(){ + return this.max ==null?0:this.max.doubleValue(); + } + + public double getMinValue(){ + return this.min ==null?0:this.min.doubleValue(); + } + + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java index 10a2c6a..59ed0dd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java @@ -40,4 +40,8 @@ public class WmsUnit extends BaseBean { @ApiParam(value = "单位精度") private Integer unitPrecision; + public int getUnitPrecisionValue(){ + return this.unitPrecision == null?0:this.unitPrecision.intValue(); + } + } From e95db40c236110934e7b843560b32e1787a50dec Mon Sep 17 00:00:00 2001 From: "peter.pan" Date: Tue, 2 Jul 2019 17:35:32 +0800 Subject: [PATCH 5/6] 123 --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 9bba3de..cece287 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -2505,7 +2505,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_PART_TYPE { - RAW_MATERIAL(1, "原材料"), PARTIALLY_PREPARED_PRODUCTS(2, "半成品"), FINISHED_PRODUCT(3, "成品"); + RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"); private int value; private String description; From 81ed2465e3c9ca9a13c52d51d54f48691b38c77b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 2 Jul 2019 17:35:45 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=AE=9E=E7=9B=98?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=8C=83=E5=9B=B4=E5=86=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 5427a91..efc024e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -99,8 +99,16 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("源仓库编号") public String srcWhNo; + @Column + @ApiParam("是否范围内") + public Integer isScope; + public WmsCSFactTrans(){} + public Integer getIsScopeVal() { + return isScope== null ? 0 : this.isScope.intValue(); + } + public WmsCSFactTrans(Double factQty, String partNo){ if(factQty == null) { this.factQty = 0d; @@ -109,4 +117,20 @@ public class WmsCSFactTrans extends BaseBean { } this.partNo = partNo; } + + public WmsCSFactTrans(String orderNo, String whNo, String zoneNo, String locateNo,Double factQty, String partNo, String partNameRdd, String sn, Double qty, String unit, String srcLocateNo, String srcZoneNo, String srcWhNo) { + this.orderNo = orderNo; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.factQty = factQty; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.sn = sn; + this.qty = qty; + this.unit = unit; + this.srcLocateNo = srcLocateNo; + this.srcZoneNo = srcZoneNo; + this.srcWhNo = srcWhNo; + } }