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; -} 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; + } } 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(); + } + } 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 = "上级规格名称") 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")