From 2c47556abf21fa1cfe7fd93c04dc3816ec917c09 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 1 Nov 2019 16:15:23 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=B5=84=E6=BA=90=E4=BD=8D=E7=BD=AE=E6=8F=92?= =?UTF-8?q?=E5=85=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java index 25967a8..cfffda0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EShippingTime; @@ -33,18 +34,22 @@ public class ShippingTime extends BaseAPS { @Column(name="PREV_RES_CODE") @ApiParam(value ="前资源对象Id") + @FieldAnnotation(property = false) private Long prevResId; @Column(name="POST_RES_CODE") @ApiParam(value ="后资源对象Id") + @FieldAnnotation(property = false) private Long postResId; @Column(name="PREV_STAND_CODE") @ApiParam(value ="前标准工序对象Id") + @FieldAnnotation(property = false) private Long prevStandId; @Column(name="POST_STAND_CODE") @ApiParam(value ="后标准工序对象Id") + @FieldAnnotation(property = false) private Long postStandId; public Resource getPrevRes() {return BeanRelation.get(this, EShippingTime.PrevRes); } 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 d034238..0d114d5 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 @@ -90,7 +90,7 @@ public class WorkPlan extends BaseAPS { @Column(name="LOCK_BEGIN") @ApiParam(value ="锁定开始时间") @FieldAnnotation(modify = false) - @RippleAnnotation(dependence = {"PostRelations.PostWork.WorkPlan.produceBegin"}, method = "calcPositiveLockBegin") + @RippleAnnotation(dependence = {"PostRelations.PostWork.WorkPlan.produceBegin", "produceBegin"}, method = "calcPositiveLock") private Date lockBegin; @Column(name="LOCK_END")