Merge branch 'dev' into test

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :订单基类
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class BaseOrder extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :规则基类
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class BaseRule extends BaseAPS {
 }

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

@@ -1,4 +0,0 @@
-package cn.estsh.i3plus.pojo.aps.bean;
-
-public class Calendar extends BaseAPS {
-}

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :取消计划规则
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class CancelPlanRule extends BaseRule {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :班次
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class DayShift extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :字段赋值规则
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class FieldSetRule extends BaseRule {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :排程运算规则
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class HeuristicRule extends BaseRule {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :库存
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class Inventory extends BaseOrder {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :物料运算规则
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class MatCalcRule extends BaseRule {
 }

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

@@ -10,6 +10,13 @@ import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Table;
 
+/**
+ * @Description :物料
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 @Data
 @MappedSuperclass
 @Table(name = "MATERIAL")

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工序输入
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class OperInput extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工序输出
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class OperOutput extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工序资源
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class OperResource extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工序
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class Operation extends BaseAPS {
 }

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

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+/**
+ * @Description :加班日历
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+public class OvertimeCalendar extends BaseAPS {
+}

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :计划反馈
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class PlanFeedback extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :生产订单
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class ProductOrder extends BaseOrder {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工艺路线
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class ProductRouting extends BaseCode {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :采购订单
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class PurchaseOrder extends BaseOrder {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :日历
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class ResCalendar extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :资源
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class Resource extends BaseCode {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :规则组合
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class RuleGroup extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :销售订单
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class SalesOrder extends BaseOrder {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description : 标准工序
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class StandOperation extends BaseCode {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :系统参数
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class SysParam extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工作
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class Work extends BaseCode {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工作输入
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class WorkInput extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工作输出
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class WorkOutput extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工作关联
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class WorkRelation extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工作资源
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class WorkResource extends BaseAPS {
 }

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

@@ -2,19 +2,19 @@ package cn.estsh.i3plus.pojo.aps.enums;
 
 public enum FIELD_TYPE {
     NONE,
-    BOOLEAN,
-    CHAR,
-    SHORT,
-    INTEGER,
-    LONG,
-    DOUBLE,
-    DATE,
-    TIME,
-    DATETIME,
-    DURATION,
-    ENUM,
-    MULTIENUM,
-    STRING,
-    OBJECT,
-    LIST
+    BOOLEAN,    // 布尔
+    CHAR,       // 字符
+    SHORT,      // 短整型
+    INTEGER,    // 整型
+    LONG,       // 长整型
+    DOUBLE,     // 浮点型
+    DATE,       // 日期类型(2019-09-16)
+    TIME,       // 时间类型(17:35:30)
+    DATETIME,   // 日期时间类型(2019-09-16 17:35:30)
+    DURATION,   // 时间段(1H)
+    ENUM,       // 枚举
+    MULTIENUM,  // 多选枚举
+    STRING,     // 字符串
+    OBJECT,     // 关联对象，下来选择关联对象的Code值
+    LIST        // 对象集合，不可编辑。
 }

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

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+@Data
+public class EnumModel {
+    private String code;
+    private String name;
+}