From 23f6f9285b2491547baa2ceda1df0f7164bd4879 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 30 Mar 2021 09:28:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A04=E8=BD=A6=E9=97=B4=E8=A1=A5?= =?UTF-8?q?=E6=BB=A1=E6=A8=A1=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 5 +++ .../cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java | 4 ++ .../i3plus/pojo/aps/bean/HeuristicOptimize.java | 46 ++++++++++++++++++++++ .../estsh/i3plus/pojo/aps/bean/HeuristicRule.java | 5 --- .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 2 +- .../repository/HeuristicOptimizeRepository.java | 9 +++++ 6 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/HeuristicOptimizeRepository.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index 94994de..62943f9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -99,6 +99,11 @@ public class BaseOrder extends BaseAPS { @FieldAnnotation(modify = false) private Integer validOrder = CommonEnumUtil.VALID; + @Column(name="DELAY") + @ApiParam(value ="是否延期") + @FieldAnnotation(modify = false) + private Boolean delay = false; + @JsonBackReference public List getWorks() { return BeanRelation.list(this, EBaseOrder.Works); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java index ed046aa..754c80b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java @@ -37,6 +37,10 @@ public class FurnacePlan extends BaseAPS { @ApiParam(value ="已占用的能力") private Double capacity; + @Column(name="CAPACITY_LIMIT", columnDefinition = "decimal(18,8)") + @ApiParam(value ="容量限制") + private Double capacityLimit; + @JsonBackReference public List getWorkPlans() { return BeanRelation.list(this, EFurnacePlan.WorkPlans); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java new file mode 100644 index 0000000..a8db480 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; + +/** + * @Description : 排程优化规则 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-03-24 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_HEURISTIC_OPTIMIZE") +@Api("排程优化规则") +public class HeuristicOptimize extends BaseRule { + private static final long serialVersionUID = -464821596740369199L; + + @Column(name="WORK_FILTER") + @ApiParam(value ="工作筛选") + private String workFilter; + + @Column(name="RES_FILTER") + @ApiParam(value ="资源筛选") + private String resFilter; + + @Lob + @Column(name="RES_SELECT") + @ApiParam(value ="资源选择") + private String resSelect; + + @Column(name="OPTIMIZE_INTERVAL") + @ApiParam(value ="优化间隔") + private String optimizeInterval; +} 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 37ebda8..6a96b97 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 @@ -53,9 +53,4 @@ 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/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index bf6f33f..d203846 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 @@ -18,7 +18,6 @@ import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.util.Date; -import java.util.List; /** * @Description :工作计划 @@ -110,6 +109,7 @@ public class WorkPlan extends BaseAPS { private Long furnacePlanId; @Transient + @FieldAnnotation(property = false) private boolean hasCominbed = false; public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/HeuristicOptimizeRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/HeuristicOptimizeRepository.java new file mode 100644 index 0000000..fe72851 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/HeuristicOptimizeRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.HeuristicOptimize; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface HeuristicOptimizeRepository extends CrudRepository { +}