1:增加资源甘特图获取数据接口

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

@@ -1,6 +1,12 @@
 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.MappedSuperclass;
 
 /**
  * @Description :规则基类
@@ -9,5 +15,11 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@MappedSuperclass
+@Api("规则参数基类")
 public class BaseRule extends BaseAPS {
+    @Column(name="CODE")
+    @ApiParam(value ="规则编码")
+    private String code;
 }

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

@@ -1,9 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE;
 import cn.estsh.i3plus.pojo.aps.enums.ORDER_DEL_LIMIT;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import org.hibernate.annotations.Fetch;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -39,6 +42,7 @@ public class MatCalcRule extends BaseRule {
 
     @Column(name="DEL_LIMIT")
     @ApiParam(value ="删除补充订单限制条件")
+    @FieldAnnotation(defaultValue = "NONE")
     private ORDER_DEL_LIMIT delLimit;
 
     @Column(name="KEEP_RELATION")
@@ -55,6 +59,7 @@ public class MatCalcRule extends BaseRule {
 
     @Column(name="ASSIGN_LIMIT")
     @ApiParam(value ="物料分配制约")
+    @FieldAnnotation(editType = EDIT_TYPE.MULTI_ENUM, defaultValue = "NONE")
     private Integer assignLimit;
 
 }

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

@@ -0,0 +1,50 @@
+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.ERuleDetail;
+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-11-05
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "APS_RULE_DETAIL")
+@Api("规则明细")
+public class RuleDetail extends BaseAPS {
+    @Column(name="RULE_GROUP_ID")
+    @ApiParam(value ="规则组合ID")
+    @FieldAnnotation(property = false)
+    private Long ruleGroupId;
+
+    @Column(name="RULE_ID")
+    @ApiParam(value ="规则配置ID")
+    @FieldAnnotation(property = false)
+    private Long ruleId;
+
+    RuleGroup getRuleGroup() { return BeanRelation.get(this, ERuleDetail.RuleGroup); }
+
+    void setRuleGroup(RuleGroup ruleGroup) {
+        this.ruleGroupId = ruleGroup != null ? ruleGroup.getId() : 0;
+        BeanRelation.set(this, ERuleDetail.RuleGroup, ruleGroup);
+    }
+
+    BaseRule getRule() { return BeanRelation.get(this, ERuleDetail.Rule); }
+
+    void setRule(BaseRule rule) {
+        this.ruleId = rule != null ? rule.getId() : 0;
+        BeanRelation.set(this, ERuleDetail.Rule, rule);
+    }
+}

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

@@ -1,11 +1,17 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.ERuleGroup;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 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;
+import java.util.List;
 
 /**
  * @Description :规则组合
@@ -19,4 +25,14 @@ import javax.persistence.Table;
 @Table(name = "APS_RULE_GROUP")
 @Api("规则组合")
 public class RuleGroup extends BaseAPS {
+    @Column(name="CODE")
+    @ApiParam(value ="编码")
+    private String code;
+
+    @Column(name="ORDER_NUMBER")
+    @ApiParam(value ="序号")
+    private Integer orderNumber;
+
+    @JsonBackReference
+    List<RuleDetail> getDetails() { return BeanRelation.list(this, ERuleGroup.Details); }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseRule.java

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EBaseRule {
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleDetail.java

@@ -0,0 +1,6 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum ERuleDetail {
+    RuleGroup,
+    Rule
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleGroup.java

@@ -0,0 +1,5 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum ERuleGroup {
+    Details
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java

@@ -12,6 +12,7 @@ import java.util.List;
 public class GanttCalendarModel {
     @Data
     public static class Block {
+        private Long resourceId;
         @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private Date beginTime;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/RuleDetailRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.RuleDetail;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface RuleDetailRepository extends CrudRepository<RuleDetail, Long> {
+}

modules/i3plus-pojo-aps/src/main/resources/relations/RuleDetail.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="RuleDetail">
+    <Relation field="Rule" name="BaseRule" type="MULTI_TO_ONE" owner="false">
+    </Relation>
+</Class>

modules/i3plus-pojo-aps/src/main/resources/relations/RuleGroup.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="RuleGroup">
+    <Relation field="Details" name="RuleDetail" reverse="RuleGroup" type="ONE_TO_MULTI" owner="true">
+    </Relation>
+</Class>