From 0af24e4704cb360284d7d1c86fb76bede7ea3e4b Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Fri, 19 Mar 2021 09:47:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=9F=E4=BA=A7=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E4=B8=8B=E5=8F=91=EF=BC=8C=E7=94=9F=E4=BA=A7=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java  |  5 +++++
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java  |  5 +++++
 .../main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 14 ++++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java
index 19b52df..cdd1b76 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java
@@ -49,4 +49,9 @@ public class HeuristicRule extends BaseRule {
     @ApiParam(value ="组炉区间")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String batchPeriod;
+
+    @Column(name="PRD_NO_LIMIT")
+    @ApiParam(value ="组炉商标个数限制")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
+    private Integer prdNoLimit;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
index 619bbf8..afda122 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
@@ -159,6 +159,11 @@ public class Work extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long mainPlanId;
 
+    @Column(name="DYN_SPLIT_WORK_ID")
+    @ApiParam(value ="动态拆分的工作ID")
+    @FieldAnnotation(property = false)
+    private Long dynSplitWorkId;
+
     public BaseOrder getOrder() {
         return BeanRelation.get(this, EWork.Order);
     }
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 07ef339..e9535e3 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
@@ -66,4 +66,18 @@ public abstract class BaseAPS extends BaseBean {
         }
         return null;
     }
+
+    public Boolean getCustomBoolean(String code) {
+        Object value = customFields.get(code);
+        if (value == null) {
+            return null;
+        }
+
+        if (value.getClass() == Boolean.class) {
+            return (Boolean) value;
+        } else if(value.getClass() == Integer.class) {
+            return (Integer)value == 1;
+        }
+        return null;
+    }
 }