From d3194ac4bc64120c18902d7697cda90764f256c3 Mon Sep 17 00:00:00 2001
From: "jason.niu" <jason.niu@estsh.com>
Date: Wed, 18 Sep 2019 20:28:10 +0800
Subject: [PATCH 01/21] add expression to aps

---
 .../cn/estsh/i3plus/pojo/aps/bean/BaseAPS.java     |  6 +-
 .../cn/estsh/i3plus/pojo/aps/bean/BaseCode.java    |  2 +-
 .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java   | 40 +++++++++++
 .../estsh/i3plus/pojo/aps/bean/CancelPlanRule.java | 15 ++++
 .../cn/estsh/i3plus/pojo/aps/bean/DayShift.java    | 19 +++++
 .../estsh/i3plus/pojo/aps/bean/FieldSetRule.java   | 27 +++++++
 .../estsh/i3plus/pojo/aps/bean/HeuristicRule.java  | 31 ++++++++
 .../cn/estsh/i3plus/pojo/aps/bean/Inventory.java   | 28 ++++++++
 .../cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java | 45 ++++++++++++
 .../cn/estsh/i3plus/pojo/aps/bean/Material.java    |  8 ++-
 .../cn/estsh/i3plus/pojo/aps/bean/OperInput.java   | 36 ++++++++++
 .../cn/estsh/i3plus/pojo/aps/bean/OperOutput.java  | 23 ++++++
 .../estsh/i3plus/pojo/aps/bean/OperResource.java   | 44 ++++++++++++
 .../cn/estsh/i3plus/pojo/aps/bean/Operation.java   | 62 ++++++++++++++++
 .../i3plus/pojo/aps/bean/OvertimeCalendar.java     | 29 ++++++++
 .../estsh/i3plus/pojo/aps/bean/PlanFeedback.java   | 10 +++
 .../estsh/i3plus/pojo/aps/bean/ProductOrder.java   | 72 +++++++++++++++++++
 .../estsh/i3plus/pojo/aps/bean/ProductRouting.java | 24 +++++++
 .../estsh/i3plus/pojo/aps/bean/PurchaseOrder.java  | 35 +++++++++
 .../cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java | 31 ++++++++
 .../cn/estsh/i3plus/pojo/aps/bean/Resource.java    | 79 +++++++++++++++++++++
 .../cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java   | 10 +++
 .../cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java  | 32 +++++++++
 .../estsh/i3plus/pojo/aps/bean/StandOperation.java | 47 +++++++++++++
 .../cn/estsh/i3plus/pojo/aps/bean/SysParam.java    | 20 ++++++
 .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java   | 82 ++++++++++++++++++++++
 .../cn/estsh/i3plus/pojo/aps/bean/WorkInput.java   | 24 +++++++
 .../cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java  | 24 +++++++
 .../estsh/i3plus/pojo/aps/bean/WorkRelation.java   | 41 +++++++++++
 .../estsh/i3plus/pojo/aps/bean/WorkResource.java   | 44 ++++++++++++
 .../estsh/i3plus/pojo/aps/enums/CALENDAR_TYPE.java | 13 ++++
 .../i3plus/pojo/aps/enums/CONSTRAINT_TYPE.java     | 15 ++++
 .../cn/estsh/i3plus/pojo/aps/enums/DIRECTION.java  | 13 ++++
 .../cn/estsh/i3plus/pojo/aps/enums/FIELD_TYPE.java | 11 ++-
 .../estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java | 13 +++-
 .../i3plus/pojo/aps/enums/ORDER_DEL_LIMIT.java     | 16 +++++
 .../estsh/i3plus/pojo/aps/enums/PREPARE_TYPE.java  | 11 ++-
 .../i3plus/pojo/aps/enums/REPLENISHMENT_TYPE.java  | 11 ++-
 .../i3plus/pojo/aps/enums/RESOURCE_CLASS.java      | 13 ++++
 .../estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java | 14 ++++
 .../i3plus/pojo/aps/enums/RES_COMB_LOCK_TYPE.java  | 14 ++++
 .../i3plus/pojo/aps/enums/RES_COMB_TIME_TYPE.java  | 18 +++++
 .../cn/estsh/i3plus/pojo/aps/enums/TAIL_DEAL.java  | 14 ++++
 .../i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java     | 15 ++++
 .../cn/estsh/i3plus/pojo/aps/enums/USE_TYPE.java   | 18 +++++
 .../i3plus/pojo/aps/enums/WORK_RELATION_TYPE.java  | 13 ++++
 .../estsh/i3plus/pojo/aps/enums/WORK_STATUS.java   | 17 +++++
 .../cn/estsh/i3plus/pojo/aps/enums/WORK_TYPE.java  | 13 ++++
 .../aps/repository/CancelPlanRuleRepository.java   |  9 +++
 .../pojo/aps/repository/DayShiftRepository.java    |  9 +++
 .../pojo/aps/repository/FieldInfoRepository.java   |  3 +-
 .../aps/repository/FieldSetRuleRepository.java     |  9 +++
 .../aps/repository/HeuristicRuleRepository.java    |  9 +++
 .../pojo/aps/repository/InventoryRepository.java   |  9 +++
 .../pojo/aps/repository/MatCalcRuleRepository.java |  9 +++
 .../pojo/aps/repository/MaterialRepository.java    |  9 +++
 .../pojo/aps/repository/OperInputRepository.java   |  9 +++
 .../pojo/aps/repository/OperOutputRepository.java  |  9 +++
 .../aps/repository/OperResourceRepository.java     |  9 +++
 .../pojo/aps/repository/OperationRepository.java   |  9 +++
 .../aps/repository/OvertimeCalendarRepository.java |  9 +++
 .../aps/repository/PlanFeedbackRepository.java     |  9 +++
 .../aps/repository/ProductOrderRepository.java     |  9 +++
 .../aps/repository/ProductRoutingRepository.java   |  9 +++
 .../aps/repository/PurchaseOrderRepository.java    |  9 +++
 .../pojo/aps/repository/ResCalendarRepository.java |  9 +++
 .../pojo/aps/repository/ResourceRepository.java    |  9 +++
 .../pojo/aps/repository/RuleGroupRepository.java   |  9 +++
 .../pojo/aps/repository/SalesOrderRepository.java  |  9 +++
 .../aps/repository/StandOperationRepository.java   |  9 +++
 .../pojo/aps/repository/SysParamRepository.java    |  9 +++
 .../pojo/aps/repository/WorkInputRepository.java   |  9 +++
 .../pojo/aps/repository/WorkOutputRepository.java  |  9 +++
 .../aps/repository/WorkRelationRepository.java     |  9 +++
 .../i3plus/pojo/aps/repository/WorkRepository.java |  9 +++
 .../aps/repository/WorkResourceRepository.java     |  9 +++
 76 files changed, 1473 insertions(+), 15 deletions(-)
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_TYPE.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CONSTRAINT_TYPE.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DIRECTION.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ORDER_DEL_LIMIT.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_LOCK_TYPE.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_TIME_TYPE.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TAIL_DEAL.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/USE_TYPE.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_RELATION_TYPE.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_STATUS.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_TYPE.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/CancelPlanRuleRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DayShiftRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FieldSetRuleRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/HeuristicRuleRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/InventoryRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MatCalcRuleRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/OperInputRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/OperOutputRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/OperResourceRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/OperationRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/OvertimeCalendarRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/PlanFeedbackRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ProductOrderRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ProductRoutingRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/PurchaseOrderRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ResCalendarRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ResourceRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/RuleGroupRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SalesOrderRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/StandOperationRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SysParamRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkInputRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkOutputRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkRelationRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkResourceRepository.java

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseAPS.java
index 36d411a..a32f16d 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseAPS.java
+++ b/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) {
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseCode.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseCode.java
index 072ceca..b98245e 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseCode.java
+++ b/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;
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 c0e8de4..dbbfd15 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
@@ -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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java
index a25a9dd..5d09632 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java
index 493645b..8e4f1e5 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java
index e1d30f2..529fbf2 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java
+++ b/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;
 }
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 b343f3d..69785bf 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
@@ -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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java
index b4a4361..701ac20 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java
+++ b/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;
+
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java
index cb97d5e..e6935d0 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java
+++ b/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;
+
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
index 352542e..9d0a98e 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
+++ b/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
-@Table(name = "MATERIAL")
+@Entity
+@Table(name = "APS_MATERIAL")
+@Api("物料")
 public class Material extends BaseCode {
     @Column(name="TYPE")
     @ApiParam(value ="类型")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java
index bc87257..5ee1d01 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java
index f32f43b..143141e 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java
index 233987a..4cf9c04 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
index b30e1da..2c0b4f3 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java
index 1a68f40..0d4cfc5 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java
index c02f251..a651c37 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java
+++ b/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 {
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
index 36dae88..52bc4f7 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java
index c67d4ed..64667de 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java
index 81ab2fa..7fe588b 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java
index f54a7c8..52920f1 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
index 32695fa..d5dce47 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
@@ -1,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;
+
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java
index 3fa2af6..0d40f77 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java
+++ b/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 {
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java
index 752d85f..ee332b9 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
index d8f98ea..de95109 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java
index c028805..cd62bbe 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
index 4067d7b..1000974 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java
index 676f9a8..b58669d 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java
index 09e27c9..bbd1456 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java
index 8efb888..fb2a296 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java
index 6ca39be..651a0b6 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java
@@ -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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_TYPE.java
new file mode 100644
index 0000000..790195d
--- /dev/null
+++ b/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     // 停用
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CONSTRAINT_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CONSTRAINT_TYPE.java
new file mode 100644
index 0000000..66e085a
--- /dev/null
+++ b/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    // 前后工作同时开始或同时结束
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DIRECTION.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DIRECTION.java
new file mode 100644
index 0000000..800ffdd
--- /dev/null
+++ b/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     // 逆向
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/FIELD_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/FIELD_TYPE.java
index 29f7f19..3677c69 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/FIELD_TYPE.java
+++ b/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        // 对象集合，不可编辑。
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java
index 5a24c88..373afaf 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java
+++ b/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,
-    HALF_PRODUCT,
-    RAW_MATERIAL
+    PRODUCT,        // 成品
+    HALF_PRODUCT,   // 半成品
+    RAW_MATERIAL    // 原材料
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ORDER_DEL_LIMIT.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ORDER_DEL_LIMIT.java
new file mode 100644
index 0000000..67e8f31
--- /dev/null
+++ b/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
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PREPARE_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PREPARE_TYPE.java
index de18b9c..b357026 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PREPARE_TYPE.java
+++ b/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,
-    PURCHASE
+    SELF_MAKE,  // 自制
+    PURCHASE    // 采购
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/REPLENISHMENT_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/REPLENISHMENT_TYPE.java
index b092894..e9c78dd 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/REPLENISHMENT_TYPE.java
+++ b/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,
-    ONEBYONE
+    BATCH,      // 批量补充
+    ONEBYONE    // 一对一补充
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java
new file mode 100644
index 0000000..3402810
--- /dev/null
+++ b/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     // 副资源
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java
new file mode 100644
index 0000000..a42c74c
--- /dev/null
+++ b/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       // 炉资源
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_LOCK_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_LOCK_TYPE.java
new file mode 100644
index 0000000..e5eb47f
--- /dev/null
+++ b/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,   // 最大锁定时间
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_TIME_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RES_COMB_TIME_TYPE.java
new file mode 100644
index 0000000..c9210a1
--- /dev/null
+++ b/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    // 主副资源平均值
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TAIL_DEAL.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TAIL_DEAL.java
new file mode 100644
index 0000000..626e1df
--- /dev/null
+++ b/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   // 向上
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java
new file mode 100644
index 0000000..b9d7cc3
--- /dev/null
+++ b/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    // 四舍五入
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/USE_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/USE_TYPE.java
new file mode 100644
index 0000000..68ee62e
--- /dev/null
+++ b/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       // 第六套副资源
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_RELATION_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_RELATION_TYPE.java
new file mode 100644
index 0000000..1aa3c33
--- /dev/null
+++ b/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       // 订单间关联
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_STATUS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_STATUS.java
new file mode 100644
index 0000000..a650ed1
--- /dev/null
+++ b/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          // 完成
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_TYPE.java
new file mode 100644
index 0000000..1aed997
--- /dev/null
+++ b/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      // 普通工作
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/CancelPlanRuleRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/CancelPlanRuleRepository.java
new file mode 100644
index 0000000..9ab0089
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DayShiftRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DayShiftRepository.java
new file mode 100644
index 0000000..10cad62
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FieldInfoRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FieldInfoRepository.java
index 76a9000..744e8e0 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FieldInfoRepository.java
+++ b/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> {
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FieldSetRuleRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FieldSetRuleRepository.java
new file mode 100644
index 0000000..bbd1fc2
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/HeuristicRuleRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/HeuristicRuleRepository.java
new file mode 100644
index 0000000..15e98a2
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/InventoryRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/InventoryRepository.java
new file mode 100644
index 0000000..3782c59
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MatCalcRuleRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MatCalcRuleRepository.java
new file mode 100644
index 0000000..c2252a1
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialRepository.java
new file mode 100644
index 0000000..6d95dca
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/OperInputRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/OperInputRepository.java
new file mode 100644
index 0000000..e60bb3c
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/OperOutputRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/OperOutputRepository.java
new file mode 100644
index 0000000..4687405
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/OperResourceRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/OperResourceRepository.java
new file mode 100644
index 0000000..190806d
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/OperationRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/OperationRepository.java
new file mode 100644
index 0000000..be91cee
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/OvertimeCalendarRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/OvertimeCalendarRepository.java
new file mode 100644
index 0000000..3840704
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/PlanFeedbackRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/PlanFeedbackRepository.java
new file mode 100644
index 0000000..d676c4d
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ProductOrderRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ProductOrderRepository.java
new file mode 100644
index 0000000..5968b52
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ProductRoutingRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ProductRoutingRepository.java
new file mode 100644
index 0000000..61e7718
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/PurchaseOrderRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/PurchaseOrderRepository.java
new file mode 100644
index 0000000..535b27a
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ResCalendarRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ResCalendarRepository.java
new file mode 100644
index 0000000..3595c85
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ResourceRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ResourceRepository.java
new file mode 100644
index 0000000..8293e88
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/RuleGroupRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/RuleGroupRepository.java
new file mode 100644
index 0000000..8c434f2
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SalesOrderRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SalesOrderRepository.java
new file mode 100644
index 0000000..b2c1352
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/StandOperationRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/StandOperationRepository.java
new file mode 100644
index 0000000..a59c5fe
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SysParamRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SysParamRepository.java
new file mode 100644
index 0000000..d7097ca
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkInputRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkInputRepository.java
new file mode 100644
index 0000000..e4de46d
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkOutputRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkOutputRepository.java
new file mode 100644
index 0000000..28bcf19
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkRelationRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkRelationRepository.java
new file mode 100644
index 0000000..a8a7f79
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkRepository.java
new file mode 100644
index 0000000..2d65b25
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkResourceRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkResourceRepository.java
new file mode 100644
index 0000000..9e349a3
--- /dev/null
+++ b/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> {
+}

From 68da44de9e42d967657863b94c3ad6b2f0bded5b Mon Sep 17 00:00:00 2001
From: "jason.niu" <jason.niu@estsh.com>
Date: Thu, 19 Sep 2019 13:34:40 +0800
Subject: [PATCH 02/21] add expression to aps

---
 .../cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java     |  2 +-
 .../cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java    | 10 ++++++++++
 .../cn/estsh/i3plus/pojo/aps/holders/EDayShift.java     |  5 +++++
 .../cn/estsh/i3plus/pojo/aps/holders/EMaterial.java     | 11 +++++++++++
 .../cn/estsh/i3plus/pojo/aps/holders/EOperInput.java    |  7 +++++++
 .../cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java   |  7 +++++++
 .../cn/estsh/i3plus/pojo/aps/holders/EOperResource.java |  7 +++++++
 .../cn/estsh/i3plus/pojo/aps/holders/EOperation.java    | 10 ++++++++++
 .../cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java |  5 +++++
 .../cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java |  5 +++++
 .../estsh/i3plus/pojo/aps/holders/EProductRouting.java  |  7 +++++++
 .../cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java  |  6 ++++++
 .../cn/estsh/i3plus/pojo/aps/holders/EResource.java     |  6 ++++++
 .../estsh/i3plus/pojo/aps/holders/EStandOperation.java  |  5 +++++
 .../java/cn/estsh/i3plus/pojo/aps/holders/EWork.java    | 12 ++++++++++++
 .../cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java    |  8 ++++++++
 .../cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java   |  8 ++++++++
 .../cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java | 11 +++++++++++
 .../cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java |  7 +++++++
 .../src/main/resources/relations/BaseOrder.xml          | 13 +++++++++++++
 .../src/main/resources/relations/DayShift.xml           |  3 +++
 .../src/main/resources/relations/Material.xml           |  5 +++++
 .../src/main/resources/relations/OperInput.xml          |  5 +++++
 .../src/main/resources/relations/OperOutput.xml         |  5 +++++
 .../src/main/resources/relations/OperResource.xml       |  5 +++++
 .../src/main/resources/relations/Operation.xml          |  9 +++++++++
 .../src/main/resources/relations/PlanFeedback.xml       |  3 +++
 .../src/main/resources/relations/ProductOrder.xml       |  3 +++
 .../src/main/resources/relations/ProductRouting.xml     |  7 +++++++
 .../src/main/resources/relations/ResCalendar.xml        |  7 +++++++
 .../src/main/resources/relations/Resource.xml           |  3 +++
 .../src/main/resources/relations/StandOperation.xml     |  5 +++++
 .../src/main/resources/relations/Work.xml               | 17 +++++++++++++++++
 .../src/main/resources/relations/WorkInput.xml          |  9 +++++++++
 .../src/main/resources/relations/WorkOutput.xml         |  9 +++++++++
 .../src/main/resources/relations/WorkRelation.xml       |  5 +++++
 .../src/main/resources/relations/WorkResource.xml       |  7 +++++++
 37 files changed, 258 insertions(+), 1 deletion(-)
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperResource.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductRouting.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/DayShift.xml
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/OperResource.xml
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/Operation.xml
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/ProductRouting.xml
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/StandOperation.xml
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/WorkInput.xml
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/WorkOutput.xml
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/WorkRelation.xml
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
index 52bc4f7..a1712da 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
@@ -19,7 +19,7 @@ import java.util.Date;
 @Data
 @Entity
 @Table(name = "APS_PRODUCT_ORDER")
-@Api("计划反馈")
+@Api("生产订单")
 public class ProductOrder extends BaseOrder {
     @Column(name="EST")
     @ApiParam(value ="最早开始时间")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java
new file mode 100644
index 0000000..e4c5238
--- /dev/null
+++ b/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
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java
new file mode 100644
index 0000000..e1142a0
--- /dev/null
+++ b/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
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java
new file mode 100644
index 0000000..d24c26a
--- /dev/null
+++ b/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
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java
new file mode 100644
index 0000000..4ee6467
--- /dev/null
+++ b/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
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java
new file mode 100644
index 0000000..898f576
--- /dev/null
+++ b/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
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperResource.java
new file mode 100644
index 0000000..36345e9
--- /dev/null
+++ b/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
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java
new file mode 100644
index 0000000..42f06cc
--- /dev/null
+++ b/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
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java
new file mode 100644
index 0000000..5ce71a5
--- /dev/null
+++ b/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
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java
new file mode 100644
index 0000000..9ad0f8a
--- /dev/null
+++ b/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
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductRouting.java
new file mode 100644
index 0000000..9fe315f
--- /dev/null
+++ b/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
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java
new file mode 100644
index 0000000..c8e2201
--- /dev/null
+++ b/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,
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java
new file mode 100644
index 0000000..8064356
--- /dev/null
+++ b/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
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java
new file mode 100644
index 0000000..200b2a1
--- /dev/null
+++ b/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
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
new file mode 100644
index 0000000..330d898
--- /dev/null
+++ b/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
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java
new file mode 100644
index 0000000..ddfbd3a
--- /dev/null
+++ b/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
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java
new file mode 100644
index 0000000..e2f1de2
--- /dev/null
+++ b/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
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java
new file mode 100644
index 0000000..cdfc8ab
--- /dev/null
+++ b/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
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java
new file mode 100644
index 0000000..2f77bcc
--- /dev/null
+++ b/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
+}
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml
new file mode 100644
index 0000000..65c1fe1
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/DayShift.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/DayShift.xml
new file mode 100644
index 0000000..7182232
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml
new file mode 100644
index 0000000..f5a2928
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml
new file mode 100644
index 0000000..e2d484c
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="OperInput">
+    <Relation field="Material" name="Material" reverse="OperInputs" type="MULTI_TO_ONE" owner="false">
+    </Relation>
+</Class>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml
new file mode 100644
index 0000000..5a7f843
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="OperOutput">
+    <Relation field="Material" name="Material" reverse="OperOutputs" type="MULTI_TO_ONE" owner="false">
+    </Relation>
+</Class>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/OperResource.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/OperResource.xml
new file mode 100644
index 0000000..27afb26
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/OperResource.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="OperResource">
+    <Relation field="Resource" name="Resource" reverse="OperResources"  type="MULTI_TO_ONE" owner="false">
+    </Relation>
+</Class>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Operation.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Operation.xml
new file mode 100644
index 0000000..8b21555
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Operation.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="Operation">
+    <Relation field="OperInputs" name="OperInput" reverse="Operation" type="ONE_TO_MULTI" owner="true">
+    </Relation>
+    <Relation field="OperOutputs" name="OperOutput" reverse="Operation" type="ONE_TO_MULTI" owner="true">
+    </Relation>
+    <Relation field="OperResources" name="OperResource" reverse="Operation" type="ONE_TO_MULTI" owner="true">
+    </Relation>
+</Class>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml
new file mode 100644
index 0000000..c0988ef
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="PlanFeedback">
+</Class>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml
new file mode 100644
index 0000000..40fa8d7
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="ProductOrder" extends="BaseOrder">
+</Class>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ProductRouting.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ProductRouting.xml
new file mode 100644
index 0000000..44b1ebf
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ProductRouting.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="ProductRouting">
+    <Relation field="Operations" name="Operation" reverse="ProductRouting" type="ONE_TO_MULTI" owner="true">
+    </Relation>
+    <Relation field="ProductOrders" name="ProductOrder" reverse="ProductRouting" type="ONE_TO_MULTI" owner="false">
+    </Relation>
+</Class>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml
new file mode 100644
index 0000000..30dc59a
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="ResCalendar">
+    <Relation field="DayShifts" name="DayShift" reverse="ResCalendar" type="MULTI_TO_MULTI" owner="false">
+    </Relation>
+    <Relation field="Resources" name="Resource" type="MULTI_TO_MULTI" owner="false">
+    </Relation>
+</Class>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml
new file mode 100644
index 0000000..81c9f49
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="Resource">
+</Class>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/StandOperation.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/StandOperation.xml
new file mode 100644
index 0000000..5c82b55
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/StandOperation.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="StandOperation">
+    <Relation field="Operations" name="Operation" reverse="StandOperation" type="ONE_TO_MULTI" owner="false">
+    </Relation>
+</Class>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml
new file mode 100644
index 0000000..1bb7816
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="Work">
+    <Relation field="WorkOutputs" name="WorkOutput" reverse="Work" type="ONE_TO_MULTI" owner="true">
+    </Relation>
+    <Relation field="WorkInputs" name="WorkInput" reverse="Work" type="ONE_TO_MULTI" owner="true">
+    </Relation>
+    <Relation field="WORK_RESOURCES" name="WorkResource" reverse="Work" type="ONE_TO_MULTI" owner="true">
+    </Relation>
+    <Relation field="WorkRelationOutputs" name="WorkRelation" reverse="PrevWork" type="ONE_TO_MULTI" owner="false">
+    </Relation>
+    <Relation field="WorkRelationInputs" name="WorkRelation" reverse="PostWork" type="ONE_TO_MULTI" owner="false">
+    </Relation>
+    <Relation field="Operation" name="Operation" reverse="Works" type="MULTI_TO_ONE" owner="false">
+    </Relation>
+    <Relation field="PlanFeedback" name="PlanFeedback" reverse="Work" type="ONE_TO_MULTI" owner="true">
+    </Relation>
+</Class>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkInput.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkInput.xml
new file mode 100644
index 0000000..c1f7586
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkInput.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="WorkInput">
+    <Relation field="WorkRelations" name="WorkRelation" reverse="WorkInput" type="ONE_TO_MULTI" owner="true">
+    </Relation>
+    <Relation field="Material" name="Material" reverse="WorkInputs" type="MULTI_TO_ONE" owner="false">
+    </Relation>
+    <Relation field="OperInput" name="OperInput" reverse="WorkInputs" type="MULTI_TO_ONE" owner="false">
+    </Relation>
+</Class>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkOutput.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkOutput.xml
new file mode 100644
index 0000000..d7777f8
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkOutput.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="WorkOutput">
+    <Relation field="WorkRelations" name="WorkRelation" reverse="WorkOutput" type="ONE_TO_MULTI" owner="true">
+    </Relation>
+    <Relation field="Material" name="Material" reverse="WorkOutputs" type="MULTI_TO_ONE" owner="false">
+    </Relation>
+    <Relation field="OperOutput" name="OperOutput" reverse="WorkOutputs" type="MULTI_TO_ONE" owner="false">
+    </Relation>
+</Class>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkRelation.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkRelation.xml
new file mode 100644
index 0000000..613c415
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkRelation.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="WorkRelation">
+    <Relation field="Material" name="Material" reverse="WorkRelations" type="MULTI_TO_ONE" owner="false">
+    </Relation>
+</Class>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml
new file mode 100644
index 0000000..28b6264
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="WorkResource">
+    <Relation field="Resource" name="Resource" reverse="WorkResources" type="MULTI_TO_ONE" owner="false">
+    </Relation>
+    <Relation field="OperResource" name="OperResource" reverse="WorkResources" type="MULTI_TO_ONE" owner="false">
+    </Relation>
+</Class>
\ No newline at end of file

From d273159e3eafc6884b9b6c394a9682ae1bcd19be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= <rock.yu@qq.com>
Date: Thu, 19 Sep 2019 16:23:37 +0800
Subject: [PATCH 03/21] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E7=9B=AE=E7=9A=84?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=8A=B6=E6=80=81=EF=BC=88=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/wms/engine/rule/WmsSNNextStatusRule.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/WmsSNNextStatusRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/WmsSNNextStatusRule.java
index 1f74f53..f456573 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/WmsSNNextStatusRule.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/WmsSNNextStatusRule.java
@@ -23,6 +23,8 @@ public class WmsSNNextStatusRule {
     private int srcSNStatusCode;
     // 目的条码状态
     private int destSNStatusCode;
+    // 目的条码的质量状态
+    private int destQCStatusCode;
 
     public int getTransTypeCode() {
         return transTypeCode;
@@ -79,4 +81,12 @@ public class WmsSNNextStatusRule {
     public void setDefaultInStock(boolean defaultInStock) {
         this.defaultInStock = defaultInStock;
     }
+
+    public int getDestQCStatusCode() {
+        return destQCStatusCode;
+    }
+
+    public void setDestQCStatusCode(int destQCStatusCode) {
+        this.destQCStatusCode = destQCStatusCode;
+    }
 }

From d82e025eb9c81fd27e5b28d3db5285d61e13a04f Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Thu, 19 Sep 2019 16:36:13 +0800
Subject: [PATCH 04/21] =?UTF-8?q?dev=E7=8E=AF=E5=A2=83pom=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9=E4=B8=BAdev?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/i3plus-pojo-andon/pom.xml      | 2 +-
 modules/i3plus-pojo-base/pom.xml       | 2 +-
 modules/i3plus-pojo-form/pom.xml       | 2 +-
 modules/i3plus-pojo-hardswitch/pom.xml | 2 +-
 modules/i3plus-pojo-jobflow/pom.xml    | 2 +-
 modules/i3plus-pojo-lac/pom.xml        | 2 +-
 modules/i3plus-pojo-mes-pcn/pom.xml    | 2 +-
 modules/i3plus-pojo-mes/pom.xml        | 2 +-
 modules/i3plus-pojo-model/pom.xml      | 2 +-
 modules/i3plus-pojo-platform/pom.xml   | 2 +-
 modules/i3plus-pojo-report/pom.xml     | 2 +-
 modules/i3plus-pojo-softswitch/pom.xml | 2 +-
 modules/i3plus-pojo-sweb/pom.xml       | 2 +-
 modules/i3plus-pojo-wms/pom.xml        | 2 +-
 modules/i3plus-pojo-workflow/pom.xml   | 2 +-
 pom.xml                                | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index f8fa98e..ebd53c3 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/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>
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index d790ef1..e97c0bb 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/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>
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index c6141da..90e744d 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/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>
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index 23e5bee..0ba3645 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/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>
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index c1e2cb9..6706323 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/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>
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index 86d7736..3681eb6 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/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>
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index 09f2c4a..e388a1d 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/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>
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 82fdbe8..62ebe64 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/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>
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index 0798953..39a7704 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/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>
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index ec9e100..e310bfd 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/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>
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index bd09726..e36fcf7 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/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>
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index 4c96781..81fb02b 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/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>
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index 2c24e41..1f622d9 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/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>
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index 18c811c..bc41914 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/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>
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index 1171f4e..93f9732 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/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>
diff --git a/pom.xml b/pom.xml
index f220aa1..f355cca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
+    <version>1.0-DEV-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>

From 87f8dc38a6a5aa59a72398e88af793fecd1ddc1e Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Thu, 19 Sep 2019 18:57:24 +0800
Subject: [PATCH 05/21] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/i3plus-pojo-andon/pom.xml                  |  2 +-
 modules/i3plus-pojo-aps/pom.xml                    |  2 +-
 modules/i3plus-pojo-base/pom.xml                   |  2 +-
 .../i3plus/pojo/base/enumutil/AndonEnumUtil.java   | 46 ++++++++++++++++++++++
 modules/i3plus-pojo-form/pom.xml                   |  2 +-
 modules/i3plus-pojo-hardswitch/pom.xml             |  2 +-
 modules/i3plus-pojo-jobflow/pom.xml                |  2 +-
 modules/i3plus-pojo-lac/pom.xml                    |  2 +-
 modules/i3plus-pojo-mes-pcn/pom.xml                |  2 +-
 modules/i3plus-pojo-mes/pom.xml                    |  2 +-
 modules/i3plus-pojo-model/pom.xml                  |  2 +-
 modules/i3plus-pojo-platform/pom.xml               |  2 +-
 modules/i3plus-pojo-report/pom.xml                 |  2 +-
 modules/i3plus-pojo-softswitch/pom.xml             |  2 +-
 modules/i3plus-pojo-sweb/pom.xml                   |  2 +-
 modules/i3plus-pojo-wms/pom.xml                    |  2 +-
 modules/i3plus-pojo-workflow/pom.xml               |  2 +-
 pom.xml                                            |  2 +-
 18 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index ebd53c3..f8fa98e 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index b6adafd..4426ba9 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index e97c0bb..d790ef1 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
index 17335f3..1505f7f 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
@@ -106,6 +106,52 @@ public class AndonEnumUtil {
     }
 
     /**
+     * 统计方式
+     * 10-是，20-否
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COUNT_TYPE {
+        DAY("10","按照天统计"),
+        WEEKEND("20","按照周统计");
+
+        private String value;
+        private String description;
+
+        COUNT_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String val) {
+            String tmp = "";
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * 按灯状态
      * 10-是，20-否
      */
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index 90e744d..c6141da 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index 0ba3645..23e5bee 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index 6706323..c1e2cb9 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index 3681eb6..86d7736 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index e388a1d..09f2c4a 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 62ebe64..82fdbe8 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index 39a7704..0798953 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index e310bfd..ec9e100 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index e36fcf7..bd09726 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index 81fb02b..4c96781 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index 1f622d9..2c24e41 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index bc41914..18c811c 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index 93f9732..1171f4e 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index f355cca..f220aa1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>

From b473fd1b46986feaae6d5cea490e38ae855dfd53 Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Thu, 19 Sep 2019 19:36:38 +0800
Subject: [PATCH 06/21] =?UTF-8?q?pojo=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=20=20pom=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9=E4=B8=BAdev?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/i3plus-pojo-andon/pom.xml      | 2 +-
 modules/i3plus-pojo-aps/pom.xml        | 2 +-
 modules/i3plus-pojo-base/pom.xml       | 2 +-
 modules/i3plus-pojo-form/pom.xml       | 2 +-
 modules/i3plus-pojo-hardswitch/pom.xml | 2 +-
 modules/i3plus-pojo-jobflow/pom.xml    | 2 +-
 modules/i3plus-pojo-lac/pom.xml        | 2 +-
 modules/i3plus-pojo-mes-pcn/pom.xml    | 2 +-
 modules/i3plus-pojo-mes/pom.xml        | 2 +-
 modules/i3plus-pojo-model/pom.xml      | 2 +-
 modules/i3plus-pojo-platform/pom.xml   | 2 +-
 modules/i3plus-pojo-report/pom.xml     | 2 +-
 modules/i3plus-pojo-softswitch/pom.xml | 2 +-
 modules/i3plus-pojo-sweb/pom.xml       | 2 +-
 modules/i3plus-pojo-wms/pom.xml        | 2 +-
 modules/i3plus-pojo-workflow/pom.xml   | 2 +-
 pom.xml                                | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index f8fa98e..ebd53c3 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/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>
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index 4426ba9..b6adafd 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/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>
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index d790ef1..e97c0bb 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/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>
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index c6141da..90e744d 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/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>
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index 23e5bee..0ba3645 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/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>
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index c1e2cb9..6706323 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/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>
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index 86d7736..3681eb6 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/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>
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index 09f2c4a..e388a1d 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/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>
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 82fdbe8..62ebe64 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/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>
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index 0798953..39a7704 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/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>
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index ec9e100..e310bfd 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/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>
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index bd09726..e36fcf7 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/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>
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index 4c96781..81fb02b 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/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>
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index 2c24e41..1f622d9 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/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>
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index 18c811c..bc41914 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/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>
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index 1171f4e..93f9732 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/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>
diff --git a/pom.xml b/pom.xml
index f220aa1..f355cca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
+    <version>1.0-DEV-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>

From 9b0c5de954e17eb61ccfa731bca5a45fbd233a52 Mon Sep 17 00:00:00 2001
From: WYnneaoapc <lu_1005@foxmail.com>
Date: Fri, 20 Sep 2019 08:57:10 +0800
Subject: [PATCH 07/21] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java  | 141 +++++++++++++++++++--
 .../i3plus/pojo/base/tool/DdlPreparedPack.java     |  34 +++++
 .../i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java    |   4 +
 .../mes/pcn/repository/MesCellFeedRepository.java  |  14 ++
 .../mes/pcn/repository/MesRawPartSnRepository.java |  15 +++
 .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java    |  38 +++++-
 .../estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java  |   7 +-
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  |  10 +-
 8 files changed, 238 insertions(+), 25 deletions(-)
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index 4643e50..ba4e524 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -13,13 +13,12 @@ public class MesPcnEnumUtil {
 
     /**
      * mes-pcn定时任务状态
-     *
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_PCN_TASK_STATUS{
+    public enum MES_PCN_TASK_STATUS {
 
-        OPEN(1,"OPEN"),
-        CLOSE(2,"CLOSE");
+        OPEN(1, "OPEN"),
+        CLOSE(2, "CLOSE");
 
         private int value;
         private String description;
@@ -50,13 +49,12 @@ public class MesPcnEnumUtil {
 
     /**
      * mes-pcn定时任务同步结果状态
-     *
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_PCN_TASK_SYNC_STATUS{
+    public enum MES_PCN_TASK_SYNC_STATUS {
 
-        SUCCESS(1,"mes主服务定时任务工作清单同步成功"),
-        ERROR(2,"mes主服务定时任务工作清单同步失败");
+        SUCCESS(1, "mes主服务定时任务工作清单同步成功"),
+        ERROR(2, "mes主服务定时任务工作清单同步失败");
 
         private int value;
         private String description;
@@ -90,10 +88,10 @@ public class MesPcnEnumUtil {
      * 10.
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum SYNC_PATTERN{
+    public enum SYNC_PATTERN {
 
-        UPDATE(1,"修改或新增"),
-        INSERT(2,"新增");
+        UPDATE(1, "修改或新增"),
+        INSERT(2, "新增");
 
         private int value;
         private String description;
@@ -127,10 +125,10 @@ public class MesPcnEnumUtil {
      * 10.
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum SYNC_TYPE{
+    public enum SYNC_TYPE {
 
-        GET_MES_DATA(1,"pcn获取mes数据"),
-        DATA_TO_MES(2,"pcn推送数据至mes");
+        GET_MES_DATA(1, "pcn获取mes数据"),
+        DATA_TO_MES(2, "pcn推送数据至mes");
 
         private int value;
         private String description;
@@ -232,4 +230,119 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * RAW_PART_TYPE 原材料类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RAW_PART_TYPE {
+
+        RAW(10, "lotNo", "原材料"),
+        SEMIFINISHED(20, "fixLotNo", "半成品");
+
+        private int value;
+        private String code;
+        private String description;
+
+        RAW_PART_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * RAW_PART_STATUS 原材料状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RAW_PART_STATUS {
+
+        READY(10, "待投料"),
+        ALREADY(20, "已投料");
+
+        private int value;
+        private String description;
+
+        RAW_PART_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * PROCESS_BOM_ISFEED 是否投料
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROCESS_BOM_ISFEED {
+
+        FEED(1, "投料"),
+        NOT_FEED(2, "不投料");
+
+        private int value;
+        private String description;
+
+        PROCESS_BOM_ISFEED(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
 }
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
index 55c08ca..edb8348 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
@@ -395,6 +395,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装String对象成小于不等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getStringSmallerNotEqualPack(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
+            packBean.addColumnQuery("s_"+columnName," and model." + columnName + " < :m_s_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装double对象成大于语句
      *
      * @param columnName 列名
@@ -405,6 +417,17 @@ public class DdlPreparedPack {
             packBean.addColumnQuery(columnName," and model." + columnName + " > :m_" + columnName, data);
         }
     }
+    /**
+     * 封装double对象成大于等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getNumberBiggerEqualPack(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null && Double.parseDouble(data.toString()) > 0) {
+            packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, data);
+        }
+    }
 
     /**
      * 封装double对象成小于语句
@@ -417,6 +440,17 @@ public class DdlPreparedPack {
             packBean.addColumnQuery(columnName," and model." + columnName + " < :m_" + columnName, data);
         }
     }
+    /**
+     * 封装double对象成小于等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getNumberSmallerEqualPack(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null && Double.parseDouble(data.toString()) > 0) {
+            packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, data);
+        }
+    }
 
     /**
      * 封装long或者int的整数对象成equal语句(不等于)
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java
index f1cae75..3758a35 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java
@@ -70,6 +70,10 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value="从数据库抽取的最大值 目前为分钟为限制")
     private Integer extractGap;
 
+    @Column(name="EXTRACT_CONDITION")
+    @ApiParam(value="从数据库抽取的条件限制")
+    private String extractCondition;
+
     public int getSyncFrequencyVal() {
         return this.syncFrequency == null ? 0 : this.syncFrequency;
     }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java
new file mode 100644
index 0000000..462dff4
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeed;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/18 10:05 AM
+ * @Description:
+ **/
+@Repository
+public interface MesCellFeedRepository extends BaseRepository<MesCellFeed, Long> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java
new file mode 100644
index 0000000..1f048c1
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeed;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRawPartSn;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/18 10:05 AM
+ * @Description:
+ **/
+@Repository
+public interface MesRawPartSnRepository extends BaseRepository<MesRawPartSn, Long> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
index 2ae42f4..84b0dff 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
@@ -1,10 +1,11 @@
 package cn.estsh.i3plus.pojo.mes.pcn.sqlpack;
 
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.*;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -16,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
  **/
 public class MesHqlPack {
 
+
     /**
      * 通用查询条件
      *
@@ -52,6 +54,7 @@ public class MesHqlPack {
 
     /**
      * 根据打印模板的模板代码查询模板信息
+     *
      * @param organizeCode
      * @param mesLabelTemplate
      * @return
@@ -63,4 +66,35 @@ public class MesHqlPack {
         return packBean;
     }
 
+    /**
+     * 获取工作中心下所有的投料数据
+     * @param mesCellFeed
+     * @param org
+     * @return
+     */
+    public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) {
+        DdlPackBean packBean = getAllBaseData(org);
+        DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
+        return packBean;
+    }
+
+
+    /**
+     * 获取原材料扫描信息的对应工序BOM
+     * @param mesProcessBom
+     * @param mesRawPartSn
+     * @return
+     */
+    public static DdlPackBean getMesProcessBomRawPartSn(MesProcessBom mesProcessBom, MesRawPartSn mesRawPartSn) {
+        DdlPackBean packBean = getAllBaseData(mesProcessBom.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProcessBom.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(),"isFeed",packBean);
+        DdlPreparedPack.getStringEqualPack(mesRawPartSn.getPartNo(), "itemPartNo", packBean);
+        return packBean;
+    }
+
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java
index 5a2d40c..046faba 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java
@@ -57,7 +57,7 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam("同步方式")
     private Integer syncPattern;
 
-    @Column(name="SYNC_TYPE")//1\pcn获取mes数据   2、pcn推送数据至mes
+    @Column(name="SYNC_TYPE")//1.pcn获取mes数据   2.pcn推送数据至mes
     @ApiParam("同步类型")
     private Integer syncType;
 
@@ -66,11 +66,14 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value ="上一同步时间")
     private String lastSyncTime;
 
-
     @Column(name="EXTRACT_GAP")
     @ApiParam(value="从数据库抽取的最大值 目前为分钟为限制")
     private Integer extractGap;
 
+    @Column(name="EXTRACT_CONDITION")
+    @ApiParam(value="从数据库抽取的条件限制")
+    private String extractCondition;
+
     public int getSyncFrequencyVal() {
         return this.syncFrequency == null ? 0 : this.syncFrequency;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index 19d1974..2286752 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -730,6 +730,7 @@ public class MesHqlPack {
         DdlPreparedPack.getStringEqualPack(mesProcessBom.getItemPartNo(), "itemPartNo", packBean);
         DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesProcessBom.getIsFeed(), "isFeed", packBean);
         DdlPreparedPack.getNumNOEqualPack(mesProcessBom.getId(), "id", packBean);
         return packBean;
     }
@@ -799,13 +800,8 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesKeyData(MesKeyData keyData, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode);
-        if (StringUtils.isNotEmpty(keyData.getKeyDataCode())) {
-            DdlPreparedPack.getStringLikerPack(keyData.getKeyDataCode(), "keyDataCode", packBean);
-        }
-        if (StringUtils.isNotEmpty(keyData.getKeyDataName())) {
-            DdlPreparedPack.getStringLikerPack(keyData.getKeyDataName(), "keyDataName", packBean);
-        }
-
+        DdlPreparedPack.getStringLikerPack(keyData.getKeyDataCode(), "keyDataCode", packBean);
+        DdlPreparedPack.getStringLikerPack(keyData.getKeyDataName(), "keyDataName", packBean);
         return packBean;
     }
 

From 8570b887617877bbc4dea8f0ac84f81c837349ff Mon Sep 17 00:00:00 2001
From: wangjie <jhforever.wang@estsh.com>
Date: Fri, 20 Sep 2019 09:05:24 +0800
Subject: [PATCH 08/21] =?UTF-8?q?mes=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     |   8 +-
 .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java     |   8 +
 .../cn/estsh/i3plus/pojo/mes/bean/MesStatus.java   |  50 +++++
 .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java   |  12 ++
 .../i3plus/pojo/mes/bean/MesWorkOrderLog.java      | 222 +++++++++++++++++++++
 .../pojo/mes/model/MesWorkOrderButtonModel.java    |  10 +-
 .../mes/repository/MesWorkOrderLogRepository.java  |  17 ++
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  |  31 +--
 8 files changed, 338 insertions(+), 20 deletions(-)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStatus.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkOrderLogRepository.java

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index eca112e..905670b 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -394,9 +394,9 @@ public class MesEnumUtil {
 
         CREATE(10, "创建"),
         LANDED(20, "下达"),
-        OPEN(30, "开启"),
+        OPEN(30, "启动"),
         PAUSE(40, "暂停"),
-        CANCEL(50, "撤销"),
+        CANCEL(50, "取消"),
         CLOSE(60, "关闭");
 
         private int value;
@@ -552,7 +552,9 @@ public class MesEnumUtil {
 
         MES("MES", "来源于MES"),
         AMES("AMES", "来源于AMES"),
-        SAP("SAP", "来源于SAP");
+        SAP("SAP", "来源于SAP"),
+        CREATE("CREATE", "手工新增"),
+        RESOLVE("RESOLVE", "计划分解");
 
         private String value;
         private String description;
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java
index e28e0e0..dd8dc61 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java
@@ -119,6 +119,14 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("审批状态")
     private Integer approvalStatus;
 
+    @Column(name="CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name="CUST_ORDER_NO")
+    @ApiParam("客户订单号")
+    private String custOrderNo;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStatus.java
new file mode 100644
index 0000000..1f1d8c2
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStatus.java
@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :mes状态配置表
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-09-19
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_STATUS")
+@Api("系统业务动作")
+public class MesStatus extends BaseBean {
+    @Column(name="STATUS_CODE")
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @Column(name="STATUS_NAME")
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @Column(name="STATUS_VALUE")
+    @ApiParam("状态值")
+    private Integer statusValue;
+
+    @Column(name="STATUS_FIELD")
+    @ApiParam("状态字段")
+    private String statusField;
+
+    public int getStatusValueVal() {
+        return this.statusValue == null ? 0 : this.statusValue;
+    }
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
index 81037ba..308024e 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
@@ -132,6 +132,14 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("审批状态")
     private Integer approvalStatus;
 
+    @Column(name="CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name="CUST_ORDER_NO")
+    @ApiParam("客户订单号")
+    private String custOrderNo;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value="工作中心名称")
@@ -150,6 +158,10 @@ public class MesWorkOrder extends BaseBean {
     public String shiftName;
 
     @Transient
+    @ApiParam(value="班组名称")
+    public String shiftGroupName;
+
+    @Transient
     @ApiParam(value="产品配置名称")
     public String prodCfgName;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java
new file mode 100644
index 0000000..e48bba7
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java
@@ -0,0 +1,222 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-19-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_WORK_ORDER_LOG")
+@Api("生产工单日志")
+public class MesWorkOrderLog extends BaseBean {
+    @Column(name="ORDER_NO")
+    @ApiParam("工单号")
+    private String orderNo;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name="PROD_CFG_CODE")
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+
+    @Column(name="QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name="COMPLETE_QTY")
+    @ApiParam("完成数量")
+    private Double completeQty;
+
+    @Column(name="REPAIR_QTY")
+    @ApiParam("返修数量")
+    private Double repairQty;
+
+    @Column(name="SCRAP_QTY")
+    @ApiParam("报废数量")
+    private Double scrapQty;
+
+    @Column(name="SEQ")
+    @ApiParam("工单序号")
+    private Double seq;
+
+    @Column(name="WO_STATUS")
+    @ApiParam("工单状态")
+    private Integer workOrderStatus;
+
+    @Column(name="WO_TYPE")
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @Column(name="NEXT_ORDER")
+    @ApiParam("下一工单")
+    private String nextOrder;
+
+    @Column(name="PLAN_ORDER_NO")
+    @ApiParam("生产计划单号")
+    private String planOrderNo;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name="SCHEDULE_DATE")
+    @ApiParam("排产日期")
+    private String scheduleDate;
+
+    @Column(name="CUST_PROD_LINE_CODE")
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
+
+    @Column(name="SHIFT_CODE")
+    @ApiParam("班次")
+    private String shiftCode;
+
+    @Column(name="START_TIME")
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @Column(name="END_TIME")
+    @ApiParam("结束时间")
+    private String endTime;
+
+    @Column(name="WO_SOURCE")
+    @ApiParam("工单来源")
+    private String workOrderSource;
+
+    @Column(name="MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+    @Column(name="SHIFT_GROUP")
+    @ApiParam("班组")
+    private String shiftGroup;
+
+    @Column(name="APPROVAL_STATUS")
+    @ApiParam("审批状态")
+    private Integer approvalStatus;
+
+    @Column(name="CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name="CUST_ORDER_NO")
+    @ApiParam("客户订单号")
+    private String custOrderNo;
+
+    /**********************  冗余字段 *********************************/
+    @Transient
+    @ApiParam(value="工作中心名称")
+    public String workCenterName;
+
+    @Transient
+    @ApiParam(value="工作单元名称")
+    public String workCellName;
+
+    @Transient
+    @ApiParam(value="客户产线名称")
+    public String custProdLineName;
+
+    @Transient
+    @ApiParam(value="班次名称")
+    public String shiftName;
+
+    @Transient
+    @ApiParam(value="班组名称")
+    public String shiftGroupName;
+
+    @Transient
+    @ApiParam(value="产品配置名称")
+    public String prodCfgName;
+
+    @Transient
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59")
+    public String startTimeStart;
+
+
+    @Transient
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="计划开始日期查询用，查询截至日期",example = "2018-12-31 23:59:59")
+    public String startTimeEnd;
+
+    @Transient
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="计划结束日期查询用，查询结束日期起始",example = "2018-12-31 23:59:59")
+    public String endTimeStart;
+
+    @Transient
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59")
+    public String endTimeEnd;
+
+    @Transient
+    @ApiParam("mes生产工单页面按钮控制")
+    private MesWorkOrderButtonModel workOrderButtonModel;
+
+
+    public double getQtyVal() {
+        return this.qty == null ? 0.0d : this.qty;
+    }
+
+    public double getCompleteQtyVal() {
+        return this.completeQty == null ? 0.0d : this.completeQty;
+    }
+
+    public double getRepairQtyVal() {
+        return this.repairQty == null ? 0.0d : this.repairQty;
+    }
+
+    public double getScrapQtyVal() {
+        return this.scrapQty == null ? 0.0d : this.scrapQty;
+    }
+
+    public double getSeqVal() {
+        return this.seq == null ? 0.0d : this.seq;
+    }
+
+    public int getWorkOrderStatusVal() {
+        return this.workOrderStatus == null ? 0 : this.workOrderStatus;
+    }
+
+    public int getWorkOrderTypeVal() {
+        return this.workOrderType == null ? 0 : this.workOrderType;
+    }
+
+    public int getApprovalStatusVal() {
+        return this.approvalStatus == null ? 0 : this.approvalStatus;
+    }
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java
index 175de3e..1d37fff 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java
@@ -23,14 +23,14 @@ public class MesWorkOrderButtonModel implements Serializable {
     @ApiParam("修改按钮")
     private boolean updateButton;
 
-    @ApiParam("按配置修改按钮")
-    private boolean updateButton4Config;
+//    @ApiParam("按配置修改按钮")
+//    private boolean updateButton4Config;
 
     @ApiParam("下达按钮")
     private boolean transmitButton;
 
-    @ApiParam("测试动态下达按钮")
-    private boolean dynamicTransmitButton4Test;
+//    @ApiParam("测试动态下达按钮")
+//    private boolean dynamicTransmitButton4Test;
 
     @ApiParam("启动按钮")
     private boolean startUpButton;
@@ -38,7 +38,7 @@ public class MesWorkOrderButtonModel implements Serializable {
     @ApiParam("暂停按钮")
     private boolean suspendButton;
 
-    @ApiParam("撤销按钮")
+    @ApiParam("取消按钮")
     private boolean revokeButton;
 
     @ApiParam("关闭按钮")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkOrderLogRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkOrderLogRepository.java
new file mode 100644
index 0000000..c8a76e4
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkOrderLogRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-19-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesWorkOrderLogRepository extends BaseRepository<MesWorkOrderLog, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index fb9eb70..f6995fd 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -154,31 +154,38 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCellCode())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCellCode(), "workCellCode", packBean);
+        if (mesWorkOrder.getApprovalStatus() != null) {
+            DdlPreparedPack.getNumEqualPack(mesWorkOrder.getApprovalStatus(), "approvalStatus", packBean);
         }
         if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkOrder.getProdCfgCode())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkOrder.getProdCfgCode(), "prodCfgCode", packBean);
+        if (StringUtils.isNotEmpty(mesWorkOrder.getCustOrderNo())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean);
         }
         if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean);
         }
+        if (StringUtils.isNotEmpty(mesWorkOrder.getCreateUser())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean);
+        }
         if (mesWorkOrder.getIsValid() != null) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean);
         }
 
         // 时间段查询
-//        DdlPreparedPack.timeBuilder(
-//                mesWorkOrder.getStartTimeStart(),
-//                mesWorkOrder.getStartTimeEnd(),
-//                "startTime", packBean, true);
-//        DdlPreparedPack.timeBuilder(
-//                mesWorkOrder.getEndTimeStart(),
-//                mesWorkOrder.getEndTimeEnd(),
-//                "endTime", packBean, true);
+        DdlPreparedPack.timeBuilder(
+                mesWorkOrder.getStartTimeStart(),
+                mesWorkOrder.getStartTimeEnd(),
+                "startTime", packBean, true);
+        DdlPreparedPack.timeBuilder(
+                mesWorkOrder.getEndTimeStart(),
+                mesWorkOrder.getEndTimeEnd(),
+                "endTime", packBean, true);
+        DdlPreparedPack.timeBuilder(
+                mesWorkOrder.getCreateDateTimeStart(),
+                mesWorkOrder.getCreateDateTimeEnd(),
+                "createDatetime", packBean, true);
         DdlPreparedPack.getOrderDefault(mesWorkOrder);
         DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean);
         return packBean;

From f57dd8e999f46d8e602785664433ae98280e4322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com>
Date: Fri, 20 Sep 2019 09:38:40 +0800
Subject: [PATCH 09/21] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=A1=A8=E3=80=81=E5=BA=93=E5=AD=98=E6=9D=A1=E7=A0=81=E3=80=81?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E4=B8=89=E5=BC=A0=E8=A1=A8=E5=BF=AB?=
 =?UTF-8?q?=E7=85=A7=E6=97=B6=E9=97=B4=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java  | 5 +++++
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java   | 4 ++++
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java       | 4 ++++
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java    | 3 +++
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java      | 4 ++++
 5 files changed, 20 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
index d16a300..9fb8432 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
@@ -177,6 +177,11 @@ public class WmsMoveDetails extends BaseBean {
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
     public  Integer lockVersion;
+
+    @Transient
+    @ApiParam(value = "快照时间")
+    private String snapshotTime;
+
    /* @JSONField(name="fPartNo")
     public String getfPartNo() {
         return fPartNo;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
index 921d32d..783f5d4 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
@@ -148,6 +148,10 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam("获取数量大于0")
     private Integer qtyIdentity;
 
+    @Transient
+    @ApiParam(value = "快照时间")
+    private String snapshotTime;
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
index aab7504..a43c74b 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
@@ -188,6 +188,10 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam(value = "乐观锁", example = "1")
     public  Integer lockVersion;
 
+    @Transient
+    @ApiParam(value = "快照时间")
+    private String snapshotTime;
+
     public WmsMoveSn() {
     }
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
index cc09433..542f9f4 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
@@ -152,6 +152,9 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "移动单条码集合")
     private List<WmsMoveSn> wmsMoveSnList;
 
+    @Transient
+    @ApiParam(value = "快照时间")
+    private String snapshotTime;
 
     public String getAreaNo() {
         return areaNo;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index 6b721bd..db9b615 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -239,6 +239,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "目标数量")
     public Double destQty;
 
+    @Transient
+    @ApiParam(value = "快照时间")
+    private String snapshotTime;
+
     public WmsStockSn(){}
 
     public WmsStockSn(String partNo){

From f6e9dd03b441bf2746e4d79b88f711c5ef91e6cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com>
Date: Fri, 20 Sep 2019 10:10:03 +0800
Subject: [PATCH 10/21] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=BF=AB=E7=85=A7job?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E3=80=90=E4=BB=BB=E5=8A=A11011=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/wms/repository/IWmsCheckPointRepository.java  | 18 ++++++++++++++++++
 .../repository/IWmsMoveDetailsSnapshotRepository.java  | 18 ++++++++++++++++++
 .../repository/IWmsMoveMasterSnapshotRepository.java   | 18 ++++++++++++++++++
 .../wms/repository/IWmsMoveSnSnapshotRepository.java   | 18 ++++++++++++++++++
 .../repository/IWmsStockQuanSnapshotRepository.java    | 17 +++++++++++++++++
 .../wms/repository/IWmsStockSnSnapshotRepository.java  | 18 ++++++++++++++++++
 6 files changed, 107 insertions(+)
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsCheckPointRepository.java
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveDetailsSnapshotRepository.java
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveMasterSnapshotRepository.java
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveSnSnapshotRepository.java
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockQuanSnapshotRepository.java
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockSnSnapshotRepository.java

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsCheckPointRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsCheckPointRepository.java
new file mode 100644
index 0000000..1ce42ce
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsCheckPointRepository.java
@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsCheckPoint;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsStockQuanSnapshot;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 快照表
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsCheckPointRepository extends BaseRepository<WmsCheckPoint,Long> {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveDetailsSnapshotRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveDetailsSnapshotRepository.java
new file mode 100644
index 0000000..6cad3c1
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveDetailsSnapshotRepository.java
@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveDetailsSnapshot;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveMasterSnapshot;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 快照表
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsMoveDetailsSnapshotRepository extends BaseRepository<WmsMoveDetailsSnapshot,Long> {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveMasterSnapshotRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveMasterSnapshotRepository.java
new file mode 100644
index 0000000..dc4a0ef
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveMasterSnapshotRepository.java
@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveMasterSnapshot;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsStockSnSnapshot;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 快照表
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsMoveMasterSnapshotRepository extends BaseRepository<WmsMoveMasterSnapshot,Long> {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveSnSnapshotRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveSnSnapshotRepository.java
new file mode 100644
index 0000000..8e6dc83
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveSnSnapshotRepository.java
@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveDetailsSnapshot;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveSnSnapshot;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 快照表
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsMoveSnSnapshotRepository extends BaseRepository<WmsMoveSnSnapshot,Long> {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockQuanSnapshotRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockQuanSnapshotRepository.java
new file mode 100644
index 0000000..13b4bfe
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockQuanSnapshotRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsStockQuanSnapshot;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 库存信息快照
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsStockQuanSnapshotRepository extends BaseRepository<WmsStockQuanSnapshot,Long> {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockSnSnapshotRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockSnSnapshotRepository.java
new file mode 100644
index 0000000..4aacb33
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockSnSnapshotRepository.java
@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsCheckPoint;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsStockSnSnapshot;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 快照表
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsStockSnSnapshotRepository extends BaseRepository<WmsStockSnSnapshot,Long> {
+}

From 9b82b0be2a6d5c334a90e147d1f80ec645704fdf Mon Sep 17 00:00:00 2001
From: wangjie <jhforever.wang@estsh.com>
Date: Fri, 20 Sep 2019 11:47:34 +0800
Subject: [PATCH 11/21] =?UTF-8?q?mes=E7=8F=AD=E7=BB=84=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java    |  3 ---
 .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java   | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
index 308024e..13a3217 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -14,8 +13,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
-import java.util.Arrays;
-import java.util.List;
 
 /**
  * @Description:
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index f6995fd..0ee655a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -363,6 +363,24 @@ public class MesHqlPack {
     }
 
     /**
+     * MES班组信息查询条件封装
+     * @param shiftGroup
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesShiftGroup(MesShiftGroup shiftGroup, String organizeCode) {
+
+        DdlPackBean packBean = getAllBaseDataByNormalPro(shiftGroup, organizeCode);
+        if (StringUtils.isNotEmpty(shiftGroup.getGroupCode())) {
+            DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupCode(), "groupCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(shiftGroup.getGroupName())) {
+            DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean);
+        }
+        return packBean;
+    }
+
+    /**
      * MES班次休息信息查询条件封装
      *
      * @param shiftRest

From 37701bed628f3fb402654f9cbba421942aff0c9a Mon Sep 17 00:00:00 2001
From: WYnneaoapc <lu_1005@foxmail.com>
Date: Fri, 20 Sep 2019 11:57:02 +0800
Subject: [PATCH 12/21] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index eca112e..5133716 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -1037,9 +1037,10 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CONFIG_TYPE {
 
-        FASTDFS_SAVE_PATH(10, "savePath"),
-        NGINX_IP(20, "nginxIp");
-
+        FASTDFS_SAVE_PATH(10, "SAVE_PATH"),
+        NGINX_IP(20, "NGINX_IP"),
+        MES_STATION_SOCKET(30,"MES_STATION_SOCKET"),
+        GATEWAY_IP(40,"GATEWAY_IP");
         private int value;
         private String description;
 

From 53dd9cface0e506ff7e76b4382bb862599e57c27 Mon Sep 17 00:00:00 2001
From: "bleakney.liu" <bleakney.liu@estsh.com>
Date: Fri, 20 Sep 2019 15:22:20 +0800
Subject: [PATCH 13/21] =?UTF-8?q?add=20=E7=89=A9=E6=B5=81=E8=B7=AF?=
 =?UTF-8?q?=E7=BA=BFpojo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/wms/bean/WmsPartRouting.java |  2 +-
 .../estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 13 +++++----
 ...pository.java => WmsRoutingRuleRepository.java} |  2 +-
 .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java  | 32 ++++++++++++++++++++++
 4 files changed, 42 insertions(+), 7 deletions(-)
 rename modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/{WmsRoutingRoleRepository.java => WmsRoutingRuleRepository.java} (86%)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java
index 0be04b6..5adc7d5 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java
@@ -37,7 +37,7 @@ public class WmsPartRouting extends BaseBean {
 
     @Column(name = "ROUTING_CODE")
     @ApiParam(value = "线路编号")
-    private String areaNo;
+    private String routingCode;
  
 
     public WmsPartRouting(){}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
index d013c16..9d5414b 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
@@ -51,13 +51,13 @@ public class WmsRoutingRule extends BaseBean {
     @ApiParam(value = "规则类型(10 推动规则，20 补货规则)", example ="10")
     private Integer ruleType;
 
-    @Column(name = "ZONE_NO_SRC")
+    @Column(name = "SRC_ZONE_NO")
     @ApiParam(value = "源存储区")
-    private String zoneNoSrc;
+    private String srcZoneNo;
 
-    @Column(name = "ZONE_NO_TARGET")
+    @Column(name = "DEST_ZONE_NO")
     @ApiParam(value = "目标存储区" , example = "2")
-    private String zoneNoTarget;
+    private String destZoneNo;
 
     @Column(name = "OP_TYPE_CODE")
     @ApiParam(value = "作业类型" , example = "2")
@@ -79,7 +79,10 @@ public class WmsRoutingRule extends BaseBean {
     @ApiParam(value = "延迟时间单位(M:分钟，D:天)")
     private String delayUnit;
 
-   
+    @Column(name = "ROUTING_CODE")
+    @ApiParam(value = "线路代码")
+    private String routingCode;
+    
     public WmsRoutingRule(){}
 
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRuleRepository.java
similarity index 86%
rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java
rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRuleRepository.java
index f081961..5a8967f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRuleRepository.java
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface WmsRoutingRoleRepository extends BaseRepository<WmsRoutingRule ,Long> {
+public interface WmsRoutingRuleRepository extends BaseRepository<WmsRoutingRule ,Long> {
 
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index ced5ed7..38ae263 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -2359,4 +2359,36 @@ public class WmsHqlPack {
 
         return result;
     }
+    
+    
+    
+    /**
+     * 业务：库存查询封装
+     *
+     * @param wmsStockQuan
+     * @return
+     */
+    public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) {
+        DdlPackBean result = new DdlPackBean();
+
+     
+        DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
+  
+        getStringBuilderPack(wmsRouting, result);
+
+        return result;
+    }
+    
+    public static DdlPackBean packWmsRoutingRule(WmsRoutingRule wmsRoutingRule) {
+        DdlPackBean result = new DdlPackBean();
+
+     
+        DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result);
+//        DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
+  
+        getStringBuilderPack(wmsRoutingRule, result);
+
+        return result;
+    }
 }

From 2d911c425768c060fb0e326addab1fd92e4d2f1e Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Fri, 20 Sep 2019 15:40:33 +0800
Subject: [PATCH 14/21] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
index 1505f7f..cc0ebe0 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
@@ -363,8 +363,6 @@ public class AndonEnumUtil {
     }
 
 
-
-
     /**
      * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测
      */

From 9f0f6da4c7f27fc111ac932e1685910b47908b4b Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Fri, 20 Sep 2019 18:59:04 +0800
Subject: [PATCH 15/21] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=8E=9F=E5=9B=A0?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E9=A2=91=E6=AC=A1=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
index 27925ec..e03b224 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
+++ b/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;

From adf699f6188573b34099c7e1d4583c00f13177e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com>
Date: Fri, 20 Sep 2019 19:01:55 +0800
Subject: [PATCH 16/21] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E8=A1=A8?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=BF=AB=E7=85=A7=E4=B8=B4=E6=97=B6=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java   | 8 ++++++++
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java    | 7 +++++++
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java    | 7 +++++++
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 7 +++++++
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java   | 7 +++++++
 .../estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java | 3 ++-
 6 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
index 9fb8432..21a3c0b 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
@@ -182,6 +182,14 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam(value = "快照时间")
     private String snapshotTime;
 
+    @Transient
+    private Integer isSnapshot;
+
+    public Integer getIsSnapshot() {
+        return isSnapshot == null ? 0 : isSnapshot.intValue();
+    }
+
+
    /* @JSONField(name="fPartNo")
     public String getfPartNo() {
         return fPartNo;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
index 783f5d4..8c3b8a2 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
@@ -152,11 +152,18 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam(value = "快照时间")
     private String snapshotTime;
 
+    @Transient
+    private Integer isSnapshot;
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")
 //    public  Integer lockVersion;
 
+    public Integer getIsSnapshot() {
+        return isSnapshot == null ? 0 : isSnapshot.intValue();
+    }
+
     public WmsMoveMaster(){};
 
     public WmsMoveMaster(String orderNo, Integer orderStatus,  String transTypeCode, String errorMessage,
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
index a43c74b..d743cbe 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
@@ -192,6 +192,13 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam(value = "快照时间")
     private String snapshotTime;
 
+    @Transient
+    private Integer isSnapshot;
+
+    public Integer getIsSnapshot() {
+        return isSnapshot == null ? 0 : isSnapshot.intValue();
+    }
+
     public WmsMoveSn() {
     }
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
index 542f9f4..ffa452e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
@@ -156,6 +156,13 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "快照时间")
     private String snapshotTime;
 
+    @Transient
+    private Integer isSnapshot;
+
+    public Integer getIsSnapshot() {
+        return this.isSnapshot == null ? 0 : this.isSnapshot;
+    }
+
     public String getAreaNo() {
         return areaNo;
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index db9b615..53adc22 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -243,12 +243,19 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "快照时间")
     private String snapshotTime;
 
+    @Transient
+    private Integer isSnapshot;
+
     public WmsStockSn(){}
 
     public WmsStockSn(String partNo){
         this.partNo = partNo;
     }
 
+    public Integer getIsSnapshot() {
+        return isSnapshot == null ? 0 : isSnapshot.intValue();
+    }
+
     public Integer getSnType() { return snType == null ? 0 : snType.intValue();}
 
     public Double getQty() {
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java
index dddfab4..f7e6aac 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java
@@ -218,7 +218,7 @@ public class WmsStockQuanSnapshot extends BaseBean {
 
     public WmsStockQuanSnapshot(String whNo, String zoneNo, String unit, String partNo, String partName,
                                 Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty,
-                                Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
+                                Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty,String snapshotTime) {
         this.whNo = whNo;
         this.zoneNo = zoneNo;
         this.partNo = partNo;
@@ -235,6 +235,7 @@ public class WmsStockQuanSnapshot extends BaseBean {
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.prodCfgTypeName = prodCfgTypeName;
         this.scrapQty = scrapQty;
+        this.snapshotTime =snapshotTime;
     }
 
     public WmsStockQuanSnapshot(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {

From a9e369e71697259d8c4f79066f35950d2bb6115e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com>
Date: Fri, 20 Sep 2019 19:15:03 +0800
Subject: [PATCH 17/21] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA=E8=BD=AC=E6=8D=A2=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 406b93f..0137da0 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -830,6 +830,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**

From cf64f0118af02b429962cb8951f323a165cbfac6 Mon Sep 17 00:00:00 2001
From: WYnneaoapc <lu_1005@foxmail.com>
Date: Fri, 20 Sep 2019 20:40:10 +0800
Subject: [PATCH 18/21] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 28 +++++++++++++---------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index 8c0b5b2..e59a956 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -50,7 +50,6 @@ public class MesEnumUtil {
 
     /**
      * mes-pcn定时任务状态
-     *
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_PCN_TASK_STATUS {
@@ -115,7 +114,7 @@ public class MesEnumUtil {
         public static String valueOfDescription(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value.equals(val) ) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -932,15 +931,15 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STEP_PARAM_TYPE {
 
-        QUALIFIED(10,"number", "数字"),
-        DEFECTED(20, "text","字符串"),
-        SCRAPED(30,"select", "可选值");
+        QUALIFIED(10, "number", "数字"),
+        DEFECTED(20, "text", "字符串"),
+        SCRAPED(30, "select", "可选值");
 
         private int value;
         private String code;
         private String description;
 
-        STEP_PARAM_TYPE(int value,String code, String description) {
+        STEP_PARAM_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -950,7 +949,9 @@ public class MesEnumUtil {
             return value;
         }
 
-        public String getCode(){return code;}
+        public String getCode() {
+            return code;
+        }
 
         public String getDescription() {
             return description;
@@ -1040,9 +1041,14 @@ public class MesEnumUtil {
     public enum CONFIG_TYPE {
 
         FASTDFS_SAVE_PATH(10, "SAVE_PATH"),
-        NGINX_IP(20, "NGINX_IP"),
-        MES_STATION_SOCKET(30,"MES_STATION_SOCKET"),
-        GATEWAY_IP(40,"GATEWAY_IP");
+        NGINX_IP(20, "NGINX_HOST"),
+        MES_STATION_SOCKET(30, "mes_station_socket"),
+        GATEWAY_IP(40, "GATEWAY_HOST"),
+        UPDATE_SYNC_TIME(50, "UPDATE_SYNC_TIME"),
+        PCN_PULL(60, "PCN_PULL"),
+        PCN_PUSH(70, "PCN_PUSH"),
+        FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD");
+
         private int value;
         private String description;
 
@@ -1113,7 +1119,7 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum COMPANY_TYPE {
-        RULECODE("ruleCode","规则编码"),
+        RULECODE("ruleCode", "规则编码"),
         PREFIX("prefix", "前缀"),
         PART_NO("partNo", "物料号"),
         CUST_PART_NO("custPartNo", "客户物料号"),

From e02f2bfeee58a4f43b5a1f6ad3e8f14a8a1a7781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com>
Date: Sat, 21 Sep 2019 16:17:22 +0800
Subject: [PATCH 19/21] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=9D=A1=E7=A0=81?=
 =?UTF-8?q?=E5=AE=9E=E4=BD=93=E4=B8=B4=E6=97=B6=E5=AD=97=E6=AE=B5=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
index 4dd4bc7..ba26d44 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
@@ -93,4 +93,16 @@ public class WmsDocMovementSn extends BaseBean {
     @ApiParam(value = "散件移库输入移库数量")
     @Transient
     public Double inputMoveQty;
+
+    @Transient
+    @ApiParam("计划交货日期")
+    private String planDate;
+
+    @Transient
+    @ApiParam("计划交货时间")
+    private String planTime;
+
+    @Transient
+    @ApiParam("ERP库存地")
+    private String erpWhNo;
 }

From 310d0f0606d13679058218d750239baa5ce2fcea Mon Sep 17 00:00:00 2001
From: wangjie <jhforever.wang@estsh.com>
Date: Sat, 21 Sep 2019 18:30:11 +0800
Subject: [PATCH 20/21] =?UTF-8?q?mes=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 10 +++++++
 .../mes/model/MesWorkOrderApprovalDetailModel.java | 29 ++++++++++++++++++++
 .../pojo/mes/model/MesWorkOrderApprovalModel.java  | 31 ++++++++++++++++++++++
 3 files changed, 70 insertions(+)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderApprovalDetailModel.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderApprovalModel.java

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index e59a956..1083bf7 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -46,6 +46,16 @@ public class MesEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription2(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderApprovalDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderApprovalDetailModel.java
new file mode 100644
index 0000000..4cd8616
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderApprovalDetailModel.java
@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/9/20 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes生产工单审批页面数据明细封装model")
+public class MesWorkOrderApprovalDetailModel implements Serializable {
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("封装的数据值")
+    private String name;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderApprovalModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderApprovalModel.java
new file mode 100644
index 0000000..8ba92d4
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderApprovalModel.java
@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/9/20 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes生产工单审批页面数据封装model")
+public class MesWorkOrderApprovalModel implements Serializable {
+
+    @ApiParam("表头列名集合")
+    List<String> tableNames;
+
+    @ApiParam("所有行数据集合：多行数据是集合，每一个所有单元格是一个集合，一个单元格含有多条数据是一个集合")
+    List<List<List<MesWorkOrderApprovalDetailModel>>> detailModelsList;
+
+
+}

From 6b182cf4b5c2cbd2a7f037bd95d6cbf5761c29b4 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Mon, 23 Sep 2019 13:16:23 +0800
Subject: [PATCH 21/21] add fix controller bugs

---
 .../estsh/i3plus/pojo/aps/bean/DateDuration.java   | 381 +++++++++++++++++++++
 1 file changed, 381 insertions(+)
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DateDuration.java

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DateDuration.java
new file mode 100644
index 0000000..d394a8f
--- /dev/null
+++ b/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;
+    }
+}