diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java index 6b5b511..7bcc351 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java @@ -58,6 +58,10 @@ public class ImportField extends BaseAPS { @FieldAnnotation(defaultValue = "255") private Integer maxLength; + @Column(name="ADD_VALUE") + @ApiParam(value = "累加数值", example = "0") + private Boolean addValue; + @Column(name="VALIDATOR") @ApiParam("校验表达式") private String validator; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java index db66293..32fa28f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java @@ -56,12 +56,10 @@ public class OrderFeedback extends BaseAPS { @Column(name="ADD_UNQUALIFIED_COUNT") @ApiParam(value ="累加不良数量") - @FieldAnnotation(display = false) private Double addUnqualifiedCount; @Column(name="ADD_QUALIFIED_COUNT") @ApiParam(value ="累加合格数量") - @FieldAnnotation(display = false) private Double addQualifiedCount; public BaseOrder getOrder() { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 9892f7c..7da5a30 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -73,4 +73,8 @@ public class SysParam extends BaseAPS { @Column(name="MAX_SPACE_LIMIT_DRAG") @ApiParam(value ="间隔时间限制") private Boolean maxSpaceLimitDrag = true; + + @Column(name="DEFAULT_FEEDBACK") + @ApiParam(value ="自动提交前三道") + private Boolean defaultFeedback = true; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index 2d26e1d..de346ba 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -33,7 +33,7 @@ public abstract class BaseAPS extends BaseBean { private HashMap customFields = new HashMap<>(); @ApiParam(value ="主键值") - @FieldAnnotation(display = false, modify = false) + @FieldAnnotation(display = false) @Transient private String key;