四车间问题修复

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;

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() {

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;
 }

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;