diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 2b8979f..4e7cb39 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/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) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 74dfeaf..4dcf88c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/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 */ - @SuppressWarnings("unchecked") private final static void recursionImpl(BaseBean bean, Predicate 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 relaBeans = list(bean, holders[index]); - for (BaseBean relaBean : relaBeans) { - if (recursionContainsImpl(relaBean, target, holders, index + 1)) { - return true; - } - } - - return false; - } }