Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-pojo-andon/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java

@@ -333,6 +333,10 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "周发生次数")
     private int weekendsTime;
 
+    @Transient
+    @ApiParam(value = "事件统计报表该事件描述的总次数")
+    private int acCodeTime;
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;
@@ -380,7 +384,9 @@ public class AndonManageQueue extends BaseBean {
      * @param confirmTime
      * @param resetTime
      */
-    public AndonManageQueue(String workCenterCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){
+    public AndonManageQueue(String acCode, String acNameRdd, String workCenterCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){
+        this.acCode = acCode;
+        this.acNameRdd = acNameRdd;
         this.workCenterCode = workCenterCode;
         this.workCenterNameRdd = workCenterNameRdd;
         this.workCellCode = workCellCode;

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

@@ -1,11 +1,15 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import lombok.Data;
 
+import javax.persistence.MappedSuperclass;
 import java.util.HashMap;
 import java.util.Map;
 
-public class BaseAPS extends BaseBean {
+@Data
+@MappedSuperclass
+public abstract class BaseAPS extends BaseBean {
     private transient Map<String, Object> customFields = new HashMap<>();
 
     public Object getCustomField(String code) {

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

@@ -15,7 +15,7 @@ import javax.persistence.MappedSuperclass;
  **/
 @Data
 @MappedSuperclass
-public class BaseCode extends BaseAPS {
+public abstract class BaseCode extends BaseAPS {
     @Column(name="CODE")
     @ApiParam(value ="编码")
     private String code;

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.util.Date;
+
 /**
  * @Description :订单基类
  * @Reference :
@@ -7,5 +14,38 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Api("订单基类")
 public class BaseOrder extends BaseAPS {
+    @Column(name="COUNT")
+    @ApiParam(value ="数量")
+    private Double count;
+
+    @Column(name="PRIORITY")
+    @ApiParam(value ="优先级")
+    private Integer priority;
+
+    @Column(name="最晚结束时刻")
+    @ApiParam(value ="工作筛选")
+    private Date let;
+
+    @Column(name="最早开始时刻计算值")
+    @ApiParam(value ="工作筛选")
+    private Date calcEst;
+
+    @Column(name="CALC_LET")
+    @ApiParam(value ="最晚结束时刻计算值")
+    private Date calcLet;
+
+    @Column(name="PLAN_BEGIN")
+    @ApiParam(value ="计划开始")
+    private Date planBegin;
+
+    @Column(name="PLAN_END")
+    @ApiParam(value ="计划结束")
+    private Date planEnd;
+
+    @Column(name="RECEIVE_DATE")
+    @ApiParam(value ="接单日期")
+    private Date receiveDate;
 }

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

@@ -1,5 +1,13 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+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 :
@@ -7,5 +15,12 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_CANCEL_PLAN_RULE")
+@Api("取消计划规则")
 public class CancelPlanRule extends BaseRule {
+    @Column(name="WORK_FILTERS")
+    @ApiParam(value ="工作筛选")
+    private String workFilters;
 }

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

@@ -0,0 +1,381 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import java.util.AbstractMap;
+import java.util.ArrayList;
+
+public class DateDuration {
+    enum  EV_STRING_TYPE {
+        EVS_GOOD,
+        EVS_HAVE_P,
+    };
+    class EV_STRING implements Cloneable {
+        EV_STRING_TYPE type;
+        String value = "";
+
+        public EV_STRING clone() {
+            EV_STRING o = null;
+            try {
+                o = (EV_STRING)super.clone();
+            } catch (CloneNotSupportedException e) {
+            }
+
+            return o;
+        }
+    };
+
+    public static final double PRECISION = 0.00001;
+    private String value;
+    private int time = 0;
+    private double rate = 0.0;
+    private boolean bValid = false;
+
+    public DateDuration(String value) {
+        setValue(value);
+    }
+
+    public void setValue(String value) {
+        this.value = value == null ? "" : value;
+        this.time = 0;
+        this.rate = 0.0f;
+        parse();
+    }
+
+    /**
+     * 返回原始的时间区间字符串。
+     * @return
+     */
+    public String getValue() {
+        return this.value;
+    }
+
+    /**
+     * 是否为有效时间区间，若用户指定了时间区间，但解析错误，其时间区间为0
+     * @return
+     */
+    public boolean Valid() {
+        return this.bValid;
+    }
+
+    /**
+     * 对于无效的时间区间，返回0。单位为秒。
+     * @return
+     */
+    public int getTime() {
+        return this.time;
+    }
+
+    /**
+     * 设置新的时间区间。
+     * @return
+     */
+    public void setTime(int time) {
+        this.time = time;
+    }
+
+    /**
+     * 对于无效的时间区间，返回0。单位为毫秒。
+     * @return
+     */
+    public long getTimeInMillis() {
+        return this.time * 1000;
+    }
+
+    public String getString() {
+        if (this.rate > PRECISION)
+            return this.getValue();
+
+        if (this.time < 0) {
+            return "";
+        }
+        if (this.time == 0) {
+            return "0S";
+        }
+
+        int iMaxTimeUnit = 4;
+        StringBuffer strExtraString = new StringBuffer();
+        int extraTime = this.time;
+        if (iMaxTimeUnit >= 4) {
+            int i = extraTime / 86400;
+            if (i > 0) {
+                strExtraString.append(i).append("D");
+            }
+            extraTime -= i * 86400;
+        }
+        if (iMaxTimeUnit >= 3) {
+            int i = extraTime / 3600;
+            if (i > 0) {
+                strExtraString.append(i).append("H");
+            }
+            extraTime -= i * 3600;
+        }
+        if (iMaxTimeUnit >= 2) {
+            int i = extraTime / 60;
+            if (i > 0) {
+                strExtraString.append(i).append("M");
+            }
+            extraTime -= i * 60;
+        }
+        if (iMaxTimeUnit >= 1) {
+            if (extraTime > 0) {
+                strExtraString.append(extraTime).append("S");
+            }
+        }
+        return strExtraString.toString();
+    }
+
+    public void Divide(double val) {
+        if (val < PRECISION) {
+            return;
+        }
+        if (this.time >= 0)
+            this.time /= val;
+        this.rate  /=  val;
+        this.value = getString();
+    }
+
+    /**
+     * 对于无效的时间区间，返回0。单位为秒
+     * @param amount
+     * @return
+     */
+    public long getTime(double amount) {
+        if (amount < PRECISION)
+            return getTime();
+
+        double result = (amount * this.rate) + this.time;
+        return (long)Math.ceil(result);
+    }
+
+    /**
+     * 对于无效的时间区间，返回0。单位为毫秒
+     * @param amount
+     * @return
+     */
+    public long getTimeInMillis(double amount) {
+        return this.getTime(amount) * 1000;
+    }
+
+    private void parse() {
+        this.bValid = true;
+        if (this.value.isEmpty() || this.value.equals("-1")) {
+            this.time = 0;
+            this.rate = 0.0f;
+            this.bValid = false;
+            return;
+        }
+
+        if (!ValueValid()) {
+            this.time = 0;
+            this.rate = 0.0f;
+            this.bValid = false;
+            return;
+        }
+
+        ArrayList<EV_STRING> lst = new ArrayList<EV_STRING>();
+        Decompound(lst);
+
+        boolean oFlg = lst.size() == 1;
+
+        for (EV_STRING evs : lst) {
+            if (evs.type == EV_STRING_TYPE.EVS_GOOD)
+            {
+                AbstractMap.SimpleEntry<Boolean, Integer> extraTime = TransTime_Each(evs.value);
+                if (extraTime.getKey() || !oFlg)
+                {
+                    this.time += extraTime.getValue();
+                }
+                else
+                {
+                    this.time += extraTime.getValue() * 1;
+                }
+            }
+            else
+            {
+                AbstractMap.SimpleEntry<Boolean, Double> extraPer = TransRate_Each(evs.value);
+                if (extraPer.getKey())
+                {
+                    this.rate = extraPer.getValue();
+                }
+            }
+        }
+
+        if (this.time < 0)
+        {
+            this.time = 0;
+            this.rate = 0.0f;
+            this.bValid = false;
+        }
+    }
+
+    private boolean ValueValid() {
+        for (char ch : this.value.toCharArray()) {
+            if (ch <= 'z' && ch >= 'a') {
+                ch -= 32;
+            }
+
+            if (!isNumber(ch) && !isUnits(ch)) {
+                return false;
+            }
+        }
+
+        this.value = this.value.toUpperCase();
+        return true;
+    }
+
+    private boolean isNumber(char ch) {
+        return (ch <= '9' && ch >= '0') || (ch == '.');
+    }
+
+    private boolean isUnits(char ch) {
+        return (ch == 'D' || ch == 'H'
+                || ch == 'M' || ch == 'S' || ch == '+'||ch == '-'||ch == 'P');
+    }
+
+    private void Decompound(ArrayList<EV_STRING> lst) {
+        int len = this.value.length();
+        int iStr = 0;
+        EV_STRING evs = new EV_STRING();
+        evs.type = EV_STRING_TYPE.EVS_GOOD;
+        while(iStr < len)
+        {
+            char ch = this.value.charAt(iStr);
+            if (ch == '+')
+            {
+                lst.add(evs.clone());
+                evs.value = "";
+                evs.type = EV_STRING_TYPE.EVS_GOOD;
+                iStr++;
+                continue;
+            }
+            else if (ch == '-')
+            {
+                int iPre = iStr;
+                if (iPre != 0)
+                {
+                    iPre--;
+                    char cp = this.value.charAt(iPre);
+                    if (!(cp == 'D' || cp == 'H'
+                            || cp == 'M' || cp == 'S'))
+                    {
+                        evs.value = evs.value + 'S';
+                    }
+                }
+            }
+            else if (ch == 'P')
+            {
+                int iTempIndex = 0;
+                StringBuffer temp1 = new StringBuffer();
+                StringBuffer temp2 = new StringBuffer();
+                int iTemp = evs.value.length() - 1;
+                for (;iTemp >= 0;iTemp--)
+                {
+                    char cTemp = evs.value.charAt(iTemp);
+                    if (cTemp == 'D' || cTemp == 'H'
+                            || cTemp == 'M' || cTemp == 'S')
+                    {
+                        iTempIndex++;
+                    }
+                    if (iTempIndex >= 2)
+                    {
+                        temp1.insert(0,cTemp);
+                    }
+                    else
+                    {
+                        temp2.insert(0,cTemp);
+                    }
+                }
+                if (!temp1.toString().isEmpty())
+                {
+                    EV_STRING evs1 = new EV_STRING();
+                    evs1.type = EV_STRING_TYPE.EVS_GOOD;
+                    evs1.value = temp1.toString();
+                    lst.add(evs1);
+                }
+                evs.value = temp2.toString();
+                evs.type = EV_STRING_TYPE.EVS_HAVE_P;
+                evs.value = evs.value + ch;
+                iStr++;
+                if (iStr != len)
+                {
+                    char cp = this.value.charAt(iStr);
+                    if (cp == 'D' || cp == 'H'
+                            || cp == 'M' || cp == 'S')
+                    {
+                        evs.value = evs.value + cp;
+                        iStr++;
+                    }
+                }
+
+                lst.add(evs.clone());
+                evs.value = "";
+                evs.type = EV_STRING_TYPE.EVS_GOOD;
+                continue;
+            }
+            evs.value = evs.value + ch;
+            iStr++;
+        }
+        if (!evs.value.isEmpty())
+        {
+            lst.add(evs);
+        }
+    }
+
+    private AbstractMap.SimpleEntry<Boolean, Integer> TransTime_Each(String extraValue) {
+        if (extraValue.isEmpty())
+            return new AbstractMap.SimpleEntry<Boolean, Integer>(false, 0);
+
+        int extraTime = 0;
+        StringBuffer temp = new StringBuffer();
+        boolean flg = false;
+        for (int i = 0; i < extraValue.length(); i++) {
+            char ch = extraValue.charAt(i);
+            int rate = TimeUnit(ch);
+            if (rate > 0)
+            {
+                double iC = Double.parseDouble(temp.toString());
+                extraTime += (int)(iC*rate);
+                temp.setLength(0);
+                flg = true;
+            }
+            else
+            {
+                temp.append(ch);
+            }
+        }
+        if (!temp.toString().isEmpty())
+            extraTime += Double.parseDouble(temp.toString());
+        return new AbstractMap.SimpleEntry<Boolean, Integer>(flg, extraTime);
+    }
+    private AbstractMap.SimpleEntry<Boolean, Double> TransRate_Each(String extraValue) {
+        if (extraValue.isEmpty())
+            return new AbstractMap.SimpleEntry<Boolean, Double>(false, 0.0);
+
+        double extraPer = 0.0;
+        StringBuffer temp = new StringBuffer();
+        boolean flg = false;
+        for (int i = 0; i < extraValue.length(); i++) {
+            char ch = extraValue.charAt(i);
+            switch(ch)
+            {
+                case 'D': extraPer = flg ?  (1 / Double.parseDouble(temp.toString())) * 86400  : Double.parseDouble(temp.toString()) * 86400; return new AbstractMap.SimpleEntry<Boolean, Double>(true, extraPer);
+                case 'H': extraPer = flg ?  (1 / Double.parseDouble(temp.toString())) * 3600: Double.parseDouble(temp.toString()) * 3600; return new AbstractMap.SimpleEntry<Boolean, Double>(true, extraPer);
+                case 'M': extraPer = flg ?  (1 / Double.parseDouble(temp.toString())) * 60 : Double.parseDouble(temp.toString()) * 60; return new AbstractMap.SimpleEntry<Boolean, Double>(true, extraPer);
+                case 'S': extraPer = flg ?  (1 / Double.parseDouble(temp.toString())) * 1 : Double.parseDouble(temp.toString()) * 1; return new AbstractMap.SimpleEntry<Boolean, Double>(true, extraPer);
+                case 'P': flg = true;break;
+                default  : temp.append(ch);
+            }
+        }
+        return new AbstractMap.SimpleEntry<Boolean, Double>(true, extraPer);
+    }
+
+    private int TimeUnit(char ch) {
+        switch(ch)
+        {
+            case 'D': return 86400;
+            case 'H': return 3600;
+            case 'M': return 60;
+            case 'S': return 1;
+        }
+        return 0;
+    }
+}

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

@@ -1,5 +1,13 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+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 :
@@ -7,5 +15,16 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_DAY_SHIFT")
+@Api("班次")
 public class DayShift extends BaseAPS {
+    @Column(name="CODE")
+    @ApiParam(value ="编码")
+    private String code;
+
+    @Column(name="WORK_TIMES")
+    @ApiParam(value ="工作时间")
+    private String workTimes;
 }

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

@@ -1,5 +1,13 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+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 :
@@ -7,5 +15,24 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_FIELD_SET_RULE")
+@Api("属性赋值规则")
 public class FieldSetRule extends BaseRule {
+    @Column(name="BEAN_NAME")
+    @ApiParam(value ="实体名")
+    private String beanName;
+
+    @Column(name="FILTER")
+    @ApiParam(value ="筛选")
+    private String filter;
+
+    @Column(name="FIELD_NAME")
+    @ApiParam(value ="字段名")
+    private String fieldName;
+
+    @Column(name="VALUE")
+    @ApiParam(value ="值")
+    private String value;
 }

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

@@ -1,5 +1,13 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+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 :
@@ -7,5 +15,28 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_HEURISTIC_RULE")
+@Api("排程运算规则")
 public class HeuristicRule extends BaseRule {
+    @Column(name="WORK_FILTER")
+    @ApiParam(value ="工作筛选")
+    private String workFilter;
+
+    @Column(name="WORK_SORT")
+    @ApiParam(value ="工作排序")
+    private String workSort;
+
+    @Column(name="RES_SELECT")
+    @ApiParam(value ="资源选择")
+    private String resSelect;
+
+    @Column(name="INSERT_IDLE")
+    @ApiParam(value ="是否插入空闲")
+    private Boolean insertIdle;
+
+    @Column(name="BATCH_PERIOD")
+    @ApiParam(value ="组炉区间")
+    private String batchPeriod;
 }

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

@@ -1,5 +1,13 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+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 :
@@ -7,5 +15,25 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_INVENTORY")
+@Api("库存")
 public class Inventory extends BaseOrder {
+    @Column(name="SPECIFY_TOP_ORDER")
+    @ApiParam(value ="指定顶层订单")
+    private String specifyTopOrder;
+
+    @Column(name="SPECIFY_UP_ORDER")
+    @ApiParam(value ="指定上层订单")
+    private String specifyUpOrder;
+
+    @Column(name="ASSIGN_COUNT")
+    @ApiParam(value ="已分配量")
+    private Double assignCount;
+
+    @Column(name="EXCESS_COUNT")
+    @ApiParam(value ="多余量")
+    private Double excessCount;
+
 }

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

@@ -1,5 +1,14 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.enums.ORDER_DEL_LIMIT;
+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 :
@@ -7,5 +16,41 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_MAT_CALC_RULE")
+@Api("物料运算规则")
 public class MatCalcRule extends BaseRule {
+    @Column(name="MATERIAL_FILTER")
+    @ApiParam(value ="物料筛选")
+    private String materialFilter;
+
+    @Column(name="INPUT_FILTER")
+    @ApiParam(value ="输入筛选")
+    private String inputFilter;
+
+    @Column(name="OUTPUT_FILTER")
+    @ApiParam(value ="输出筛选")
+    private String outputFilter;
+
+    @Column(name="DEL_AUTO")
+    @ApiParam(value ="自动删除补充订单")
+    private Boolean delAuto;
+
+    @Column(name="DEL_LIMIT")
+    @ApiParam(value ="删除补充订单限制条件")
+    private ORDER_DEL_LIMIT delLimit;
+
+    @Column(name="KEEP_RELATION")
+    @ApiParam(value ="保持关联")
+    private Boolean keepRelation;
+
+    @Column(name="AUTO_SUPPLY")
+    @ApiParam(value ="自动补充")
+    private Boolean autoSupply;
+
+    @Column(name="BATCH_SUPPLY")
+    @ApiParam(value ="批量补充")
+    private Boolean batchSupply;
+
 }

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

@@ -3,11 +3,12 @@ package cn.estsh.i3plus.pojo.aps.bean;
 import cn.estsh.i3plus.pojo.aps.enums.MATERIAL_TYPE;
 import cn.estsh.i3plus.pojo.aps.enums.PREPARE_TYPE;
 import cn.estsh.i3plus.pojo.aps.enums.REPLENISHMENT_TYPE;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import javax.persistence.Column;
-import javax.persistence.MappedSuperclass;
+import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
@@ -18,8 +19,9 @@ import javax.persistence.Table;
  * @Modify:
  **/
 @Data
-@MappedSuperclass
+@Entity
-@Table(name = "MATERIAL")
+@Table(name = "APS_MATERIAL")
+@Api("物料")
 public class Material extends BaseCode {
     @Column(name="TYPE")
     @ApiParam(value ="类型")

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

@@ -1,5 +1,14 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
+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 :
@@ -7,5 +16,32 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_OPER_INPUT")
+@Api("工序输入")
 public class OperInput extends BaseAPS {
+    @Column(name="INPUT_COUNT")
+    @ApiParam(value ="输入数量")
+    private Double inputCount;
+
+    @Column(name="YIELD")
+    @ApiParam(value ="成品率")
+    private Double yield;
+
+    @Column(name="FIX_SCRAP_COUNT")
+    @ApiParam(value ="固定报废数")
+    private Double fixScrapCount;
+
+    @Column(name="CONS_TYPE")
+    @ApiParam(value ="接续方式")
+    private CONSTRAINT_TYPE consType;
+
+    @Column(name="MAX_SPACE_TIME")
+    @ApiParam(value ="最大时间间隔")
+    private String maxSpaceTime;
+
+    @Column(name="MIN_SPACE_TIME")
+    @ApiParam(value ="最小时间间隔")
+    private String minSpaceTime;
 }

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

@@ -1,5 +1,13 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+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 :
@@ -7,5 +15,20 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_OPER_OUTPUT")
+@Api("工序输出")
 public class OperOutput extends BaseAPS {
+    @Column(name="output_Count")
+    @ApiParam(value ="输出数量")
+    private Double outputCount;
+
+    @Column(name="yield")
+    @ApiParam(value ="成品率")
+    private Double yield;
+
+    @Column(name="fix_Scrap_Count")
+    @ApiParam(value ="固定报废数")
+    private Double fixScrapCount;
 }

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

@@ -1,5 +1,14 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
+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 :
@@ -7,5 +16,40 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_OPER_RESOURCE")
+@Api("工序资源")
 public class OperResource extends BaseAPS {
+    @Column(name="USE_TYPE")
+    @ApiParam(value ="使用类型")
+    private USE_TYPE useType;
+
+    @Column(name="PREV_TIME")
+    @ApiParam(value ="前设置时间")
+    private String prevTime;
+
+    @Column(name="MANUF_TIME")
+    @ApiParam(value ="生产时间")
+    private String manufTime;
+
+    @Column(name="POST_TIME")
+    @ApiParam(value ="后设置时间")
+    private String postTime;
+
+    @Column(name="MAX_PREV_SD_TIME")
+    @ApiParam(value ="最大前设置中断时间")
+    private String maxPrevSdTime;
+
+    @Column(name="MAX_MANUF_SD_TIME")
+    @ApiParam(value ="最大生产中断时间")
+    private String maxManufSdTime;
+
+    @Column(name="MAX_POST_SD_TIME")
+    @ApiParam(value ="最大后设置中断时间")
+    private String maxPostSdTime;
+
+    @Column(name="PRIORITY")
+    @ApiParam(value ="优先级")
+    private Integer priority;
 }

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

@@ -1,5 +1,15 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
+import cn.estsh.i3plus.pojo.aps.enums.TAIL_DEAL;
+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 :
@@ -7,5 +17,57 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_OPERATION")
+@Api("工序")
 public class Operation extends BaseAPS {
+
+    @Column(name="NUMBER")
+    @ApiParam(value ="工序号")
+    private Integer number;
+
+    @Column(name="PREV_COUNT_RATE")
+    @ApiParam(value ="前工序数量比")
+    private Double prevCountRate;
+
+    @Column(name="YIELD")
+    @ApiParam(value ="成品率")
+    private Double yield;
+
+    @Column(name="FIX_SCRAP_COUNT")
+    @ApiParam(value ="固定报废数")
+    private Double fixScrapCount;
+
+    @Column(name="RATIO")
+    @ApiParam(value ="分割比例")
+    private String ratio;
+
+    @Column(name="COUNT")
+    @ApiParam(value ="分割数量")
+    private Double count;
+
+    @Column(name="BATCH")
+    @ApiParam(value ="分割批量")
+    private Double batch;
+
+    @Column(name="MIN_BATCH")
+    @ApiParam(value ="最小批量")
+    private Double minBatch;
+
+    @Column(name="TAIL_DEAL")
+    @ApiParam(value ="尾数处理")
+    private TAIL_DEAL tailDeal;
+
+    @Column(name="CONS_TYPE")
+    @ApiParam(value ="接续方式")
+    private CONSTRAINT_TYPE consType;
+
+    @Column(name="MAX_SPACE_TIME")
+    @ApiParam(value ="最大时间间隔")
+    private String maxSpaceTime;
+
+    @Column(name="MIN_SPACE_TIME")
+    @ApiParam(value ="最小时间间隔")
+    private String minSpaceTime;
 }

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

@@ -1,5 +1,15 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.enums.CALENDAR_TYPE;
+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.Date;
+
 /**
  * @Description :加班日历
  * @Reference :
@@ -7,5 +17,24 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_OVERTIME_CALENDAR")
+@Api("加班日历")
 public class OvertimeCalendar extends BaseAPS {
+    @Column(name="RES_CODES")
+    @ApiParam(value ="资源代码")
+    private String resCodes;
+
+    @Column(name="START")
+    @ApiParam(value ="开始时间")
+    private Date start;
+
+    @Column(name="END")
+    @ApiParam(value ="结束时间")
+    private Date end;
+
+    @Column(name="TYPE")
+    @ApiParam(value ="类型")
+    private CALENDAR_TYPE type;
 }

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

@@ -1,5 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
 /**
  * @Description :计划反馈
  * @Reference :
@@ -7,5 +13,9 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_PLAN_FEEDBACK")
+@Api("物料")
 public class PlanFeedback extends BaseAPS {
 }

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

@@ -1,5 +1,14 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+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.Date;
+
 /**
  * @Description :生产订单
  * @Reference :
@@ -7,5 +16,68 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_PRODUCT_ORDER")
+@Api("生产订单")
 public class ProductOrder extends BaseOrder {
+    @Column(name="EST")
+    @ApiParam(value ="最早开始时间")
+    private Date est;
+
+    @Column(name="SPECIFY_EST")
+    @ApiParam(value ="指定最早开始时间")
+    private Date specifyEst;
+
+    @Column(name="SPECIFY_LET")
+    @ApiParam(value ="指定最晚结束时间")
+    private Date specifyLet;
+
+    @Column(name="LOW_EST")
+    @ApiParam(value ="低阶最早开始时间")
+    private Date lowEst;
+
+    @Column(name="SPECIFY_LOW_EST")
+    @ApiParam(value ="指定低阶最早开始时间")
+    private Date specifyLowEst;
+
+    @Column(name="SPECIFY_ROUTING")
+    @ApiParam(value ="指定工艺路线")
+    private String specifyRouting;
+
+    @Column(name="RESYNCHRONIZE")
+    @ApiParam(value ="是否同步")
+    private Boolean resynchronize;
+
+    @Column(name="RECALC_COUNT")
+    @ApiParam(value ="是否重新计算数量")
+    private Boolean recalcCount;
+
+    @Column(name="SPECIFY_TOP_ORDER")
+    @ApiParam(value ="指定顶层订单")
+    private String specifyTopOrder;
+
+    @Column(name="SPECIFY_UP_ORDER")
+    @ApiParam(value ="指定上层订单")
+    private String specifyUpOrder;
+
+    @Column(name="ASSIGN_COUNT")
+    @ApiParam(value ="已分配数量")
+    private Double assignCount;
+
+    @Column(name="SPECIFY_LEAD_TIME")
+    @ApiParam(value ="指定提前期")
+    private String specifyLeadTime;
+
+    @Column(name="CALC_LEAD_TIME")
+    @ApiParam(value ="提前期计算值")
+    private String calcLeadTime;
+
+    @Column(name="EXCESS_COUNT")
+    @ApiParam(value ="多余量")
+    private Double excessCount;
+
+    @Column(name="LACK_COUNT")
+    @ApiParam(value ="缺少量")
+    private Double lackCount;
 }

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

@@ -1,5 +1,14 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+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.Date;
+
 /**
  * @Description :工艺路线
  * @Reference :
@@ -7,5 +16,20 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_PRODUCTROUTING")
+@Api("物料")
 public class ProductRouting extends BaseCode {
+    @Column(name="VALID_START")
+    @ApiParam(value ="有效开始时间")
+    private Date validStart;
+
+    @Column(name="VALID_END")
+    @ApiParam(value ="有效结束时间")
+    private Date validEnd;
+
+    @Column(name="PRIORITY")
+    @ApiParam(value ="优先级")
+    private Integer priority;
 }

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

@@ -1,5 +1,13 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+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 :
@@ -7,5 +15,32 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_PURCHASE_ORDER")
+@Api("工艺路线")
 public class PurchaseOrder extends BaseOrder {
+    @Column(name="SPECIFY_TOP_ORDER")
+    @ApiParam(value ="指定顶层订单")
+    private String specifyTopOrder;
+
+    @Column(name="SPECIFY_UP_ORDER")
+    @ApiParam(value ="指定上层订单")
+    private String specifyUpOrder;
+
+    @Column(name="ASSIGN_COUNT")
+    @ApiParam(value ="已分配数量")
+    private Double assignCount;
+
+    @Column(name="SPECIFY_LEAD_TIME")
+    @ApiParam(value ="指定提前期")
+    private String specifyLeadTime;
+
+    @Column(name="CALC_LEAD_TIME")
+    @ApiParam(value ="提前期计算值")
+    private String calcLeadTime;
+
+    @Column(name="EXCESS_COUNT")
+    @ApiParam(value ="多余量")
+    private Double excessCount;
 }

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

@@ -1,5 +1,13 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+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 :
@@ -7,5 +15,28 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_RES_CALENDAR")
+@Api("日历")
 public class ResCalendar extends BaseAPS {
+    @Column(name="RES_CODES")
+    @ApiParam(value ="资源代码")
+    private String resCodes;
+
+    @Column(name="WEEKS")
+    @ApiParam(value ="星期")
+    private Integer weeks;
+
+    @Column(name="DATES")
+    @ApiParam(value ="时间")
+    private String dates;
+
+    @Column(name="SHIFT_CODES")
+    @ApiParam(value ="班次代码")
+    private String shiftCodes;
+
+    @Column(name="PRIORITY")
+    @ApiParam(value ="优先级")
+    private Integer priority;
 }

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

@@ -1,5 +1,16 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_CLASS;
+import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_TYPE;
+import cn.estsh.i3plus.pojo.aps.enums.TIME_ROUND_TYPE;
+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 :
@@ -7,5 +18,73 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_RESOURCE")
+@Api("资源")
 public class Resource extends BaseCode {
+    @Column(name="BOTTLENECK")
+    @ApiParam(value ="是否瓶颈资源")
+    private Boolean bottleneck;
+
+    @Column(name="TYPE")
+    @ApiParam(value ="资源类型")
+    private RESOURCE_TYPE type;
+
+    @Column(name="RES_CLASS")
+    @ApiParam(value ="资源区分")
+    private RESOURCE_CLASS resClass;
+
+    @Column(name="EFFICIENCY")
+    @ApiParam(value ="生产效率")
+    private Double efficiency;
+
+    @Column(name="PREV_BUFFER")
+    @ApiParam(value ="前缓冲时间")
+    private String prevBuffer;
+
+    @Column(name="POST_BUFFER")
+    @ApiParam(value ="后缓冲时间")
+    private String postBuffer;
+
+    @Column(name="MAX_MANUF_BATCH")
+    @ApiParam(value ="最大生产批量")
+    private Double maxManufBatch;
+
+    @Column(name="MANUF_ADJ_UNIT_TM")
+    @ApiParam(value ="生产时间尾数调整")
+    private String manufAdjUnitTm;
+
+    @Column(name="MANUF_ADJ_UNIT")
+    @ApiParam(value ="生产时刻尾数调整")
+    private String manufAdjUnit;
+
+    @Column(name="MAX_PREV_SD_TIME")
+    @ApiParam(value ="最大前设置中断时间")
+    private String maxPrevSdTime;
+
+    @Column(name="MAX_MANUF_SD_TIME")
+    @ApiParam(value ="最大生产中断时间")
+    private String maxManufSdTime;
+
+    @Column(name="MAX_POST_SD_TIME")
+    @ApiParam(value ="最大后设置中断时间")
+    private String maxPostSdTime;
+
+    @Column(name="ROUND_TYPE")
+    @ApiParam(value ="时间圆整类型")
+    private TIME_ROUND_TYPE roundType;
+
+    @Column(name="MANUF_EFFECT")
+    @ApiParam(value ="生产效率影响")
+    private Integer manufEffect;
+
+    @Column(name="TIME_ROUND")
+    @ApiParam(value ="时间圆整影响")
+    private Integer timeRound;
+
+    @Column(name="TIME_TAIL_ROUND")
+    @ApiParam(value ="时间尾数影响")
+    private Integer timeTailRound;
+
 }

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

@@ -1,5 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
 /**
  * @Description :规则组合
  * @Reference :
@@ -7,5 +13,9 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_RULE_GROUP")
+@Api("规则组合")
 public class RuleGroup extends BaseAPS {
 }

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

@@ -1,5 +1,14 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+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.Date;
+
 /**
  * @Description :销售订单
  * @Reference :
@@ -7,5 +16,28 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_SALES_ORDER")
+@Api("销售订单")
 public class SalesOrder extends BaseOrder {
+    @Column(name="LOW_EST")
+    @ApiParam(value ="低阶最早开始时间")
+    private Date lowEst;
+
+    @Column(name="SPECIFY_LOW_EST")
+    @ApiParam(value ="指定低价最早开始时间")
+    private Date specifyLowEst;
+
+    @Column(name="SPECIFY_LET")
+    @ApiParam(value ="指定最晚结束时间")
+    private Date specifyLet;
+
+    @Column(name="SPECIFY_LEAD_TIME")
+    @ApiParam(value ="指定提前期")
+    private String specifyLeadTime;
+
+    @Column(name="CALC_LEAD_TIME")
+    @ApiParam(value ="提前期计算值")
+    private String calcLeadTime;
 }

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

@@ -1,5 +1,17 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.enums.DIRECTION;
+import cn.estsh.i3plus.pojo.aps.enums.RES_COMB_LOCK_TYPE;
+import cn.estsh.i3plus.pojo.aps.enums.RES_COMB_TIME_TYPE;
+import cn.estsh.i3plus.pojo.aps.enums.TAIL_DEAL;
+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 :
@@ -7,5 +19,40 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_STAND_OPERATION")
+@Api("标准工序")
 public class StandOperation extends BaseCode {
+    @Column(name="RATIO")
+    @ApiParam(value ="分割比例")
+    private String ratio;
+
+    @Column(name="COUNT")
+    @ApiParam(value ="分割数量")
+    private Double count;
+
+    @Column(name="BATCH")
+    @ApiParam(value ="分割批量")
+    private Double batch;
+
+    @Column(name="MIN_BATCH")
+    @ApiParam(value ="最小批量")
+    private Double minBatch;
+
+    @Column(name="TAIL_DEAL")
+    @ApiParam(value ="尾数处理方式")
+    private TAIL_DEAL tailDeal;
+
+    @Column(name="DIRECTION")
+    @ApiParam(value ="排程方向")
+    private DIRECTION direction;
+
+    @Column(name="COMB_TYPE")
+    @ApiParam(value ="生产组合方式")
+    private RES_COMB_TIME_TYPE combType;
+
+    @Column(name="LOCK_TYPE")
+    @ApiParam(value ="锁定组合方式")
+    private RES_COMB_LOCK_TYPE lockType;
 }

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

@@ -1,5 +1,14 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+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.Date;
+
 /**
  * @Description :系统参数
  * @Reference :
@@ -7,5 +16,16 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_SYS_PARAM")
+@Api("系统参数")
 public class SysParam extends BaseAPS {
+    @Column(name="BASE_TIME")
+    @ApiParam(value ="基准时间")
+    private Date baseTime;
+
+    @Column(name="max_Interrupt_Count")
+    @ApiParam(value ="最大中断次数")
+    private Integer maxInterruptCount;
 }

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

@@ -1,5 +1,16 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.enums.WORK_STATUS;
+import cn.estsh.i3plus.pojo.aps.enums.WORK_TYPE;
+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.Date;
+
 /**
  * @Description :工作
  * @Reference :
@@ -7,5 +18,76 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_WORK")
+@Api("工作")
 public class Work extends BaseCode {
+    @Column(name="WORK_TYPE")
+    @ApiParam(value ="工作类型")
+    private WORK_TYPE workType;
+
+    @Column(name="count")
+    @ApiParam(value ="数量")
+    private Double count;
+
+    @Column(name="SPECIFY_COUNT")
+    @ApiParam(value ="指定数量")
+    private Double specifyCount;
+
+    @Column(name="SPECIFY_RESOURCE")
+    @ApiParam(value ="指定资源")
+    private String specifyResource;
+
+    @Column(name="SPECIFY_MANUF_TIME")
+    @ApiParam(value ="指定制造时间")
+    private String specifyManufTime;
+
+    @Column(name="SPECIFY_PREV_TIME")
+    @ApiParam(value ="指定前设置时间")
+    private String specifyPrevTime;
+
+    @Column(name="SPECIFY_POST_TIME")
+    @ApiParam(value ="指定后设置时间")
+    private String specifyPostTime;
+
+    @Column(name="SPECIFY_EST")
+    @ApiParam(value ="指定最早开始时间")
+    private Date specifyEst;
+
+    @Column(name="SPECIFY_LET")
+    @ApiParam(value ="指定最晚结束时间")
+    private Date specifyLet;
+
+    @Column(name="SPECIFY_BEGIN")
+    @ApiParam(value ="指定开始时间")
+    private Date specifyBegin;
+
+    @Column(name="SPECIFY_END")
+    @ApiParam(value ="指定结束时间")
+    private Date specifyEnd;
+
+    @Column(name="CALC_EST")
+    @ApiParam(value ="最早开始时间计算值")
+    private Date calcEst;
+
+    @Column(name="CALC_LET")
+    @ApiParam(value ="最晚结束时间计算值")
+    private Date calcLet;
+
+    @Column(name="WORK_STATUS")
+    @ApiParam(value ="工作状态")
+    private WORK_STATUS workStatus;
+
+    @Column(name="PLAN_BEGIN")
+    @ApiParam(value ="计划开始时间")
+    private Date planBegin;
+
+    @Column(name="PLAN_END")
+    @ApiParam(value ="计划结束时间")
+    private Date planEnd;
+
+    @Column(name="PLAN_RESOURCE")
+    @ApiParam(value ="计划主资源")
+    private String planResource;
 }

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

@@ -1,5 +1,14 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+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.Date;
+
 /**
  * @Description :工作输入
  * @Reference :
@@ -7,5 +16,20 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_WORK_INPUT")
+@Api("工作输入")
 public class WorkInput extends BaseAPS {
+    @Column(name="INPUT_TIME")
+    @ApiParam(value ="输入时间")
+    private Date inputTime;
+
+    @Column(name="INPUT_COUNT")
+    @ApiParam(value ="输入数量")
+    private Double inputCount;
+
+    @Column(name="SHORT_COUNT")
+    @ApiParam(value ="短缺数量")
+    private Double shortCount;
 }

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

@@ -1,5 +1,14 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+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.Date;
+
 /**
  * @Description :工作输出
  * @Reference :
@@ -7,5 +16,20 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_WORK_OUTPUT")
+@Api("工作输出")
 public class WorkOutput extends BaseAPS {
+    @Column(name="OUTPUT_TIME")
+    @ApiParam(value ="输出时间")
+    private Date outputTime;
+
+    @Column(name="OUTPUT_COUNT")
+    @ApiParam(value ="输出数量")
+    private Double outputCount;
+
+    @Column(name="REMAIN_COUNT")
+    @ApiParam(value ="多余数量")
+    private Double remainCount;
 }

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

@@ -1,5 +1,15 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
+import cn.estsh.i3plus.pojo.aps.enums.WORK_RELATION_TYPE;
+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 :
@@ -7,5 +17,36 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_Work_Relation")
+@Api("工作关联")
 public class WorkRelation extends BaseAPS {
+    @Column(name="TYPE")
+    @ApiParam(value ="关联类型")
+    private WORK_RELATION_TYPE type;
+
+    @Column(name="CONS_TYPE")
+    @ApiParam(value ="接续方式")
+    private CONSTRAINT_TYPE consType;
+
+    @Column(name="MAX_SPACE_TIME")
+    @ApiParam(value ="最大间隔时间")
+    private String maxSpaceTime;
+
+    @Column(name="MIN_SPACE_TIME")
+    @ApiParam(value ="最小间隔时间")
+    private String minSpaceTime;
+
+    @Column(name="COUNT")
+    @ApiParam(value ="关联数量")
+    private Double count;
+
+    @Column(name="FIX_RELATION")
+    @ApiParam(value ="是否固定关联")
+    private Boolean fixRelation;
+
+    @Column(name="FIX_COUNT")
+    @ApiParam(value ="是否固定数量")
+    private Boolean fixCount;
 }

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

@@ -1,5 +1,14 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
+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 :
@@ -7,5 +16,40 @@ package cn.estsh.i3plus.pojo.aps.bean;
  * @CreateDate : 2019-09-17
  * @Modify:
  **/
+@Data
+@Entity
+@Table(name = "APS_WORK_RESOURCE")
+@Api("工作资源")
 public class WorkResource extends BaseAPS {
+    @Column(name="USE_TYPE")
+    @ApiParam(value ="使用类型")
+    private USE_TYPE useType;
+
+    @Column(name="PREV_TIME")
+    @ApiParam(value ="前设置时间")
+    private Long prevTime;
+
+    @Column(name="MANUF_TIME")
+    @ApiParam(value ="制造时间")
+    private Long manufTime;
+
+    @Column(name="POST_TIME")
+    @ApiParam(value ="后设置时间")
+    private Long postTime;
+
+    @Column(name="PRIORITY")
+    @ApiParam(value ="优先级")
+    private Integer priority;
+
+    @Column(name="MAX_PREV_SD_TIME")
+    @ApiParam(value ="最大前设置中断时间")
+    private String maxPrevSdTime;
+
+    @Column(name="MAX_MANUF_SD_TIME")
+    @ApiParam(value ="最大制造中断时间")
+    private String maxManufSdTime;
+
+    @Column(name="MAX_POST_SD_TIME")
+    @ApiParam(value ="最大后设置中断时间")
+    private String maxPostSdTime;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_TYPE.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+/**
+ * @Description :日历类型
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+public enum CALENDAR_TYPE {
+    ENABLE,     // 启用
+    DISABLE     // 停用
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CONSTRAINT_TYPE.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+/**
+ * @Description :接续方式
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+public enum CONSTRAINT_TYPE {
+    ES,     // 前工作开始，后工作结束
+    SS,     // 前工作开始，后工作开始
+    EE,     // 前工作结束，后工作结束
+    SSEE    // 前后工作同时开始或同时结束
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DIRECTION.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+/**
+ * @Description :排程方向
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+public enum DIRECTION {
+    POSITIVE,   // 正向
+    REVERSE     // 逆向
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/FIELD_TYPE.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.enums;
 
+/**
+ * @Description :字段类型
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public enum FIELD_TYPE {
     NONE,
     BOOLEAN,    // 布尔
@@ -10,10 +17,10 @@ public enum FIELD_TYPE {
     DOUBLE,     // 浮点型
     DATE,       // 日期类型(2019-09-16)
     TIME,       // 时间类型(17:35:30)
-    DATETIME,   // 日期时间类型(2019-09-16 17:35:30)
+    DATE_TIME,   // 日期时间类型(2019-09-16 17:35:30)
     DURATION,   // 时间段(1H)
     ENUM,       // 枚举
-    MULTIENUM,  // 多选枚举
+    MULTI_ENUM,  // 多选枚举
     STRING,     // 字符串
     OBJECT,     // 关联对象，下来选择关联对象的Code值
     LIST        // 对象集合，不可编辑。

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java

@@ -1,7 +1,14 @@
 package cn.estsh.i3plus.pojo.aps.enums;
 
+/**
+ * @Description :物料类型
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public enum MATERIAL_TYPE {
-    PRODUCT,
+    PRODUCT,        // 成品
-    HALF_PRODUCT,
+    HALF_PRODUCT,   // 半成品
-    RAW_MATERIAL
+    RAW_MATERIAL    // 原材料
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ORDER_DEL_LIMIT.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+/**
+ * @Description :订单删除限制
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+public enum ORDER_DEL_LIMIT {
+    NONE,
+    NO_PO,
+    NO_PLAN,
+    NO_POR,
+    NO_PPRS
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PREPARE_TYPE.java

@@ -1,7 +1,14 @@
 package cn.estsh.i3plus.pojo.aps.enums;
 
+/**
+ * @Description :备料类型
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public enum PREPARE_TYPE {
     NO,
-    SELF_MAKE,
+    SELF_MAKE,  // 自制
-    PURCHASE
+    PURCHASE    // 采购
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/REPLENISHMENT_TYPE.java

@@ -1,7 +1,14 @@
 package cn.estsh.i3plus.pojo.aps.enums;
 
+/**
+ * @Description :补充类型
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public enum REPLENISHMENT_TYPE {
     NO,
-    BATCH,
+    BATCH,      // 批量补充
-    ONEBYONE
+    ONEBYONE    // 一对一补充
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+/**
+ * @Description :资源区分
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+public enum RESOURCE_CLASS {
+    MAIN,   // 主资源
+    ASS     // 副资源
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+/**
+ * @Description :资源类型
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+public enum RESOURCE_TYPE {
+    LIMITLESS,  // 无限能力
+    SINGLE,     // 单能力
+    BATCH       // 炉资源
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_LOCK_TYPE.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+/**
+ * @Description :锁定时间计算方式
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+public enum RES_COMB_LOCK_TYPE {
+    KEEP_ORIGIN,        // 各自锁定
+    MAIN_LOCK,          // 主资源锁定
+    MAX_ALL_RESOURCE,   // 最大锁定时间
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_TIME_TYPE.java

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+/**
+ * @Description :生产时间计算方法
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+public enum RES_COMB_TIME_TYPE {
+    MAIN_RESOURCE,      // 主资源
+    MAX_ASS_RESOURCE,   // 副资源最大值
+    MIN_ASS_RESOURCE,   // 副资源最小值
+    AVG_ASS_RESOURCE,   // 副资源平均值
+    MAX_ALL_RESOURCE,   // 主副资源最大值
+    MIN_ALL_RESOURCE,   // 主副资源最小值
+    AVG_ALL_RESOURCE    // 主副资源平均值
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TAIL_DEAL.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+/**
+ * @Description :尾数处理方式
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+public enum TAIL_DEAL {
+    NODEAL,     // 不处理
+    CEILING,    // 向下
+    PUSHFRONT   // 向上
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+/**
+ * @Description :时间圆整方式
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+public enum TIME_ROUND_TYPE {
+    NONE,       // 不圆整
+    UP,         // 向上
+    DOWN,       // 向下
+    ROUNDING    // 四舍五入
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/USE_TYPE.java

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+/**
+ * @Description :使用类型
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+public enum USE_TYPE {
+    MAIN,           // 主资源
+    FIRST_ASS,      // 第一套副资源
+    SECOND_ASS,     // 第二套副资源
+    THIRD_ASS,      // 第三套副资源
+    FOURTH_ASS,     // 第四套副资源
+    FIFTH_ASS,      // 第五套副资源
+    SIXTH_ASS       // 第六套副资源
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_RELATION_TYPE.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+/**
+ * @Description :工作关联类型
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+public enum WORK_RELATION_TYPE {
+    INNER,      // 订单内关联
+    OUTER       // 订单间关联
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_STATUS.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+/**
+ * @Description :工作状态
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+public enum WORK_STATUS {
+    NOPLAN,         // 未计划
+    PLANDONE,       // 计划完毕
+    INDICATIONDONE, // 指示完毕
+    CONFIRM,        // 确认
+    STARTPRODUCT,   // 开始生产
+    FINISH          // 完成
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_TYPE.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+/**
+ * @Description :工作类型
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+public enum WORK_TYPE {
+    FICTITIOUS, // 虚拟工作
+    NORMAL      // 普通工作
+}

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

@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EBaseOrder {
+    Works,
+    Material,
+    PrevRelations,
+    PostRelations,
+    UpperOrders,
+    LowerOrders
+}

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

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

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

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EMaterial {
+    ProductRouting,
+    OperInputs,
+    OperOutputs,
+    WorkInputs,
+    WorkOutputs,
+    WorkRelations,
+    Orders
+}

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

@@ -0,0 +1,7 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EOperInput {
+    Operation,
+    Material,
+    WorkInputs
+}

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

@@ -0,0 +1,7 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EOperOutput {
+    Operation,
+    Material,
+    WorkOutputs
+}

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

@@ -0,0 +1,7 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EOperResource {
+    Operation,
+    Resource,
+    WorkResources
+}

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

@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EOperation {
+    ProductRouting,
+    OperInputs,
+    OperOutputs,
+    OperResources,
+    StandOperation,
+    Works
+}

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

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

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

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

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

@@ -0,0 +1,7 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EProductRouting {
+    Material,
+    Operations,
+    ProductOrders
+}

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

@@ -0,0 +1,6 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EResCalendar {
+    DayShifts,
+    Resources,
+}

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

@@ -0,0 +1,6 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EResource {
+    OperResources,
+    WorkResources
+}

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

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

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

@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EWork {
+    Order,
+    WorkResources,
+    WorkInputs,
+    WorkOutputs,
+    WorkRelationInputs,
+    WorkRelationOutputs,
+    Operation,
+    PlanFeedback
+}

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

@@ -0,0 +1,8 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EWorkInput {
+    Work,
+    WorkRelations,
+    Material,
+    OperInput
+}

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

@@ -0,0 +1,8 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EWorkOutput {
+    Work,
+    WorkRelations,
+    Material,
+    OperOutput
+}

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

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EWorkRelation {
+    WorkInput,
+    WorkOutput,
+    PrevWork,
+    PostWork,
+    PrevOrder,
+    PostOrder,
+    Material
+}

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

@@ -0,0 +1,7 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EWorkResource {
+    Work,
+    Resource,
+    OperResource
+}

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

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

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

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

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

@@ -2,8 +2,9 @@ package cn.estsh.i3plus.pojo.aps.repository;
 
 import cn.estsh.i3plus.pojo.aps.bean.FieldInfo;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface FieldInfoRepository extends BaseRepository<FieldInfo, Long> {
+public interface FieldInfoRepository extends CrudRepository<FieldInfo, Long> {
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="BaseOrder">
+    <Relation field="Material" name="Material" reverse="Orders" type="MULTI_TO_ONE" owner="false">
+    </Relation>
+    <Relation field="Works" name="Work" reverse="Order" type="ONE_TO_MULTI" owner="true">
+    </Relation>
+    <Relation field="PrevRelations" name="WorkRelation" reverse="PrevOrder" type="ONE_TO_MULTI" owner="false">
+    </Relation>
+    <Relation field="PostRelations" name="WorkRelation" reverse="PostOrder" type="ONE_TO_MULTI" owner="false">
+    </Relation>
+    <Relation field="UpperOrders" name="BaseOrder" reverse="LowerOrders" type="MULTI_TO_MULTI" owner="false">
+    </Relation>
+</Class>

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

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="DayShift">
+</Class>

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

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