From 8b1ae09885cad64eaffee168a6744fccb1b82289 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 27 Dec 2019 14:01:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/aps/model/GanttEventModel.java | 31 ++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/model/GanttPager.java | 43 ---------------------- 2 files changed, 31 insertions(+), 43 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java new file mode 100644 index 0000000..05bf634 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import cn.estsh.i3plus.pojo.base.common.Pager; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.annotations.Api; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @Description : 甘特图分页查询参数 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-11-22 + * @Modify: + **/ +@Data +@Api("甘特图分页查询参数") +public class GanttEventModel { + private Long[] resourceIds; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date begin; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date end; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java deleted file mode 100644 index 3da5e29..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.model; - -import cn.estsh.i3plus.pojo.base.common.Pager; -import io.swagger.annotations.Api; -import lombok.Data; - -import java.util.List; - -/** - * @Description : 甘特图分页查询参数 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-11-22 - * @Modify: - **/ -@Data -@Api("甘特图分页查询参数") -public class GanttPager extends Pager { - public static class SortData { - // 排序对象 - private String field; - // 排序类型，1为升序，0为降序 - private Boolean ascending; - - public String getField() { - return field; - } - - public void setField(String field) { - this.field = field; - } - - public Boolean getAscending() { - return ascending; - } - - public void setAscending(Boolean ascending) { - this.ascending = ascending; - } - } - private String filter; - private List sorts; -} From d94ccd5ac57e2da962a5251f1b70dbd6e5e8bace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 27 Dec 2019 14:48:07 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E6=89=A3=E5=87=8F?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6BUG?= =?UTF-8?q?=EF=BC=9A=E8=8E=B7=E5=8F=96=E5=8F=8C=E7=B2=BE=E5=BA=A6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=95=B0=E5=80=BC=E6=97=B6=E5=BA=94=E8=AF=A5=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BAgetHandledQtyVal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 23 ++++++++-------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index f1bf9a0..3311b77 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -66,10 +66,6 @@ public class WmsMoveDetails extends BaseBean { @ApiParam(value = "已处理数量", example = "0") public Double handledQty; - public Double getTransQty() { - return this.transQty == null ? 0 : this.transQty.doubleValue(); - } - @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "不合格处理数量", example = "0") public Double rejectQty; @@ -202,17 +198,6 @@ public class WmsMoveDetails extends BaseBean { return isSnapshot == null ? 0 : isSnapshot.intValue(); } - - /* @JSONField(name="fPartNo") - public String getfPartNo() { - return fPartNo; - } - - @JSONField(name="fPartName") - public String getfPartName() { - return fPartName; - }*/ - public WmsMoveDetails() { } @@ -293,4 +278,12 @@ public class WmsMoveDetails extends BaseBean { this.modifyDatetime = modifyDatetime; this.modifyUser = modifyUser; } + + public Double getTransQty() { + return this.transQty == null ? 0 : this.transQty.doubleValue(); + } + public Double getHandledQtyVal() { + return this.handledQty == null ? 0 : this.handledQty.doubleValue(); + } + } From e962a1d22ae75da43ab2a4bdb1e8e2f26e9f5777 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Fri, 27 Dec 2019 15:24:57 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90#1331=20KT-=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE-=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=91=E2=80=9C=E6=A0=87=E5=87=86=E5=8C=85=E8=A3=85=E2=80=9D?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E2=80=9C=E6=A0=87=E5=8C=85=E2=80=9D?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 be7ffe3..370667a 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 @@ -90,7 +90,7 @@ public class WmsPart extends BaseBean { private Double pu2su; @Column(name = "SNP", columnDefinition = "decimal(18,8)") - @ApiParam(value = "标准包装", example = "1") + @ApiParam(value = "标包", example = "1") private Double snp; @ColumnDefault("2") From b175de463566ffa50b11d489a3a967801fb656a7 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Fri, 27 Dec 2019 15:26:23 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90#1335=20=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE-=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E3=80=91"=E9=BB=98=E8=AE=A4=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E7=B1=BB=E5=9E=8B"=E6=94=B9=E4=B8=BA"=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E7=B1=BB=E5=9E=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java index 4b4a129..71eb010 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java @@ -54,7 +54,7 @@ public class WmsPackageSpec extends BaseBean { @Column(name = "POCKET_TYPE") - @ApiParam(value = "默认容器类型") + @ApiParam(value = "容器类型") private String pocketType; @ApiParam(value = "上级规格名称") From 62c50e04cc8f0c5ae1d5c1b5ef0f1dc9f992650c Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 27 Dec 2019 15:48:37 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E5=AE=81=E5=BE=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B8=85=E5=8D=95=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index 27a400a..2be688f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -123,4 +123,13 @@ public class WmsBom extends BaseBean { this.bomNum = bomNum; this.itemQty = itemQty; } + + public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum, Double itemQty,String effStartTime) { + this.itemPartNo = itemPartNo; + this.itemPartNam = itemPartNam; + this.itemUnit = itemUnit; + this.bomNum = bomNum; + this.itemQty = itemQty; + this.effStartTime = effStartTime; + } }