From 6a1990a215b14b34712d499670a36ded381d0429 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 31 Oct 2019 11:45:33 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E6=A1=86=E9=80=89=E6=8B=A9=E5=A4=9A=E4=B8=AA=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 7 ++++ .../estsh/i3plus/pojo/aps/bean/ShippingTime.java | 47 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 4 ++ .../estsh/i3plus/pojo/aps/bean/WorkResource.java | 6 +-- .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 2 +- .../estsh/i3plus/pojo/aps/common/DateDuration.java | 4 +- .../estsh/i3plus/pojo/aps/holders/EResource.java | 1 + .../aps/repository/ShippingTimeRepository.java | 9 +++++ .../src/main/resources/relations/Resource.xml | 2 + .../src/main/resources/relations/WorkPlan.xml | 2 - 10 files changed, 76 insertions(+), 8 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ShippingTimeRepository.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 2a95d89..1e4576f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -1,10 +1,13 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseCode; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_CLASS; import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_LOCK_TYPE; import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_TYPE; import cn.estsh.i3plus.pojo.aps.enums.TIME_ROUND_TYPE; +import cn.estsh.i3plus.pojo.aps.holders.EResource; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,6 +15,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :资源 @@ -96,4 +100,7 @@ public class Resource extends BaseCode { @Column(name="LOCK_TIME") @ApiParam(value ="锁定时间长度") private String lockTime; + + @JsonBackReference + public List getWorkPlans() { return BeanRelation.list(this, EResource.WorkPlans); } } 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 new file mode 100644 index 0000000..9e637b2 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :运输时间 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_SHIPPING_TIME") +@Api("运输时间") +public class ShippingTime extends BaseAPS { + @Column(name="PREV_RES_CODE") + @ApiParam(value ="前资源编码") + private String prevResCode; + + @Column(name="POST_RES_CODE") + @ApiParam(value ="后资源编码") + private String postResCode; + + @Column(name="PREV_STAND_CODE") + @ApiParam(value ="前标准工序编码") + private String prevStandCode; + + @Column(name="POST_STAND_CODE") + @ApiParam(value ="后标准工序编码") + private String postStandCode; + + @Column(name="TIME") + @ApiParam(value ="运输时间") + private String time; + + @Column(name="PRIORITY") + @ApiParam(value ="优先级") + private Integer priority; +} 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 db9b0b4..d034238 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.WORK_PLAN_TYPE; @@ -57,6 +58,8 @@ public class WorkPlan extends BaseAPS { @Column(name="PRODUCE_BEGIN") @ApiParam(value ="生产开始时间") @FieldAnnotation(modify = false) + @RippleAnnotation(dependence = {"Work.PrevRelations.PrevWork.WorkPlan.produceBegin", + "PrevPlan.produceBegin"}, method = "calcPositive") private Date produceBegin; @Column(name="PRODUCE_END") @@ -87,6 +90,7 @@ public class WorkPlan extends BaseAPS { @Column(name="LOCK_BEGIN") @ApiParam(value ="锁定开始时间") @FieldAnnotation(modify = false) + @RippleAnnotation(dependence = {"PostRelations.PostWork.WorkPlan.produceBegin"}, method = "calcPositiveLockBegin") private Date lockBegin; @Column(name="LOCK_END") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index f51f6b1..638b6e8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -34,17 +34,17 @@ public class WorkResource extends BaseAPS { @Column(name="PREV_TIME") @ApiParam(value ="前设置时间") @FieldAnnotation(modify = false) - private Long prevTime; + private Integer prevTime; @Column(name="PRODUCE_TIME") @ApiParam(value ="制造时间") @FieldAnnotation(modify = false) - private Long produceTime; + private Integer produceTime; @Column(name="POST_TIME") @ApiParam(value ="后设置时间") @FieldAnnotation(modify = false) - private Long postTime; + private Integer postTime; @Column(name="PRIORITY") @ApiParam(value ="优先级") 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 17cc18a..700a1cf 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 @@ -48,7 +48,7 @@ public class BeanRelation { return result; } for (Enum holder : beanInfo.getAllHolders()) { - result.put(holder, new ArrayList<>()); + result.put(holder, new LinkedList<>()); } return result; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java index 68b2fd5..2760736 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java @@ -139,12 +139,12 @@ public class DateDuration { * @param amount * @return */ - public long getTime(double amount) { + public int getTime(double amount) { if (amount < PRECISION) return getTime(); double result = (amount * this.rate) + this.time; - return (long)Math.ceil(result); + return (int)Math.ceil(result); } /** diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java index 175536d..c72c61e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java @@ -1,4 +1,5 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EResource { + WorkPlans } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ShippingTimeRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ShippingTimeRepository.java new file mode 100644 index 0000000..a4dda7b --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ShippingTimeRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.ShippingTime; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ShippingTimeRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml index 81c9f49..c2123bc 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml @@ -1,3 +1,5 @@ + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml index 7569fa1..c47bdad 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml @@ -1,7 +1,5 @@ - -