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 99205c2..9c8aff7 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 @@ -9215,7 +9215,9 @@ public class WmsEnumUtil { FIVE_SECONDs("0/5 * * * * ?", "FIVE_SECONDs", "五秒一次"), TWENTY_SECONDS("0/20 * * * * ?", "TWENTY_SECONDS", "二十秒一次"), EVERY_DAY("0 0 0 * * ?", "EVERY_DAY", "每天零点"), - EVERY_HOUR("0 0 * * * ?", "EVERY_HOUR", "每小时"); + EVERY_HOUR("0 0 * * * ?", "EVERY_HOUR", "每小时"), + NINE_AND_NINTEEN("0 0 9,21 * * ?", "NINE_AND_NINTEEN", "早上九点晚上九点"); + private String value; private String code; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java index 697e01e..205dbff 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java @@ -7,8 +7,6 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -16,6 +14,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; @@ -117,9 +117,9 @@ public class SapDocFgSum extends BaseBean { @ApiParam(value = "备注") private String errorMsg; - @Transient - @ApiParam(value = "生产线") - private String lineNo; + @Column(name = "LINE_NO") + @ApiParam("生产线") + public String lineNo; @JsonSerialize(using = ToStringSerializer.class) @Transient @@ -210,4 +210,13 @@ public class SapDocFgSum extends BaseBean { this.isLock = isLock; this.effStartTime = effStartTime; } + + //wdfd.partNo,wdfd.lineNo,sum(wdfd.qty),sum(wdfd.createDatetime) + public SapDocFgSum(String partNo, String lineNo, Double qty, String createDatetime) { + this.partNo = partNo; + this.lineNo = lineNo; + this.qty = qty; + this.createDatetime = createDatetime; + } + }