From c8ce17363ba67938ab637dddeb6551b5b138df41 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Wed, 10 Nov 2021 20:44:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9B=E8=BD=A6=E9=97=B4=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java      | 4 ++++
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java    | 2 --
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java         | 4 ++++
 .../src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java        | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

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<String, Object> customFields = new HashMap<>();
 
     @ApiParam(value ="主键值")
-    @FieldAnnotation(display = false, modify = false)
+    @FieldAnnotation(display = false)
     @Transient
     private String key;