diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 9697136..a3166d0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -60,22 +60,6 @@ public class Operation extends BaseAPS { @ApiParam(value ="固定报废数") private Double fixScrapCount; - @Column(name="RATIO") - @ApiParam(value ="分割比例") - private String ratio; - - @Column(name="COUNT") - @ApiParam(value ="分割的工作个数") - private Integer count; - - @Column(name="BATCH", columnDefinition = "decimal(18,8)") - @ApiParam(value ="分割批量") - private Double batch; - - @Column(name="REMAINDER", columnDefinition = "decimal(18,8)") - @ApiParam(value ="分割余数") - private Double remainder; - @Column(name="CONS_TYPE") @ApiParam(value ="接续方式") @FieldAnnotation(defaultValue = "ES") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 37c68b5..6ba4e9e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -47,22 +47,6 @@ public class StandOperation extends BaseAPS { @FieldAnnotation(defaultValue = "POSITIVE") private ApsEnumUtil.DIRECTION direction; - @Column(name="RATIO") - @ApiParam(value ="分割比例") - private String ratio; - - @Column(name="COUNT") - @ApiParam(value ="分割的工作个数") - private Integer count; - - @Column(name="BATCH", columnDefinition = "decimal(18,8)") - @ApiParam(value ="分割批量") - private Double batch; - - @Column(name="REMAINDER", columnDefinition = "decimal(18,8)") - @ApiParam(value ="分割余数") - private Double remainder; - @Column(name="MIN_SPACE_TIME") @ApiParam(value ="最小时间间隔") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index ace9378..c417f45 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -603,34 +603,6 @@ public class ApsEnumUtil { } /** - * 工作分割类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WORK_SPLIT_TYPE { - NONE("NONE", "不分割"), - RATIO("RATIO", "按比例分割"), - COUNT("COUNT", "按数量分割"), - BATCH("BATCH", "按批量分割"), - REMAINDER("REMAINDER", "按余数分割"); - - private final String value; - private final String description; - - WORK_SPLIT_TYPE(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - } - - /** * 工作状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT)