Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java

@@ -120,16 +120,16 @@ public class WorkPlan extends BaseAPS {
     @ApiParam(value ="打印时间")
     private Date printTime;
 
+    @Column(name="HAS_COMINBED")
+    @ApiParam(value ="是否组炉")
+    private Boolean hasCominbed = false;
+
     @ApiParam(value ="资源生产结束")
     @FieldAnnotation(display = false)
     @Transient
     @RippleAnnotation(dependence = {"PostPlan.resProduceEnd"}, method = "calcReverse")
     private Date resProduceEnd;
 
-    @Transient
-    @FieldAnnotation(property = false)
-    private boolean hasCominbed = false;
-
     public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }
 
     public void setWork(Work work) {

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java

@@ -394,7 +394,6 @@ public class BeanRelation {
      * @param index
      * @param <T>
      */
-    @SuppressWarnings("unchecked")
     private final static <T extends BaseBean> void recursionImpl(BaseBean bean, Predicate<T> fun,
                                                                       Enum<?>[] holders, int index) {
         if (index >= holders.length) {
@@ -411,38 +410,4 @@ public class BeanRelation {
             }
         }
     }
-
-    /**
-     * 判断target是否为bean为起点的以holders路径上的点。
-     * @param bean
-     * @param target
-     * @param holders
-     * @return
-     */
-    public static boolean recursionContains(BaseBean bean, BaseBean target, Enum<?>... holders) {
-        if (holders.length == 0) {
-            return false;
-        }
-
-        return recursionContainsImpl(bean, target, holders, 0);
-    }
-
-    private final static boolean recursionContainsImpl(BaseBean bean, BaseBean target,
-                                                                 Enum<?>[] holders, int index) {
-        if (index >= holders.length) {
-            if (target == bean) {
-                return true;
-            }
-            index = 0;
-        }
-
-        List<BaseBean> relaBeans = list(bean, holders[index]);
-        for (BaseBean relaBean : relaBeans) {
-            if (recursionContainsImpl(relaBean, target, holders, index + 1)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
 }