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/28] 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/28] 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 0b8bc114bcf815cde30dade17a9d787d53a4e761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= <yunhao.wang@estsh.com>
Date: Fri, 20 Sep 2019 16:12:56 +0800
Subject: [PATCH 03/28] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/enumutil/BlockSoftSwitchEnumUtil.java     | 48 +++++++++++++++++++-
 .../i3plus/pojo/base/enumutil/CommonEnumUtil.java  | 10 +++++
 .../pojo/model/softswitch/BsSuitCaseModel.java     |  8 ++--
 .../pojo/model/softswitch/SuitServerModel.java     | 52 ++++++++++++++++++++--
 .../i3plus/pojo/softswitch/bean/BsSslKey.java      |  5 +++
 .../i3plus/pojo/softswitch/bean/BsSuitCase.java    |  2 +-
 .../pojo/softswitch/bean/BsSuitCaseParam.java      |  1 +
 .../pojo/softswitch/bean/BsSuitCaseREST.java       | 48 ++++++++++++++++++++
 8 files changed, 165 insertions(+), 9 deletions(-)
 create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
index 3d850d5..15e76a4 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
@@ -237,7 +237,7 @@ public class BlockSoftSwitchEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum VERIFICATION_METHOD{
-        LOGIN(1,"登录");
+        IMPP_LOGIN(1,"IMPP登录");
 
         private int value;
         private String description;
@@ -264,6 +264,16 @@ public class BlockSoftSwitchEnumUtil {
             }
             return tmp;
         }
+
+        public static VERIFICATION_METHOD valueOf(int val) {
+            VERIFICATION_METHOD tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
@@ -589,4 +599,40 @@ public class BlockSoftSwitchEnumUtil {
         }
     }
 
+    /**
+     * 请求方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REQUEST_METHOD{
+        GET(1,"GET"),
+        POST(2,"POST"),
+        PUT(3,"PUT"),
+        DELETE(4,"DELETE");
+
+        private int value;
+        private String description;
+
+        REQUEST_METHOD(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/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
index 2fff6a9..9dc921e 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
@@ -997,6 +997,16 @@ public class CommonEnumUtil {
             }
             return tmp;
         }
+
+        public static HTTP_METHOD_TYPE valueOf(int val) {
+            HTTP_METHOD_TYPE tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java
index f249f9f..810ec8a 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java
@@ -1,10 +1,7 @@
 package cn.estsh.i3plus.pojo.model.softswitch;
 
 import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService;
+import cn.estsh.i3plus.pojo.softswitch.bean.*;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -35,6 +32,9 @@ public class BsSuitCaseModel implements Serializable {
     @ApiParam(value = "Web Service 适配套件")
     private BsSuitCaseWebService webService;
 
+    @ApiParam(value = "REST 适配套件")
+    private BsSuitCaseREST bsSuitCaseREST;
+
     @ApiParam(value = "分页数据")
     private Pager pager;
 
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java
index fb0d0aa..a285dad 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java
@@ -1,6 +1,9 @@
 package cn.estsh.i3plus.pojo.model.softswitch;
 
+import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -19,10 +22,11 @@ import java.util.Map;
 public class SuitServerModel {
 
     // 执行方法命令
-    @ApiParam(value = "适配命令(枚举)")
-    private Integer actionId;
+    @ApiParam(value = "适配器code")
+    private String suitCaseCode;
     /* 认证使用 以后使用 */
     private String token;
+
     // 传输单对象
     private Object obj;
     // 传输集合
@@ -35,10 +39,52 @@ public class SuitServerModel {
     /**
      * 适配结果信息
      */
+    @XStreamImplicit
     private String suitMessage;
+
     /**
      * 适配状态码
      */
-    private String suitCaseStatusCode;
+    @XStreamImplicit
+    private String suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
+
+    /**
+     * 适配结果
+     */
+    @XStreamImplicit
+    private boolean suitSuccess = true;
+
+    /**
+     * 适配记录
+     */
+    @XStreamImplicit
+    private BsSuitRecord bsSuitRecord;
+
+    /**
+     * 适配器信息
+     */
+    @XStreamImplicit
+    private BsSuitCaseModel bsSuitCaseModel;
+
+    /**
+     * 请求来源
+     */
+    @XStreamImplicit
+    private Integer requestSource;
+
+    /**
+     * 适配方式
+     */
+    @XStreamImplicit
+    private Integer suitMethodId;
+
+    public int getSuitMethodIdVal(){
+        if(suitMethodId == null){
+            return -1;
+        }
+        return suitMethodId.intValue();
+    }
 
+    @XStreamImplicit
+    private String analyzeMessage;
 }
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java
index e422ef8..44820a8 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java
@@ -44,6 +44,11 @@ public class BsSslKey extends BaseBean {
     @ApiParam(value = "认证url")
     private String verificationUrl;
 
+    //CommonEnumUtil.HTTP_METHOD_TYPE
+    @Column(name = "REQUEST_METHOD_ID")
+    @ApiParam(value = "请求方式id")
+    private Integer requestMethodId;
+
     @Column(name = "KEY_TYPE_ID")
     @ApiParam(value = "证书类型枚举")
     private Integer keyTypeId;
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
index 396a89a..b22545b 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
@@ -58,7 +58,7 @@ public class BsSuitCase extends BaseBean {
     private Long suitTypeId;
 
     public long getSuitTypeIdVal(){
-        if(suitTypeId != null){
+        if(suitTypeId == null){
             return -1;
         }
         return suitTypeId.longValue();
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
index b3e6ce1..2d598e5 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 适配器出入参
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java
new file mode 100644
index 0000000..fad903c
--- /dev/null
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java
@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.softswitch.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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;
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-09-18 16:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BS_SUIT_CASE_REST")
+@Api(value = "适配器出入参", description = "适配器出入参")
+public class BsSuitCaseREST extends BaseBean {
+
+    @Column(name = "SUIT_CASE_ID")
+    @ApiParam(value = "套件id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitCaseId;
+
+    //CommonEnumUtil.HTTP_METHOD_TYPE
+    @Column(name = "REQUEST_METHOD_ID")
+    @ApiParam(value = "请求方式id")
+    private Integer requestMethodId;
+
+    @Transient
+    @ApiParam(value = "请求头转换")
+    private List<BsSuitCaseParam> requestHeaderList;
+}

From ec3ef597e8e4464e5e2ce73b55babd5abafd04e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= <gragon.xu@estsh.com>
Date: Sat, 21 Sep 2019 05:18:30 +0800
Subject: [PATCH 04/28] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=B7=A5=E5=8E=82?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java  | 39 ++++++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

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 53adc22..43dfd15 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
@@ -37,7 +37,7 @@ import java.util.List;
         @Index(columnList = "FIX_LOT_NO"),
         @Index(columnList = "DATE_CODE"),
         @Index(columnList = "VENDOR_NO")
-        })
+})
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
@@ -118,26 +118,26 @@ public class WmsStockSn extends BaseBean {
      */
     @Column(name = "QC_STATUS")
     @ApiParam(value = "质检状态", example = "0")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description")
     private Integer qcStatus;
     /**
      * 条码状态：1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
      */
     @Column(name = "SN_STATUS")
     @ApiParam(value = "条码状态", example = "0")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description")
     private Integer snStatus;
     /**
      * 1:已打印；2：未打印
      */
     @Column(name = "PRINTED")
     @ApiParam(value = "是否打印", example = "0")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     private Integer printed;
 
     @Column(name = "PDATE")
     @ApiParam(value = "打印时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date pdate;
     /**
      * 1=ASN,10=PO,20=SO
@@ -160,7 +160,7 @@ public class WmsStockSn extends BaseBean {
 
     @Column(name = "SN_TYPE")
     @ApiParam(value = "条码类型", example = "10")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description")
     private Integer snType = 10;
 
     @ApiParam(value = "仓库名称")
@@ -246,9 +246,10 @@ public class WmsStockSn extends BaseBean {
     @Transient
     private Integer isSnapshot;
 
-    public WmsStockSn(){}
+    public WmsStockSn() {
+    }
 
-    public WmsStockSn(String partNo){
+    public WmsStockSn(String partNo) {
         this.partNo = partNo;
     }
 
@@ -256,17 +257,33 @@ public class WmsStockSn extends BaseBean {
         return isSnapshot == null ? 0 : isSnapshot.intValue();
     }
 
-    public Integer getSnType() { return snType == null ? 0 : snType.intValue();}
+    public Integer getSnType() {
+        return snType == null ? 0 : snType.intValue();
+    }
 
     public Double getQty() {
         return qty == null ? 0L : qty.doubleValue();
     }
 
-    public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();}
+    public Double getInputNCQty() {
+        return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();
+    }
 
-    public WmsStockSn( Long snCount, Double sumPartQty,String locateNo) {
+    public WmsStockSn(Long snCount, Double sumPartQty, String locateNo) {
         this.snCount = snCount;
         this.sumPartQty = sumPartQty;
         this.locateNo = locateNo;
     }
+
+    //locate_no,part_no,sn_status,qc_status,sum(qty),is_deleted,is_valid
+    public WmsStockSn(String locateNo, String partNo, Integer snStatus,
+                      Integer qcStatus, Double qty, Integer isDeleted, Integer isValid) {
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.snStatus = snStatus;
+        this.qcStatus = qcStatus;
+        this.qty = qty;
+        this.isDeleted = isDeleted;
+        this.isValid = isValid;
+    }
 }

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 05/28] =?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 06/28] =?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 07/28] 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;
+    }
+}

From 0f82f3fbe5f0c5bf79d59f907885cb58ae6447ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com>
Date: Mon, 23 Sep 2019 17:18:05 +0800
Subject: [PATCH 08/28] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 ba26d44..a90feda 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
@@ -63,7 +63,7 @@ public class WmsDocMovementSn extends BaseBean {
     public String unit;
 
     /**
-     * 状态：操作状态
+     * 状态：操作状态  itemStatus
      */
     @Column(name="SN_STATUS")
     @ApiParam(value = "操作状态", example = "10")
@@ -105,4 +105,9 @@ public class WmsDocMovementSn extends BaseBean {
     @Transient
     @ApiParam("ERP库存地")
     private String erpWhNo;
+
+    @Column(name="SN_STATUS")
+    @ApiParam(value = "状态", example = "10")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
+    public Integer itemStatus;
 }

From 153238d31a1fbb18e2251c52bca66e49b403003a Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Mon, 23 Sep 2019 20:39:11 +0800
Subject: [PATCH 09/28] add integration to aps

---
 .../cn/estsh/i3plus/pojo/aps/bean/DataLink.java    | 52 ++++++++++++++++++++++
 .../estsh/i3plus/pojo/aps/bean/ExportDetail.java   | 38 ++++++++++++++++
 .../estsh/i3plus/pojo/aps/bean/ExportProject.java  | 26 +++++++++++
 .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java   | 32 +++++++++++++
 .../estsh/i3plus/pojo/aps/bean/ImportDetail.java   | 35 +++++++++++++++
 .../estsh/i3plus/pojo/aps/bean/ImportProject.java  | 26 +++++++++++
 .../i3plus/pojo/aps/enums/DATA_LINK_TYPE.java      |  8 ++++
 .../i3plus/pojo/aps/enums/IMPORT_DETAIL_TYPE.java  |  6 +++
 .../i3plus/pojo/aps/holders/EExportProject.java    |  6 +++
 .../i3plus/pojo/aps/holders/EImportProject.java    |  6 +++
 .../cn/estsh/i3plus/pojo/aps/model/APSPager.java   | 10 +++++
 .../pojo/aps/repository/DataLinkRepository.java    |  9 ++++
 .../aps/repository/ExportDetailRepository.java     |  9 ++++
 .../aps/repository/ExportProjectRepository.java    |  9 ++++
 .../aps/repository/ImportDetailRepository.java     |  9 ++++
 .../aps/repository/ImportProjectRepository.java    |  9 ++++
 .../src/main/resources/relations/ExportProject.xml |  7 +++
 .../src/main/resources/relations/ImportProject.xml |  7 +++
 .../src/main/resources/relations/Material.xml      |  4 +-
 19 files changed, 306 insertions(+), 2 deletions(-)
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DATA_LINK_TYPE.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/IMPORT_DETAIL_TYPE.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DataLinkRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExportDetailRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExportProjectRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportDetailRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportProjectRepository.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml
 create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java
new file mode 100644
index 0000000..5b38358
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java
@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.aps.enums.DATA_LINK_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 :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-23
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "APS_DATA_LINK")
+@Api("数据集成数据连接信息")
+public class DataLink extends BaseAPS {
+    @Column(name="NAME")
+    @ApiParam(value ="编码")
+    private String name;
+
+    @Column(name="TYPE")
+    @ApiParam(value ="链接类型")
+    private DATA_LINK_TYPE type;
+
+    @Column(name="PATH")
+    @ApiParam(value ="IP/文件路径")
+    private String path;
+
+    @Column(name="PORT")
+    @ApiParam(value ="端口")
+    private Integer port;
+
+    @Column(name="DB_NAME")
+    @ApiParam(value ="数据库名")
+    private String dbName;
+
+    @Column(name="USER_NAME")
+    @ApiParam(value ="用户名")
+    private String userName;
+
+    @Column(name="PASSWORD")
+    @ApiParam(value ="密码")
+    private String password;
+
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java
new file mode 100644
index 0000000..09486cf
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java
@@ -0,0 +1,38 @@
+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 :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-23
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "APS_EXPORT_DETAIL")
+@Api("数据导出明细")
+public class ExportDetail extends BaseAPS {
+    @Column(name="FILTER")
+    @ApiParam(value ="筛选")
+    private String filter;
+
+    @Column(name="SORT_BY")
+    @ApiParam(value ="排序")
+    private String sortBy;
+
+    @Column(name="OUT_NAME")
+    @ApiParam(value ="外部表名")
+    private String outName;
+
+    @Column(name="IN_NAME")
+    @ApiParam(value ="内部表名")
+    private String inName;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java
new file mode 100644
index 0000000..de41803
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java
@@ -0,0 +1,26 @@
+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 :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-23
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "APS_EXPORT_PROJECT")
+@Api("数据导出明细集合")
+public class ExportProject extends BaseAPS {
+    @Column(name="NAME")
+    @ApiParam(value ="标识名")
+    private String name;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
index 639004f..93abff0 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
@@ -4,11 +4,13 @@ import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 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 java.lang.reflect.Method;
@@ -28,14 +30,44 @@ import java.lang.reflect.Method;
 @Table(name="APS_FIELD_INFO")
 @Api("字段信息")
 public class FieldInfo extends BaseCode {
+    @Column(name="CLASS_NAME")
+    @ApiParam(value ="所属类简称")
     private String className;
+
+    @Column(name="TYPE")
+    @ApiParam(value ="类型")
     private FIELD_TYPE type;
+
+    @Column(name="TYPE_NAME")
+    @ApiParam(value ="类型全称")
+    private String typeName;
+
+    @Column(name="CUSTOMIZE")
+    @ApiParam(value ="是否为自定义字段")
     private Boolean customize;
+
+    @Column(name="MODIFY")
+    @ApiParam(value ="是否能修改")
     private Boolean modify;
+
+    @Column(name="DISPLAY")
+    @ApiParam(value ="是否在界面显示")
     private Boolean display;
+
+    @Column(name="PRIC")
+    @ApiParam(value ="浮点数显示精度")
     private Integer pric;
+
+    @Column(name="TIPS")
+    @ApiParam(value ="字段提示")
     private String tips;
+
+    @Column(name="EXPRESSION")
+    @ApiParam(value ="表达式")
     private String expression;
+
+    @Column(name="POSITION")
+    @ApiParam(value ="位置")
     private String position;
 
     @JsonIgnore
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java
new file mode 100644
index 0000000..b5cd53e
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java
@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.aps.enums.IMPORT_DETAIL_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 :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-23
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "APS_IMPORT_DETAIL")
+@Api("数据导入明细")
+public class ImportDetail extends BaseAPS {
+    @Column(name="TYPE")
+    @ApiParam(value ="导入类型")
+    private IMPORT_DETAIL_TYPE type;
+
+    @Column(name="OUT_NAME")
+    @ApiParam(value ="外部表名")
+    private String outName;
+
+    @Column(name="IN_NAME")
+    @ApiParam(value ="内部表名")
+    private String inName;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java
new file mode 100644
index 0000000..85cef48
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java
@@ -0,0 +1,26 @@
+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 :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-23
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "APS_IMPORT_PROJECT")
+@Api("数据导入明细集合")
+public class ImportProject extends BaseAPS {
+    @Column(name="NAME")
+    @ApiParam(value ="标识名")
+    private String name;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DATA_LINK_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DATA_LINK_TYPE.java
new file mode 100644
index 0000000..6e031cf
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DATA_LINK_TYPE.java
@@ -0,0 +1,8 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+public enum DATA_LINK_TYPE {
+    CSV,
+    MYSQL,
+    ORACLE,
+    SQLSERVER
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/IMPORT_DETAIL_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/IMPORT_DETAIL_TYPE.java
new file mode 100644
index 0000000..a23a8e9
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/IMPORT_DETAIL_TYPE.java
@@ -0,0 +1,6 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+public enum IMPORT_DETAIL_TYPE {
+    REPLACE,
+    DIFF
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java
new file mode 100644
index 0000000..be46ca5
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java
@@ -0,0 +1,6 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EExportProject {
+    Link,
+    Details
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java
new file mode 100644
index 0000000..5f00e96
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java
@@ -0,0 +1,6 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EImportProject {
+    Link,
+    Details
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java
new file mode 100644
index 0000000..2cc398b
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java
@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import lombok.Data;
+
+@Data
+public class APSPager extends Pager {
+    private String filter;
+    private String sort;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DataLinkRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DataLinkRepository.java
new file mode 100644
index 0000000..43953ec
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DataLinkRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.DataLink;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface DataLinkRepository extends CrudRepository<DataLink, Long> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExportDetailRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExportDetailRepository.java
new file mode 100644
index 0000000..59872a0
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExportDetailRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.ExportDetail;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ExportDetailRepository extends CrudRepository<ExportDetail, Long> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExportProjectRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExportProjectRepository.java
new file mode 100644
index 0000000..81f9f2e
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExportProjectRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.ExportProject;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ExportProjectRepository extends CrudRepository<ExportProject, Long> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportDetailRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportDetailRepository.java
new file mode 100644
index 0000000..ce52ae4
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportDetailRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.ImportDetail;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ImportDetailRepository extends CrudRepository<ImportDetail, Long> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportProjectRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportProjectRepository.java
new file mode 100644
index 0000000..9692d0f
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportProjectRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.ImportProject;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ImportProjectRepository extends CrudRepository<ImportProject, Long> {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml
new file mode 100644
index 0000000..4c21b36
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="ExportProject">
+    <Relation field="Link" name="DataLink" type="MULTI_TO_ONE">
+    </Relation>
+    <Relation field="Details" name="ExportDetail" 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/ImportProject.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml
new file mode 100644
index 0000000..8128db4
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="ImportProject">
+    <Relation field="Link" name="DataLink" type="MULTI_TO_ONE">
+    </Relation>
+    <Relation field="Details" name="ImportDetail" 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/Material.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml
index f5a2928..7d7cb1e 100644
--- a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml
@@ -1,5 +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>
+<Relation field="ProductRouting" name="ProductRouting" reverse="Material" type="ONE_TO_MULTI" owner="true">
+</Relation>
 </Class>
\ No newline at end of file

From d676bcf9740f5be23dfede4936703222b130037e Mon Sep 17 00:00:00 2001
From: wangjie <jhforever.wang@estsh.com>
Date: Mon, 23 Sep 2019 20:47:37 +0800
Subject: [PATCH 10/28] =?UTF-8?q?mes=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8B=E8=BE=BE=E9=85=8D=E7=BD=AE=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 78 +++++++++++++++++++++-
 .../bean/{MesStatus.java => MesButtonStatus.java}  | 42 +++++++-----
 .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java   |  4 ++
 .../mes/repository/MesButtonStatusRepository.java  | 17 +++++
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 15 +++++
 5 files changed, 139 insertions(+), 17 deletions(-)
 rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/{MesStatus.java => MesButtonStatus.java} (53%)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesButtonStatusRepository.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 1083bf7..1022a46 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
@@ -12,6 +12,82 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * mes按钮状态配置 判断符号
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_BUTTON_STATUS_JUDGE_FLAG {
+
+        EQUAL("=", "等于"),
+        NOT_EQUAL("!=", "不等于"),
+        GREATER_THAN(">", "大于"),
+        NOT_LESS_THAN(">=", "大于大于"),
+        LESS_THAN("<", "小于"),
+        NOT_GREATER_THAN("<=", "小于等于");
+
+        private String value;
+        private String description;
+
+        MES_BUTTON_STATUS_JUDGE_FLAG(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 (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * mes按钮状态配置 逻辑符号
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_BUTTON_STATUS_LOGIC_FLAG {
+
+        AND("&&", "逻辑与"),
+        OR("||", "逻辑或");
+
+        private String value;
+        private String description;
+
+        MES_BUTTON_STATUS_LOGIC_FLAG(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 (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * MesWorkOrder实体对应的approvalStatus值  审批状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -554,7 +630,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * MesPlanOrder实体对应的source值  计划来源
+     * MesWorkOrder实体对应的source值  计划来源
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_ORDER_SOURCE {
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/MesButtonStatus.java
similarity index 53%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStatus.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java
index 1f1d8c2..02745c0 100644
--- 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/MesButtonStatus.java
@@ -14,7 +14,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
- * @Description :mes状态配置表
+ * @Description :mes按钮状态配置表
  * @Reference :
  * @Author : wangjie
  * @CreateDate : 2019-09-19
@@ -25,26 +25,36 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="MES_STATUS")
-@Api("系统业务动作")
-public class MesStatus extends BaseBean {
-    @Column(name="STATUS_CODE")
-    @ApiParam("状态代码")
-    private String statusCode;
+@Table(name="MES_BUTTON_STATUS")
+@Api("按钮状态配置表")
+public class MesButtonStatus extends BaseBean {
 
-    @Column(name="STATUS_NAME")
-    @ApiParam("状态名称")
-    private String statusName;
+    @Column(name="BUTTON_CODE")
+    @ApiParam("按钮代码")
+    private String buttonCode;
 
-    @Column(name="STATUS_VALUE")
-    @ApiParam("状态值")
-    private Integer statusValue;
+    @Column(name="CLASS_NAME")
+    @ApiParam("实体类名称")
+    private String ClassName;
 
     @Column(name="STATUS_FIELD")
     @ApiParam("状态字段")
     private String statusField;
 
-    public int getStatusValueVal() {
-        return this.statusValue == null ? 0 : this.statusValue;
-    }
+    @Column(name="JUDGE_FLAG")
+    @ApiParam("判断符合")
+    private String judgeFlag;
+
+    @Column(name="STATUS_VALUE")
+    @ApiParam("状态值")
+    private String statusValue;
+
+    @Column(name="LOGIC_FLAG")
+    @ApiParam("逻辑符合")
+    private String logicFlag;
+
+    @Column(name="STATUS_DESC")
+    @ApiParam("描述")
+    private String statusDesc;
+
 }
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 13a3217..b22729f 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
@@ -187,6 +187,10 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("mes生产工单页面按钮控制")
     private MesWorkOrderButtonModel workOrderButtonModel;
 
+    @Transient
+    @ApiParam(value="下达按钮编号")
+    public String buttonCode;
+
 
     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/repository/MesButtonStatusRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesButtonStatusRepository.java
new file mode 100644
index 0000000..5b33393
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesButtonStatusRepository.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.MesButtonStatus;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :按钮条件配置
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-09-23
+ * @Modify:
+ **/
+@Repository
+public interface MesButtonStatusRepository extends BaseRepository<MesButtonStatus, 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 0ee655a..7fc2765 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
@@ -1215,4 +1215,19 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         return packBean;
     }
+
+    /**
+     * 按钮条件配置
+     *
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesButtonStatus(MesButtonStatus buttonStatus, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(buttonStatus, organizeCode);
+        if (StringUtils.isNotEmpty(buttonStatus.getButtonCode())) {
+            DdlPreparedPack.getStringLikerPack(buttonStatus.getButtonCode(), "buttonCode", packBean);
+        }
+        packBean.setOrderByStr(buttonStatus.orderBy());
+        return packBean;
+    }
 }

From 522efe67b6926fe01d433bea2c8199c5f3f85fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com>
Date: Tue, 24 Sep 2019 10:04:49 +0800
Subject: [PATCH 11/28] =?UTF-8?q?excel=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?--=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 a90feda..e6ba0ab 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
@@ -106,8 +106,7 @@ public class WmsDocMovementSn extends BaseBean {
     @ApiParam("ERP库存地")
     private String erpWhNo;
 
-    @Column(name="SN_STATUS")
-    @ApiParam(value = "状态", example = "10")
+    @Transient
     @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
     public Integer itemStatus;
 }

From f8b385d2748252dba8500c1b1f8d4096e98e1f60 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Tue, 24 Sep 2019 10:47:48 +0800
Subject: [PATCH 12/28] add integration to aps

---
 .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java    |  8 ++++++++
 .../cn/estsh/i3plus/pojo/aps/bean/BaseRule.java     |  2 ++
 .../cn/estsh/i3plus/pojo/aps/bean/DataLink.java     |  1 +
 .../cn/estsh/i3plus/pojo/aps/bean/DayShift.java     |  1 +
 .../cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java | 16 ++++++++++++++++
 .../estsh/i3plus/pojo/aps/bean/ExportProject.java   | 21 +++++++++++++++++++++
 .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java    |  1 +
 .../cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java |  1 +
 .../estsh/i3plus/pojo/aps/bean/ImportProject.java   |  1 +
 .../cn/estsh/i3plus/pojo/aps/bean/Material.java     |  1 +
 .../cn/estsh/i3plus/pojo/aps/bean/OperInput.java    |  1 +
 .../cn/estsh/i3plus/pojo/aps/bean/OperOutput.java   |  1 +
 .../cn/estsh/i3plus/pojo/aps/bean/OperResource.java |  1 +
 .../cn/estsh/i3plus/pojo/aps/bean/Operation.java    |  1 +
 .../i3plus/pojo/aps/bean/OvertimeCalendar.java      |  1 +
 .../cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java |  1 +
 .../estsh/i3plus/pojo/aps/bean/ProductRouting.java  |  1 +
 .../cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java  |  1 +
 .../cn/estsh/i3plus/pojo/aps/bean/Resource.java     |  1 +
 .../cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java    |  1 +
 .../estsh/i3plus/pojo/aps/bean/StandOperation.java  |  1 +
 .../cn/estsh/i3plus/pojo/aps/bean/SysParam.java     |  1 +
 .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java    | 16 ++++++++++++++++
 .../cn/estsh/i3plus/pojo/aps/bean/WorkInput.java    |  1 +
 .../cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java   |  1 +
 .../cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java |  1 +
 .../cn/estsh/i3plus/pojo/aps/bean/WorkResource.java |  1 +
 .../i3plus/pojo/aps/{bean => common}/BaseAPS.java   |  2 +-
 .../i3plus/pojo/aps/{bean => common}/BaseCode.java  |  2 +-
 .../i3plus/pojo/aps/holders/EExportDetail.java      |  5 +++++
 30 files changed, 92 insertions(+), 2 deletions(-)
 rename modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/{bean => common}/BaseAPS.java (92%)
 rename modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/{bean => common}/BaseCode.java (93%)
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java
index dbbfd15..aa093ab 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,11 +1,15 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import javax.persistence.Column;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description :订单基类
@@ -48,4 +52,8 @@ public class BaseOrder extends BaseAPS {
     @Column(name="RECEIVE_DATE")
     @ApiParam(value ="接单日期")
     private Date receiveDate;
+
+    public List<Work> getWorks() {
+        return BeanRelation.list(this, EBaseOrder.Works);
+    }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java
index 4c22dbe..451a8f4 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java
@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+
 /**
  * @Description :规则基类
  * @Reference :
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java
index 5b38358..3486531 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.enums.DATA_LINK_TYPE;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
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 8e4f1e5..ff9e9c0 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,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java
index 09486cf..d6926c9 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java
@@ -1,5 +1,8 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EExportDetail;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -35,4 +38,17 @@ public class ExportDetail extends BaseAPS {
     @Column(name="IN_NAME")
     @ApiParam(value ="内部表名")
     private String inName;
+
+    @Column(name="PROJECT_ID")
+    @ApiParam(value ="导出项目ID")
+    private Long projectId;
+
+    public ExportProject getProject() {
+        return BeanRelation.get(this, EExportDetail.Project);
+    }
+
+    public void setProject(ExportProject project) {
+        this.projectId = project != null ? project.getId() : 0l;
+        BeanRelation.set(this, EExportDetail.Project, project);
+    }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java
index de41803..7438e17 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java
@@ -1,5 +1,8 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EExportProject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -7,6 +10,7 @@ import lombok.Data;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.util.List;
 
 /**
  * @Description :数据导出明细集合
@@ -23,4 +27,21 @@ public class ExportProject extends BaseAPS {
     @Column(name="NAME")
     @ApiParam(value ="标识名")
     private String name;
+
+    @Column(name="LINK_ID")
+    @ApiParam(value ="数据源连接")
+    private Long linkId;
+
+    public DataLink getLink() {
+        return BeanRelation.get(this, EExportProject.Link);
+    }
+
+    public void setLink(DataLink link) {
+        this.linkId = link != null ? link.getId() : 0l;
+        BeanRelation.set(this, EExportProject.Link, link);
+    }
+
+    public List<ExportDetail> getDetails() {
+        return BeanRelation.list(this, EExportProject.Details);
+    }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
index 93abff0..664b43b 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java
index b5cd53e..102cd83 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.enums.IMPORT_DETAIL_TYPE;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java
index 85cef48..bb21896 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
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 9d0a98e..c0ae1a0 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
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 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;
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 5ee1d01..1c8cdc3 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,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
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 143141e..82ab4cf 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,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
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 4cf9c04..4de47b0 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,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
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 2c0b4f3..cba41d4 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,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
 import cn.estsh.i3plus.pojo.aps.enums.TAIL_DEAL;
 import io.swagger.annotations.Api;
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 0d4cfc5..1c17473 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,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.enums.CALENDAR_TYPE;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
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 a651c37..dd7e68d 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,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import lombok.Data;
 
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 64667de..88a415c 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,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
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 52920f1..7edd19f 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,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
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 d5dce47..5949b15 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,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 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;
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 0d40f77..70eb6ad 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,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import lombok.Data;
 
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 de95109..4a0d1e5 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,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 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;
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 cd62bbe..799f34a 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,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
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 1000974..60ca0c0 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,7 +1,10 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseCode;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.enums.WORK_STATUS;
 import cn.estsh.i3plus.pojo.aps.enums.WORK_TYPE;
+import cn.estsh.i3plus.pojo.aps.holders.EWork;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -90,4 +93,17 @@ public class Work extends BaseCode {
     @Column(name="PLAN_RESOURCE")
     @ApiParam(value ="计划主资源")
     private String planResource;
+
+    @Column(name="ORDER_ID")
+    @ApiParam(value ="订单")
+    private Long orderId;
+
+    public BaseOrder getOrder() {
+        return BeanRelation.get(this, EWork.Order);
+    }
+
+    public void setOrder(BaseOrder order) {
+        this.orderId = order != null ? order.getId() : 0l;
+        BeanRelation.set(this, EWork.Order, order);
+    }
 }
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 b58669d..b37c70d 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,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
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 bbd1456..16023ec 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,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
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 fb2a296..07095c3 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,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
 import cn.estsh.i3plus.pojo.aps.enums.WORK_RELATION_TYPE;
 import io.swagger.annotations.Api;
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 651a0b6..34842fb 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,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
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/common/BaseAPS.java
similarity index 92%
rename from modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseAPS.java
rename to modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java
index a32f16d..3b46af2 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/common/BaseAPS.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.aps.bean;
+package cn.estsh.i3plus.pojo.aps.common;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import lombok.Data;
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/common/BaseCode.java
similarity index 93%
rename from modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseCode.java
rename to modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java
index b98245e..b434092 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/common/BaseCode.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.aps.bean;
+package cn.estsh.i3plus.pojo.aps.common;
 
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java
new file mode 100644
index 0000000..70098c7
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java
@@ -0,0 +1,5 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EExportDetail {
+    Project
+}

From 4a78dfa4932bd4ac078f0947355a054eceb8a5bc Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Tue, 24 Sep 2019 11:18:05 +0800
Subject: [PATCH 13/28] add integration to aps

---
 .../cn/estsh/i3plus/pojo/aps/common/BeanInfo.java  | 271 +++++++++++++++++
 .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 241 ++++++++++++++++
 .../i3plus/pojo/aps/common/BeanRelationUtil.java   | 320 +++++++++++++++++++++
 .../i3plus/pojo/aps/common/RELATION_TYPE.java      |   9 +
 .../estsh/i3plus/pojo/aps/common/RelationInfo.java |  12 +
 5 files changed, 853 insertions(+)
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/RELATION_TYPE.java
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/RelationInfo.java

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java
new file mode 100644
index 0000000..9a60943
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java
@@ -0,0 +1,271 @@
+package cn.estsh.i3plus.pojo.aps.common;
+
+import cn.estsh.i3plus.pojo.aps.bean.DateDuration;
+import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+
+import java.util.*;
+
+public class BeanInfo {
+    private Class<? extends BaseBean> cls;
+    private BeanInfo superBeanInfo;
+    private List<BeanInfo> childsBeanInfos = new ArrayList<>();
+    private Map<Enum<?>, RelationInfo> relations = new HashMap<>();
+
+    public BeanInfo(Class<? extends BaseBean> cls) {
+        this.cls = cls;
+    }
+
+    public void initHolder(Class<Enum<? extends Enum<?>>> holderCls) {
+        Enum<? extends Enum<?>>[] ens = holderCls.getEnumConstants();
+        for (Enum<? extends Enum<?>> en : ens) {
+            RelationInfo info = new RelationInfo();
+            info.setHolder(en);
+            info.setBeanInfo(this);
+            relations.put(en, info);
+        }
+    }
+
+    public BeanInfo getSuperBeanInfo() { return superBeanInfo; }
+
+    public boolean validHolder(Enum<?> holder) {
+        return this.relations.get(holder) != null;
+    }
+
+    public Enum<?> getHolder(String name) {
+        for (Enum<?> holder : relations.keySet()) {
+            if (holder.name().equalsIgnoreCase(name)) {
+                return holder;
+            }
+        }
+        if (superBeanInfo != null) {
+            return  superBeanInfo.getHolder(name);
+        }
+
+        return null;
+    }
+
+    public Enum<?> getReverseHolder(Enum<?> holder) {
+        RelationInfo relaInfo = getRelationInfo(holder);
+        if (relaInfo != null) {
+            return relaInfo.getReverseHolder();
+        }
+        return null;
+    }
+
+    public Enum<?> getReverseHolder(String name) {
+        RelationInfo relaInfo = getRelationInfo(name);
+        if (relaInfo != null) {
+            return relaInfo.getReverseHolder();
+        }
+        return null;
+    }
+
+    public RelationInfo getRelationInfo(Enum<?> holder) {
+        if (validHolder(holder)) {
+            return relations.get(holder);
+        }
+        if (superBeanInfo != null) {
+            return  superBeanInfo.getRelationInfo(holder);
+        }
+        return null;
+    }
+
+    public RelationInfo getRelationInfo(String name) {
+        Enum<?> holder = getHolder(name);
+        if (holder != null) {
+            return getRelationInfo(holder);
+        }
+        return null;
+    }
+
+    public void addRelationInfo(Enum<?> holder, RelationInfo info) {
+        this.relations.put(holder, info);
+    }
+
+    public <T extends BaseBean> Class<T> getBeanClass() {
+        return (Class<T>)cls;
+    }
+
+    public BeanInfo getRelationBeanInfo(Enum<?> holder) {
+        RelationInfo relaInfo = getRelationInfo(holder);
+        if (relaInfo != null) {
+            return  relaInfo.getBeanInfo();
+        }
+        return null;
+    }
+
+    public BeanInfo getRelationBeanInfo(String name) {
+        RelationInfo relaInfo = getRelationInfo(name);
+        if (relaInfo != null) {
+            return  relaInfo.getBeanInfo();
+        }
+
+        return null;
+    }
+
+    public RELATION_TYPE getRelationType(Enum<?> holder) {
+        RelationInfo relaInfo = getRelationInfo(holder);
+        if (relaInfo != null) {
+            return relaInfo.getType();
+        }
+        return RELATION_TYPE.INVALID;
+    }
+
+    public RELATION_TYPE getRelationType(String name) {
+        RelationInfo relaInfo = getRelationInfo(name);
+        if (relaInfo != null) {
+            return relaInfo.getType();
+        }
+
+        return RELATION_TYPE.INVALID;
+    }
+
+    public List<Enum<?>> getAllHolders() {
+        List<Enum<?>> holders = new ArrayList<>();
+        for (Map.Entry<Enum<?>, RelationInfo> entry : relations.entrySet()) {
+            holders.add(entry.getKey());
+        }
+        return holders;
+    }
+
+    public List<Enum<?>> getOwnerHolders() {
+        List<Enum<?>> owners = new ArrayList<>();
+        for (Map.Entry<Enum<?>, RelationInfo> entry : relations.entrySet()) {
+            if (entry.getValue().isOwner()) {
+                owners.add(entry.getKey());
+            }
+        }
+        return owners;
+    }
+
+    public List<Enum<?>> getNormalSigns() {
+        List<Enum<?>> holders = new ArrayList<>();
+        for (Map.Entry<Enum<?>, RelationInfo> entry : relations.entrySet()) {
+            if (!entry.getValue().isOwner()) {
+                holders.add(entry.getKey());
+            }
+        }
+        return holders;
+    }
+
+    private static Map<Class<? extends BaseBean>, BeanInfo> beanInfos = new HashMap<>();
+    private static Map<String, BeanInfo> nameMapBeanInfos = new HashMap<>();
+
+    static {
+        BeanInfo beanInfo = new BeanInfo(BaseBean.class);
+        beanInfos.put(BaseBean.class, beanInfo);
+        nameMapBeanInfos.put(BaseBean.class.getSimpleName(), beanInfo);
+    }
+
+    public static void register(Class<? extends BaseBean> cls) {
+        if (beanInfos.containsKey(cls)) {
+            return;
+        }
+        BeanInfo beanInfo = new BeanInfo(cls);
+        beanInfos.put(cls, beanInfo);
+        nameMapBeanInfos.put(cls.getSimpleName(), beanInfo);
+        register((Class<? extends BaseBean>)cls.getSuperclass());
+    }
+
+    public static void init() {
+        for (Map.Entry<Class<? extends BaseBean>, BeanInfo> entry : beanInfos.entrySet()) {
+            Class<? extends BaseBean> superClass = (Class<? extends BaseBean>)entry.getKey().getSuperclass();
+            BeanInfo superBeanInfo = beanInfos.get(superClass);
+            if (superBeanInfo != null) {
+                entry.getValue().superBeanInfo = superBeanInfo;
+                superBeanInfo.childsBeanInfos.add(entry.getValue());
+            }
+        }
+
+        BeanRelationUtil.initData("cn.estsh.i3plus.pojo.aps.holders");
+        BeanRelationUtil.loadConfig("relations");
+    }
+
+    public static Set<Class<? extends BaseBean>> getBeanClasses() {
+        return beanInfos.keySet();
+    }
+
+    public static BeanInfo getBeanInfo(Class<? extends BaseBean> cls) {
+        BeanInfo info = beanInfos.get(cls);
+        return info;
+    }
+
+    public static BeanInfo getBeanInfo(String name) {
+        BeanInfo info = nameMapBeanInfos.get(name);
+        return info;
+    }
+
+    public static Class<? extends BaseBean> getSuperClass(Class<? extends BaseBean> cls) {
+        BeanInfo superBeanInfo = getBeanInfo(cls).superBeanInfo;
+        if (superBeanInfo != null) {
+            return superBeanInfo.getBeanClass();
+        }
+        return null;
+    }
+
+    public static FIELD_TYPE getFieldType(Class<?> cls) {
+        FIELD_TYPE type = null;
+        if (cls == Boolean.class || cls == boolean.class) {
+            type = FIELD_TYPE.BOOLEAN;
+        } else if (cls == Character.class) {
+            type = FIELD_TYPE.CHAR;
+        } else if (cls == Short.class || cls == short.class) {
+            type = FIELD_TYPE.SHORT;
+        } else if (cls == Integer.class || cls == int.class) {
+            type = FIELD_TYPE.INTEGER;
+        } else if (cls == Long.class || cls == long.class) {
+            type = FIELD_TYPE.LONG;
+        } else if (cls == Double.class || cls == Float.class ||
+                   cls == double.class || cls == float.class) {
+            type = FIELD_TYPE.DOUBLE;
+        } else if (cls == String.class) {
+            type = FIELD_TYPE.STRING;
+        } else if(cls == Date.class || cls == java.sql.Date.class) {
+            type = FIELD_TYPE.DATE_TIME;
+        } else if (cls == DateDuration.class) {
+            type = FIELD_TYPE.DURATION;
+        } else if (Enum.class.isAssignableFrom(cls)) {
+            type = FIELD_TYPE.ENUM;
+        } else if (BaseBean.class.isAssignableFrom(cls)) {
+            type = FIELD_TYPE.OBJECT;
+        }
+        return type;
+    }
+
+    public static Class<?> getFieldClass(FIELD_TYPE type) {
+        Class<?> cls = null;
+        switch (type) {
+            case BOOLEAN:
+                cls = Boolean.class;
+                break;
+            case CHAR:
+                cls = Character.class;
+                break;
+            case SHORT:
+                cls = Short.class;
+                break;
+            case INTEGER:
+                cls = Integer.class;
+                break;
+            case LONG:
+                cls = Long.class;
+                break;
+            case DOUBLE:
+                cls = Double.class;
+                break;
+            case DATE:
+            case TIME:
+            case DATE_TIME:
+                cls = Date.class;
+                break;
+            case STRING:
+                cls = String.class;
+                break;
+            default:
+                break;
+        }
+
+        return cls;
+    }
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java
new file mode 100644
index 0000000..915391e
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java
@@ -0,0 +1,241 @@
+package cn.estsh.i3plus.pojo.aps.common;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+
+public class BeanRelation {
+    Map<Class<? extends BaseBean>, Map<Long, Map<Enum<?>, List<BaseBean>>>> caches = new HashMap<>();
+
+    private static Map<Long, BeanRelation> relations = new ConcurrentHashMap<>();
+    private static BeanRelation get() {
+        Long userId = 0l;
+        BeanRelation relation = relations.get(userId);
+        if (relation == null) {
+            synchronized (BeanRelation.class) {
+                relation = relations.get(userId);
+                if (relation == null) {
+                    relation = new BeanRelation();
+                    relations.put(userId, relation);
+                }
+            }
+        }
+
+        return relation;
+    }
+
+    private static Map<Enum<?>, List<BaseBean>> createRelation(Class<? extends BaseBean> cls) {
+        return null;
+    }
+
+    public static Map<Enum<?>, List<BaseBean>> get(BaseBean bean) {
+        Map<Enum<?>, List<BaseBean>> temp = get().caches.get(bean.getClass()).get(bean.getId());
+        if (temp == null) {
+            synchronized (bean.getClass()) {
+                if (temp == null) {
+                    temp = createRelation(bean.getClass());
+                    get().caches.get(bean.getClass()).put(bean.getId(), temp);
+                }
+            }
+        }
+        return temp;
+    }
+
+    public static void init() {
+
+    }
+
+    public static <T extends BaseBean> T get(BaseBean bean, Enum<?> holder) {
+        List<T> beans = (List<T>)get(bean).get(holder);
+        if (beans == null || beans.isEmpty()) {
+            return null;
+        }
+        return beans.get(0);
+    }
+
+    public static <T extends BaseBean> T get(BaseBean bean, Enum<?> holder, Enum<?>... args) {
+        return get(bean, null, holder, args);
+    }
+
+    public static <T extends BaseBean> T get(BaseBean bean, Predicate<T> pred, Enum<?> holder, Enum<?>... args) {
+        return null;
+    }
+
+    private static <T extends BaseBean> T getImpl(BaseBean bean, Predicate<T> pred, Enum<?>[] args, int index) {
+        if (index >= args.length) {
+            if (pred == null || pred.test((T)bean)) {
+                return (T)bean;
+            }
+        } else {
+            //List<BaseAPS> relaBeans =
+        }
+
+        return null;
+    }
+
+    public static <T extends BaseBean> List<T> list(BaseBean bean, Enum<?> holder) {
+        List<T> beans = (List<T>)get(bean).get(holder);
+        if (beans == null) {
+            return new ArrayList<>();
+        }
+        return beans;
+    }
+
+    public static <T extends BaseBean> List<T> list(BaseBean bean, Enum<?> holder, Enum<?>... args) {
+        return list(bean, null, holder, args);
+    }
+
+    public static <T extends BaseBean> List<T> list(BaseBean bean, Predicate<T> pred, Enum<?> holder, Enum<?>... args) {
+        List<T> result = new ArrayList<>();
+        List<BaseBean> nextBeans = list(bean, holder);
+        for (BaseBean nextBean : nextBeans) {
+            listImpl(result, nextBean, pred, args, 0);
+        }
+
+        return result;
+    }
+
+    private static <T extends BaseBean> void listImpl(List<T> result, BaseBean bean, Predicate<T> pred, Enum<?>[] holders, int index) {
+        if (index >= holders.length) {
+            if (pred == null || pred.test((T)bean)) {
+                result.add((T)bean);
+            }
+        } else {
+            List<BaseBean> nextBeans = list(bean, holders[index]);
+            for (BaseBean nextBean : nextBeans) {
+                listImpl(result, nextBean, pred, holders, index + 1);
+            }
+        }
+    }
+
+    /**
+     * 设值两个对象之间的关联
+     *
+     * @param bean
+     * @param holder
+     * @param relaBean
+     */
+    public static void set(BaseBean bean, Enum<?> holder, BaseBean relaBean) {
+        if (bean == null) {
+            return;
+        }
+        if (relaBean == null) {
+            remove(bean, holder);
+        } else {
+            BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass());
+            final Enum<?> reverseHolder = beanInfo.getReverseHolder(holder);
+            switch (beanInfo.getRelationType(holder)) {
+                case MULTI_TO_MULTI:
+                    break;
+                case MULTI_TO_ONE:
+                    remove(bean, holder);
+                    break;
+                case INVALID:
+                    break;
+                case ONE_TO_MULTI:
+                    remove(relaBean, reverseHolder);
+                    break;
+                case ONE_TO_ONE:
+                    remove(bean, holder);
+                    remove(relaBean, reverseHolder);
+                    break;
+                default:
+                    break;
+            }
+
+            setImpl(bean, holder, relaBean, reverseHolder);
+        }
+    }
+
+    /**
+     * 建立对象之间双向引用实现
+     *
+     * @param bean
+     * @param holder
+     * @param relaBean
+     * @param reverseHolder
+     */
+    private static void setImpl(BaseBean bean, Enum<?> holder, BaseBean relaBean, Enum<?> reverseHolder) {
+        get(bean).get(holder).add(relaBean);
+        if (reverseHolder != null) {
+            get(relaBean).get(reverseHolder).add(bean);
+        }
+    }
+
+    /**
+     * 移除关联
+     *
+     * @param bean
+     * @param holder
+     */
+    private static void remove(BaseBean bean, Enum<?> holder) {
+        if (holder == null) {
+            return;
+        }
+        BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass());
+        final Enum<?> reverseHolder = beanInfo.getReverseHolder(holder);
+        if (reverseHolder != null) {
+            for (BaseBean relaBean : get(bean).get(holder)) {
+                if (relaBean == null) {
+                    continue;
+                }
+                get(relaBean).get(reverseHolder).remove(bean);
+            }
+        }
+        get(bean).get(holder).clear();
+    }
+
+    /**
+     * 移除关联的指定对象
+     *
+     * @param bean
+     * @param holder
+     * @param relaBean
+     */
+    private static void remove(BaseBean bean, Enum<?> holder, BaseBean relaBean) {
+        if (bean == null) {
+            return;
+        }
+        BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass());
+        final Enum<?> reverseHolder = beanInfo.getReverseHolder(holder);
+        if (reverseHolder != null) {
+            get(relaBean).get(reverseHolder).remove(bean);
+        }
+        get(bean).get(holder).remove(relaBean);
+    }
+
+    /**
+     * 删除对象
+     *
+     * @param bean
+     */
+    public static void delete(BaseBean bean) {
+        if (bean == null) {
+            return;
+        }
+        BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass());
+        List<Enum<?>> ownerSigns = beanInfo.getOwnerHolders();
+        for (Enum<?> holder : ownerSigns) {
+            List<BaseBean> relaBeans = new ArrayList<>(list(bean, holder));
+            for (BaseBean relaBean : relaBeans) {
+                //MemoryManager.delete(relaBean);
+            }
+        }
+
+        List<Enum<?>> normalSigns = beanInfo.getNormalSigns();
+        for (Enum<?> holder : normalSigns) {
+            Enum<?> reverseHolder = beanInfo.getReverseHolder(holder);
+            List<BaseBean> relaBeans = new ArrayList<>(list(bean, holder));
+            for (BaseBean relaBean : relaBeans) {
+                if (reverseHolder != null) {
+                    remove(relaBean, reverseHolder, bean);
+                }
+            }
+        }
+    }
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java
new file mode 100644
index 0000000..e2dba7e
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java
@@ -0,0 +1,320 @@
+package cn.estsh.i3plus.pojo.aps.common;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.JarURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+public class BeanRelationUtil {
+
+    static class XMLReader extends DefaultHandler {
+        private BeanInfo firstInfo = null;
+        private Enum<?> firstHolder = null;
+        private BeanInfo secondInfo = null;
+        private Enum<?> secondHolder = null;
+        private RELATION_TYPE type = RELATION_TYPE.INVALID;
+        private boolean owner = false;
+        public void startElement(String uri, String localName, String nodeName, Attributes attributes) throws SAXException {
+            if (nodeName.equalsIgnoreCase("Class")) {
+                final String name = attributes.getValue("name");
+                if (name == null) {
+                    throw new SAXException("Class节点的属性name未配置");
+                }
+
+                this.firstInfo = BeanInfo.getBeanInfo(name);
+                if (this.firstInfo == null) {
+                    throw new SAXException("未找到" + name + "的类定义");
+                }
+            } else if (nodeName.equalsIgnoreCase("Relation")) {
+                if (this.firstInfo == null) {
+                    throw new SAXException("未配置Class节点");
+                }
+
+                String firstSignName = attributes.getValue("field");
+                if (firstSignName == null) {
+                    throw new SAXException("Relation节点缺少field属性");
+                }
+                this.firstHolder = this.firstInfo.getHolder(firstSignName);
+                if (this.firstHolder == null) {
+                    throw new SAXException("未定义枚举标识" + firstSignName);
+                }
+
+                String secondFactoryName = attributes.getValue("name");
+                if (secondFactoryName == null) {
+                    throw new SAXException("Relation节点缺少name属性");
+                }
+                this.secondInfo = BeanInfo.getBeanInfo(secondFactoryName);
+                if (this.secondInfo == null) {
+                    throw new SAXException("未找到" + secondFactoryName + "的类定义");
+                }
+
+                String secondSignName = attributes.getValue("reverse");
+                if (secondSignName != null) {
+                    this.secondHolder = this.secondInfo.getHolder(secondSignName);
+                    if (this.secondHolder == null) {
+                        throw new SAXException(secondFactoryName + "类未定义枚举标识" + secondSignName);
+                    }
+                } else {
+                    this.secondHolder = null;
+                }
+
+                String typeName = attributes.getValue("type");
+                if (typeName == null) {
+                    throw new SAXException("Relation节点缺少type属性");
+                }
+                this.type = RELATION_TYPE.valueOf(typeName);
+
+                String ownerName = attributes.getValue("owner");
+                if (ownerName == null) {
+                    this.owner = false;
+                } else {
+                    this.owner = ownerName.equalsIgnoreCase("true") ? true : false;
+                }
+
+                RelationInfo firstData = this.getSignData(firstInfo, this.firstHolder);
+                firstData.setBeanInfo(this.secondInfo);
+                firstData.setType(this.type);
+                firstData.setOwner(this.owner);
+                firstData.setReverseHolder(this.secondHolder);
+
+                if (this.secondHolder != null) {
+                    RelationInfo secondData = this.getSignData(secondInfo, this.secondHolder);
+                    secondData.setBeanInfo(this.firstInfo);
+                    secondData.setOwner(false);
+                    secondData.setReverseHolder(this.firstHolder);
+                    switch (this.type) {
+                        case MULTI_TO_MULTI:
+                            secondData.setType(RELATION_TYPE.MULTI_TO_MULTI);
+                            break;
+                        case MULTI_TO_ONE:
+                            secondData.setType(RELATION_TYPE.ONE_TO_MULTI);
+                            break;
+                        case INVALID:
+                            secondData.setType(RELATION_TYPE.INVALID);
+                            break;
+                        case ONE_TO_MULTI:
+                            secondData.setType(RELATION_TYPE.MULTI_TO_ONE);
+                            break;
+                        case ONE_TO_ONE:
+                            secondData.setType(RELATION_TYPE.ONE_TO_ONE);
+                            break;
+                        default:
+                            secondData.setType(RELATION_TYPE.INVALID);
+                            break;
+                    }
+                }
+            }
+        }
+
+        RelationInfo getSignData(BeanInfo beanInfo, Enum<?> holder) {
+            RelationInfo data = beanInfo.getRelationInfo(holder);
+            if (data == null) {
+                data = new RelationInfo();
+                data.setHolder(holder);
+                beanInfo.addRelationInfo(holder, data);
+            }
+
+            return data;
+        }
+    }
+
+    public static void initData(String holderPackage) {
+        List<Class<?>> holderClses = loadClass(holderPackage);
+        for (Class<?> enumCls : holderClses) {
+            if (!Enum.class.isAssignableFrom(enumCls)) {
+                continue;
+            }
+            String name = enumCls.getSimpleName();
+            BeanInfo beanInfo = BeanInfo.getBeanInfo(name.substring(1));
+            if (beanInfo == null) {
+                continue;
+            }
+            beanInfo.initHolder((Class<Enum<? extends Enum<?>>>) enumCls);
+        }
+    }
+
+    public static void loadConfig(String packName) {
+        ClassLoader loader = Thread.currentThread().getContextClassLoader();
+        final String strFile = packName.replaceAll("\\.", "/");
+        try {
+            Enumeration<URL> urls = loader.getResources(strFile);
+            while (urls.hasMoreElements()) {
+                URL url = urls.nextElement();
+                if (url != null) {
+                    String protocol = url.getProtocol();
+                    String filePath = url.getPath();
+                    if (protocol.equals("file")) {
+                        loadFileImpl(filePath);
+                    } else if (protocol.equals("jar")) {
+                        loadJarImpl(packName, url);
+                    }
+                }
+            }
+        } catch (IOException e) {
+            return;
+        }
+    }
+
+    private static void loadFileImpl(String dirPath) {
+        File dir = new File(dirPath);
+        if (!dir.exists() || !dir.isDirectory()) {
+            return;
+        }
+
+        File[] dirFiles = dir.listFiles(new FileFilter() {
+
+            @Override
+            public boolean accept(File file) {
+                return file.isDirectory() || file.getName().endsWith(".xml");
+            }
+        });
+
+        for (File file : dirFiles) {
+            if (file.isDirectory()) {
+                loadFileImpl(dirPath + "/" + file.getName());
+            } else {
+                try {
+                    loadXMLConfigure(file.getCanonicalPath());
+                } catch (IOException e) {
+                }
+            }
+        }
+    }
+
+    private static void loadJarImpl(String packName, URL url) throws IOException {
+        JarURLConnection jarURLConnection = (JarURLConnection) url.openConnection();
+        JarFile jarFile = jarURLConnection.getJarFile();
+        Enumeration<JarEntry> jarEntries = jarFile.entries();
+        while (jarEntries.hasMoreElements()) {
+            JarEntry jarEntry = jarEntries.nextElement();
+            String jarEntryName = jarEntry.getName();
+            if (jarEntryName.endsWith(".xml")) {
+                String packNameNew =  packName.replace(".", "/");
+                if (jarEntryName.contains(packNameNew)) {
+                    InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(jarEntryName);
+                    loadXMLConfigure(is);
+                }
+            }
+        }
+    }
+
+    /**
+     * 加载本地开发环境中的xml配置文件。
+     * @param xmlPath
+     */
+    private static void loadXMLConfigure(String xmlPath) {
+        SAXParserFactory sf = SAXParserFactory.newInstance();
+        try {
+            SAXParser sp = sf.newSAXParser();
+            sp.parse(new InputSource(xmlPath), new XMLReader());
+        } catch (ParserConfigurationException | SAXException | IOException e) {
+        }
+    }
+
+    /**
+     * 加载jar中的xml配置文件。
+     * @param is
+     */
+    private static void loadXMLConfigure(InputStream is) {
+        SAXParserFactory sf = SAXParserFactory.newInstance();
+        try {
+            SAXParser sp = sf.newSAXParser();
+            sp.parse(new InputSource(is), new XMLReader());
+        } catch (ParserConfigurationException | SAXException | IOException e) {
+        }
+    }
+
+    /**
+     * 将指定包下的类加载到内存中
+     * @param packName
+     */
+    private static List<Class<?>> loadClass(String packName) {
+        List<Class<?>> clses = new ArrayList<>();
+        ClassLoader loader = Thread.currentThread().getContextClassLoader();
+        String strFile = packName.replaceAll("\\.", "/");
+        try {
+            Enumeration<URL> urls = loader.getResources(strFile);
+            while (urls.hasMoreElements()) {
+                URL url = urls.nextElement();
+                if (url != null) {
+                    String protocol = url.getProtocol();
+                    String filePath = url.getPath();
+                    if (protocol.equals("file")) {
+                        loadClassImpl(packName, filePath, clses);
+                    } else if (protocol.equals("jar")) {
+                        loadJarImpl(packName, url, clses);
+                    }
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return clses;
+    }
+
+    private static void loadClassImpl(String packName, String dirPath, List<Class<?>> clses) {
+        File dir = new File(dirPath);
+        if (!dir.exists() || !dir.isDirectory()) {
+            return;
+        }
+
+        File[] dirFiles = dir.listFiles(new FileFilter() {
+
+            @Override
+            public boolean accept(File file) {
+                return file.isDirectory() || file.getName().endsWith(".class");
+            }
+        });
+
+        for (File file : dirFiles) {
+            if (file.isDirectory()) {
+                loadClassImpl(packName + "." + file.getName(), dirPath + "/" + file.getName(), clses);
+            } else {
+                String clsName = file.getName();
+                clsName = clsName.substring(0, clsName.length() - 6);
+                try {
+                    clses.add(Class.forName(packName + "." + clsName));
+                } catch (ClassNotFoundException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    private static void loadJarImpl(String packName, URL url, List<Class<?>> clses) throws IOException {
+        JarURLConnection jarURLConnection = (JarURLConnection) url.openConnection();
+        JarFile jarFile = jarURLConnection.getJarFile();
+        Enumeration<JarEntry> jarEntries = jarFile.entries();
+        while (jarEntries.hasMoreElements()) {
+            JarEntry jarEntry = jarEntries.nextElement();
+            final String jarEntryName = jarEntry.getName();
+            if (jarEntryName.endsWith(".class")) {
+                String clsName = jarEntryName.replace("/", ".");
+                if (clsName.startsWith(packName)) {
+                    clsName = clsName.substring(0, clsName.length() - 6);
+                    try {
+                        clses.add(Class.forName(clsName));
+                    } catch (ClassNotFoundException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/RELATION_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/RELATION_TYPE.java
new file mode 100644
index 0000000..9b5296e
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/RELATION_TYPE.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.common;
+
+public enum RELATION_TYPE {
+    INVALID,    // 无效关联
+    ONE_TO_ONE,	// 1对1关系
+    ONE_TO_MULTI,	// 1对多关系
+    MULTI_TO_ONE,	// 多对1关系
+    MULTI_TO_MULTI,// 多对多关系
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/RelationInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/RelationInfo.java
new file mode 100644
index 0000000..503afb4
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/RelationInfo.java
@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.pojo.aps.common;
+
+import lombok.Data;
+
+@Data
+public class RelationInfo {
+    private BeanInfo beanInfo;
+    private Enum<?> holder;
+    private Enum<?> reverseHolder;
+    private RELATION_TYPE type;
+    private boolean owner;
+}

From e5a20d47339d5dca7c4cb971f39c360b389e5d9b Mon Sep 17 00:00:00 2001
From: wangjie <jhforever.wang@estsh.com>
Date: Tue, 24 Sep 2019 13:17:45 +0800
Subject: [PATCH 14/28] =?UTF-8?q?=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

---
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java   | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

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 7fc2765..9b9d0e1 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
@@ -1230,4 +1230,25 @@ public class MesHqlPack {
         packBean.setOrderByStr(buttonStatus.orderBy());
         return packBean;
     }
+
+    /**
+     * 工单审批查询
+     * @param mesWorkOrder
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getApprovalData(MesWorkOrder mesWorkOrder, String organizeCode) {
+        DdlPackBean packBean = MesHqlPack.getAllBaseData(organizeCode);
+        DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean);
+        if (!org.springframework.util.StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
+            DdlPreparedPack.getStringEqualPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
+        }
+        if (!org.springframework.util.StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(), "partNo", packBean);
+        }
+        DdlPreparedPack.getNumEqualPack(MesEnumUtil.WORK_ORDER_APPROVAL_STATUS.WAIT_APPROVAL.getValue(), "approvalStatus", packBean);
+        DdlPreparedPack.getNumEqualPack(MesEnumUtil.WORK_ORDER_STATUS.CREATE.getValue(), "workOrderStatus", packBean);
+        DdlPreparedPack.getOrderByPack(new String[]{String.valueOf(CommonEnumUtil.ASC_OR_DESC.ASC.getValue())}, new String[]{"startTime", "shiftCode"}, packBean);
+        return packBean;
+    }
 }

From 704d4f209878e2c14d2132b64191c5d9accd8818 Mon Sep 17 00:00:00 2001
From: wangjie <jhforever.wang@estsh.com>
Date: Tue, 24 Sep 2019 18:51:56 +0800
Subject: [PATCH 15/28] =?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

---
 .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java       | 1 +
 1 file changed, 1 insertion(+)

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 9b9d0e1..f9279e6 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
@@ -74,6 +74,7 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesPlanOrder.getStatus() + "") && mesPlanOrder.getStatusVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatus(), "status", packBean);
         }
+
         if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) {
             DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCreateUser(), "createUser", packBean);
         }

From 750a216fd27f5e443ba7406c5b3a64c6aafca980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= <gragon.xu@estsh.com>
Date: Tue, 24 Sep 2019 21:26:05 +0800
Subject: [PATCH 16/28] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=92=8C=E6=BA=90=E5=AD=98=E5=82=A8=E5=8C=BA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=88=E7=9B=98=E7=82=B9=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java   | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java
index dad2ec7..57f0870 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java
@@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.model.wms;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Column;
 import java.io.Serializable;
 
 /**
@@ -27,7 +26,6 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam("作业类型名称")
     public String opTypeName;
 
-    @Column(name = "TRANS_TYPE_CODE")
     @ApiParam(value = "交易类型代码")
     private String transTypeCode;
 
@@ -37,30 +35,33 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam(value = "关联单据业务类型")
     private String busiTypeDesc;
 
-    @Column(name = "ZDATE")
     @ApiParam(value = "计划日期")
     private String zdate;
 
-    @Column(name = "ZTIME")
     @ApiParam(value = "计划时间")
     private String ztime;
 
-    @Column(name = "CUST_NO")
     @ApiParam(value = "客户编号")
     private String custNo;
 
-    @Column(name = "VENDOR_NO")
     @ApiParam(value = "供应商编号")
     private String vendorNo;
 
     @ApiParam(value = "样式")
     private WmsMessageStyleModel wmsMessageStyleModel;
 
+    @ApiParam(value = "源存储区代码")
+    private String srcZoneNo;
+
+    @ApiParam(value = "创建日期")
+    public String createDatetime;
+
     public WmsTaskInfoModel() {
     }
 
     public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
-                            String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo) {
+                            String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo,
+                            String createDatetime, String srcZoneNo) {
         this.orderNo = orderNo;
         this.taskStatus = taskStatus;
         this.opTypeName = opTypeName;
@@ -71,5 +72,7 @@ public class WmsTaskInfoModel implements Serializable {
         this.ztime = ztime;
         this.custNo = custNo;
         this.vendorNo = vendorNo;
+        this.createDatetime = createDatetime;
+        this.srcZoneNo = srcZoneNo;
     }
 }

From 31b32be60d186e77f362e52bfc7003f4b5d49989 Mon Sep 17 00:00:00 2001
From: lbwgithub <你的邮箱1002117856@qq.com>
Date: Wed, 25 Sep 2019 10:03:27 +0800
Subject: [PATCH 17/28] =?UTF-8?q?=E9=A2=9C=E8=89=B2=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java
index 4847751..1911b04 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java
@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.model.wms;
 
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.ApiParam;
+import io.swagger.models.auth.In;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -20,7 +21,8 @@ public class WmsMessageStyleModel implements Serializable {
     public Integer taskStatus;
     @ApiParam("单据明细状态")
     public Integer odStatus;
-
+    @ApiParam("扫码明细状态")
+    public Integer wsStatus;
     @ApiParam("消息")
     public String message;
 
@@ -37,7 +39,15 @@ public class WmsMessageStyleModel implements Serializable {
 
     public WmsMessageStyleModel() {
     }
-
+    public WmsMessageStyleModel(String message, Integer selectQty) {
+        this.message = message;
+        if(selectQty==1){
+        this.wsStatus=10;
+     }
+     if(selectQty==2){
+         this.wsStatus=20;
+     }
+    }
     public WmsMessageStyleModel(String message) {
         this.message = message;
     }

From 7c472b386a26f3a69c75f8c38a3a7bc64b708a71 Mon Sep 17 00:00:00 2001
From: WYnneaoapc <lu_1005@foxmail.com>
Date: Wed, 25 Sep 2019 14:18:48 +0800
Subject: [PATCH 18/28] =?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     |  45 ++++++
 .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java  | 153 +++++++++++++++++++++
 .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesDB.java   |  62 +++++++++
 .../i3plus/pojo/mes/pcn/bean/MesDataObject.java    |  42 ++++++
 .../i3plus/pojo/mes/pcn/bean/MesObjectCfg.java     |  55 ++++++++
 .../estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java |  54 ++++++++
 .../i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java |  78 +++++++++++
 .../i3plus/pojo/mes/pcn/bean/MesWcEquipment.java   |  41 ++++++
 .../i3plus/pojo/mes/pcn/bean/MesWorkCenter.java    |   5 +
 .../i3plus/pojo/mes/pcn/model/ProcessBomModel.java |  29 ++++
 .../i3plus/pojo/mes/pcn/model/WcCheckModel.java    |  89 ++++++++++++
 .../pcn/repository/MesWcCheckRecordRepository.java |  13 ++
 .../mes/pcn/repository/MesWcCheckRepository.java   |  13 ++
 .../java/cn/estsh/i3plus/pojo/mes/bean/MesDB.java  |  62 +++++++++
 .../estsh/i3plus/pojo/mes/bean/MesDataObject.java  |  42 ++++++
 .../estsh/i3plus/pojo/mes/bean/MesObjectCfg.java   |  55 ++++++++
 .../cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java  |  54 ++++++++
 .../i3plus/pojo/mes/bean/MesWcCheckRecord.java     |  78 +++++++++++
 .../estsh/i3plus/pojo/mes/bean/MesWcEquipment.java |  42 ++++++
 .../estsh/i3plus/pojo/mes/bean/MesWorkCenter.java  |   4 +
 .../mes/repository/MesWcCheckRecordRepository.java |  13 ++
 .../pojo/mes/repository/MesWcCheckRepository.java  |  13 ++
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  |  21 ++-
 23 files changed, 1062 insertions(+), 1 deletion(-)
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDB.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProcessBomModel.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDB.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCheckRecordRepository.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCheckRepository.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..b955d47 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
@@ -1150,4 +1150,49 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * WC_CHECK_TYPE 开线检查的模块
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WC_CHECK_TYPE {
+
+        PERSON(10, "person", "人"),
+        EQUIPMENT(20, "equipment", "机"),
+        MATERIAL(30, "material", "料"),
+        ROUTE(40, "route", "法"),
+        ONLINE_SIGNAL(50, "onlineSignal", "开线信号");
+
+        private int value;
+        private String code;
+        private String description;
+
+        WC_CHECK_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;
+        }
+    }
+
 }
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 ba4e524..f9dbb36 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
@@ -344,5 +344,158 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * MesWorkCenter 工作中心运行状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CENTER_RUNNING_STATUS {
+
+        RUNNING(1, "开线"),
+        STOPPED(2, "停线");
+
+        private int value;
+        private String description;
+
+        WORK_CENTER_RUNNING_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;
+        }
+    }
+
+    /**
+     * WC_CHECK_TYPE 开线检查的模块
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WC_CHECK_TYPE {
+
+        PERSON(10, "person", "人"),
+        EQUIPMENT(20, "equipment", "机"),
+        MATERIAL(30, "material", "料"),
+        ROUTE(40, "route", "法"),
+        ONLINE_SIGNAL(50, "onlineSignal", "开线信号");
+
+        private int value;
+        private String code;
+        private String description;
+
+        WC_CHECK_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;
+        }
+    }
+
+    /**
+     * 开线检查
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ONLINE_SIGNAL {
+
+        CHECK(10, "检查"),
+        NON_CHECK(20, "不检查");
+
+        private int value;
+        private String description;
+
+        ONLINE_SIGNAL(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;
+        }
+    }
+
+    /**
+     * 开线检查
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IS_WCCHECK_PASS {
+
+        PASS(10, "通过"),
+        NON_PASS(20, "不通过");
+
+        private int value;
+        private String description;
+
+        IS_WCCHECK_PASS(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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDB.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDB.java
new file mode 100644
index 0000000..18cd750
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDB.java
@@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/24 7:17 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DB")
+@Api("地址清单")
+public class MesDB extends BaseBean {
+
+    @Column(name="DS_CODE")
+    @ApiParam("数据源代码")
+    private String dsCode;
+
+    @Column(name="DS_NAME")
+    @ApiParam("数据源名称")
+    private String dsName;
+
+    @Column(name="DS_TYPE")
+    @ApiParam("数据源类型")
+    private String dsType;
+
+    @Column(name="DS_HOST")
+    @ApiParam("主机")
+    private String dsHost;
+
+    @Column(name="DS_PORT")
+    @ApiParam("端口")
+    private Integer dsPort;
+
+    @Column(name="DS_USER")
+    @ApiParam("用户名")
+    private String dsUser;
+
+    @Column(name="DS_PASSWORD")
+    @ApiParam("密码")
+    private String dsPassword;
+
+    @Column(name="EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java
new file mode 100644
index 0000000..b964d08
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java
@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/24 7:12 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DATA_OBJECT")
+@Api("数据对象")
+public class MesDataObject extends BaseBean {
+
+    @Column(name="OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+
+    @Column(name="OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @Column(name="DS_CODE")
+    @ApiParam("数据源代码")
+    private String dsCode;
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java
new file mode 100644
index 0000000..1dec08d
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java
@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/24 7:14 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_OBJECT_CFG")
+@Api("对象结构")
+public class MesObjectCfg extends BaseBean {
+
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "FIELD_CODE")
+    @ApiParam("字段代码")
+    private String fieldCode;
+
+    @Column(name = "FIELD_NAME")
+    @ApiParam("字段名称")
+    private String fieldName;
+
+    @Column(name = "FIELD_TYPE")
+    @ApiParam("字段类型")
+    private String fieldType;
+
+    @Column(name = "FIELD_LENGTH")
+    @ApiParam("列长度")
+    private String fieldLength;
+
+    @Column(name = "FIELD_PK")
+    @ApiParam("主键标记")
+    private String fieldPk;
+
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java
new file mode 100644
index 0000000..1d92aea
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java
@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/21 1:45 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WC_CHECK")
+@Api("开线检查")
+public class MesWcCheck extends BaseBean {
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name="PART_NO")
+    @ApiParam("产品物料号")
+    private String partNo;
+
+    @Column(name="CHECK_TYPE")
+    @ApiParam("检查类型")
+    private String checkType;
+
+    @Column(name="CHECK_OBJ")
+    @ApiParam("检查对象")
+    private String checkObj;
+
+    @Column(name="CHECK_ITEM")
+    @ApiParam("检查项")
+    private String checkItem;
+
+    @Column(name="STANDARD")
+    @ApiParam("检查标准")
+    private String standard;
+
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java
new file mode 100644
index 0000000..d52c590
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java
@@ -0,0 +1,78 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/21 1:57 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WC_CHECK_RECORD")
+@Api("开线检查记录")
+public class MesWcCheckRecord extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_ORDER")
+    @ApiParam("工单号")
+    private String workOrder;
+
+    @Column(name = "PART_NO")
+    @ApiParam("产品物料号")
+    private String partNo;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检查类型")
+    private String checkType;
+
+    @Column(name = "CHECK_OBJ")
+    @ApiParam("检查对象")
+    private String checkObj;
+
+    @Column(name = "CHECK_ITEM")
+    @ApiParam("检查项")
+    private String checkItem;
+
+    @Column(name = "STANDARD")
+    @ApiParam("检查标准")
+    private String standard;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam("检查结果")
+    private String checkResult;
+
+    @Column(name = "CHECK_VALUE")
+    @ApiParam("检查值")
+    private String checkValue;
+
+    @Column(name = "REASON")
+    @ApiParam("原因")
+    private String reason;
+
+    @Column(name = "GROUP_CODE")
+    @ApiParam("组名")
+    private String groupCode;
+
+    @Column(name = "OVERALL_RESULT")
+    @ApiParam("总体结果")
+    private Integer overAllResult;
+
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java
new file mode 100644
index 0000000..11e5acd
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java
@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/24 2:31 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WC_EQUIPMENT")
+@Api("工作单元设备关系表")
+public class MesWcEquipment extends BaseBean {
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name="EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java
index d28d53b..1e447b8 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java
@@ -46,4 +46,9 @@ public class MesWorkCenter extends BaseBean {
     @Column(name = "AREA_CODE")
     @ApiParam("生产区域代码")
     private String areaCode;
+
+    @Column(name="RUNNING_STATUS")
+    @ApiParam("运行状态")
+    private Integer runningStatus;
+
 }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProcessBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProcessBomModel.java
new file mode 100644
index 0000000..9708b49
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProcessBomModel.java
@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProcessBom;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/21 3:11 PM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("工序BOM model")
+public class ProcessBomModel extends MesProcessBom {
+
+    @ApiParam("上料数量")
+    private Long cellFeedQty;
+
+    @ApiParam("是否上料数量满足")
+    private Boolean isFeedSatisfied;
+
+
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java
new file mode 100644
index 0000000..64151f9
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java
@@ -0,0 +1,89 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+
+import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheckRecord;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.*;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/23 8:06 PM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("开线管控model")
+public class WcCheckModel {
+
+    @ApiParam("人")
+    private List<MesWcCheckRecord> people;
+    @ApiParam("人 列")
+    private Map<String, String> peopleColumn;
+
+    @ApiParam("机")
+    private List<MesWcCheckRecord> equipments;
+    @ApiParam("机 列")
+    private Map<String, String> equipmentsColumn;
+
+    @ApiParam("物料")
+    private List<MesWcCheckRecord> materials;
+    @ApiParam("物料 列")
+    private Map<String, String> materialsColumn;
+
+    @ApiParam("法")
+    private List<MesWcCheckRecord> routes;
+    @ApiParam("法 列")
+    private Map<String, String> routesColumn;
+
+    @ApiParam("对象list和列关系")
+    private Map<String, String> dataColumnRelation;
+
+    @ApiParam("开线信号")
+    private Integer onlineSignal;
+
+    @ApiParam("是否通过")
+    private Integer isPass;
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("工单")
+    private String workOrder;
+
+    @ApiParam("工单零件数量")
+    private Long qty;
+
+    @ApiParam("产品号")
+    private String partNo;
+
+
+    public WcCheckModel initialWcCheckModel() {
+        WcCheckModel wcCheckModel = new WcCheckModel();
+        wcCheckModel.setPeople(new ArrayList<>());
+        wcCheckModel.setEquipments(new ArrayList<>());
+        wcCheckModel.setMaterials(new ArrayList<>());
+        wcCheckModel.setRoutes(new ArrayList<>());
+        wcCheckModel.setPeopleColumn(new HashMap<>());
+        wcCheckModel.setEquipmentsColumn(new HashMap<>());
+        wcCheckModel.setMaterialsColumn(new HashMap<>());
+        wcCheckModel.setRoutesColumn(new HashMap<>());
+        wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue());
+        wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue());
+
+        Map<String, String> dataColumnRelationMap = new HashMap<>();
+        dataColumnRelationMap.put("people", "peopleColumn");
+        dataColumnRelationMap.put("equipments", "equipmentsColumn");
+        dataColumnRelationMap.put("materials", "materialsColumn");
+        dataColumnRelationMap.put("routes", "routesColumn");
+        wcCheckModel.setDataColumnRelation(dataColumnRelationMap);
+        return wcCheckModel;
+    }
+
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java
new file mode 100644
index 0000000..71d7efa
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java
@@ -0,0 +1,13 @@
+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.MesWcCheckRecord;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/23 7:30 PM
+ * @Description:
+ **/
+public interface MesWcCheckRecordRepository extends BaseRepository<MesWcCheckRecord, Long> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java
new file mode 100644
index 0000000..cbf9cae
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java
@@ -0,0 +1,13 @@
+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.MesWcCheck;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/23 7:30 PM
+ * @Description:
+ **/
+public interface MesWcCheckRepository extends BaseRepository<MesWcCheck, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDB.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDB.java
new file mode 100644
index 0000000..2ce7819
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDB.java
@@ -0,0 +1,62 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/24 7:17 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DB")
+@Api("地址清单")
+public class MesDB extends BaseBean {
+
+    @Column(name = "DS_CODE")
+    @ApiParam("数据源代码")
+    private String dsCode;
+
+    @Column(name = "DS_NAME")
+    @ApiParam("数据源名称")
+    private String dsName;
+
+    @Column(name = "DS_TYPE")
+    @ApiParam("数据源类型")
+    private String dsType;
+
+    @Column(name = "DS_HOST")
+    @ApiParam("主机")
+    private String dsHost;
+
+    @Column(name = "DS_PORT")
+    @ApiParam("端口")
+    private Integer dsPort;
+
+    @Column(name = "DS_USER")
+    @ApiParam("用户名")
+    private String dsUser;
+
+    @Column(name = "DS_PASSWORD")
+    @ApiParam("密码")
+    private String dsPassword;
+
+    @Column(name = "EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java
new file mode 100644
index 0000000..4b4f28a
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java
@@ -0,0 +1,42 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/24 7:12 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DATA_OBJECT")
+@Api("数据对象")
+public class MesDataObject extends BaseBean {
+
+    @Column(name="OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+
+    @Column(name="OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @Column(name="DS_CODE")
+    @ApiParam("数据源代码")
+    private String dsCode;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java
new file mode 100644
index 0000000..d5764ed
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java
@@ -0,0 +1,55 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/24 7:14 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_OBJECT_CFG")
+@Api("对象结构")
+public class MesObjectCfg extends BaseBean {
+
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "FIELD_CODE")
+    @ApiParam("字段代码")
+    private String fieldCode;
+
+    @Column(name = "FIELD_NAME")
+    @ApiParam("字段名称")
+    private String fieldName;
+
+    @Column(name = "FIELD_TYPE")
+    @ApiParam("字段类型")
+    private String fieldType;
+
+    @Column(name = "FIELD_LENGTH")
+    @ApiParam("列长度")
+    private String fieldLength;
+
+    @Column(name = "FIELD_PK")
+    @ApiParam("主键标记")
+    private String fieldPk;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java
new file mode 100644
index 0000000..7d809e5
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java
@@ -0,0 +1,54 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/21 1:45 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WC_CHECK")
+@Api("开线检查")
+public class MesWcCheck extends BaseBean {
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name="PART_NO")
+    @ApiParam("产品物料号")
+    private String partNo;
+
+    @Column(name="CHECK_TYPE")
+    @ApiParam("检查类型")
+    private String checkType;
+
+    @Column(name="CHECK_OBJ")
+    @ApiParam("检查对象")
+    private String checkObj;
+
+    @Column(name="CHECK_ITEM")
+    @ApiParam("检查项")
+    private String checkItem;
+
+    @Column(name="STANDARD")
+    @ApiParam("检查标准")
+    private String standard;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java
new file mode 100644
index 0000000..5aef545
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java
@@ -0,0 +1,78 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/21 1:57 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WC_CHECK_RECORD")
+@Api("开线检查记录")
+public class MesWcCheckRecord extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_ORDER")
+    @ApiParam("工单号")
+    private String workOrder;
+
+    @Column(name = "PART_NO")
+    @ApiParam("产品物料号")
+    private String partNo;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检查类型")
+    private String checkType;
+
+    @Column(name = "CHECK_OBJ")
+    @ApiParam("检查对象")
+    private String checkObj;
+
+    @Column(name = "CHECK_ITEM")
+    @ApiParam("检查项")
+    private String checkItem;
+
+    @Column(name = "STANDARD")
+    @ApiParam("检查标准")
+    private String standard;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam("检查结果")
+    private String checkResult;
+
+    @Column(name = "CHECK_VALUE")
+    @ApiParam("检查值")
+    private String checkValue;
+
+    @Column(name = "REASON")
+    @ApiParam("原因")
+    private String reason;
+
+    @Column(name = "GROUP_CODE")
+    @ApiParam("组名")
+    private String groupCode;
+
+    @Column(name = "OVERALL_RESULT")
+    @ApiParam
+    private Integer overAllResult;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java
new file mode 100644
index 0000000..d79594c
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java
@@ -0,0 +1,42 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/24 2:31 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WC_EQUIPMENT")
+@Api("工作单元设备关系表")
+public class MesWcEquipment extends BaseBean {
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name="EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java
index 6e21747..8da1f4a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java
@@ -51,6 +51,10 @@ public class MesWorkCenter extends BaseBean {
     @ApiParam("生产区域代码")
     private String areaCode;
 
+    @Column(name="RUNNING_STATUS")
+    @ApiParam("运行状态")
+    private Integer runningStatus;
+
     @Transient
     @ApiParam(value ="子集列表")
     private List<MesWorkCell> childTreeList;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCheckRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCheckRecordRepository.java
new file mode 100644
index 0000000..c690390
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCheckRecordRepository.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesWcCheckRecord;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/23 7:30 PM
+ * @Description:
+ **/
+public interface MesWcCheckRecordRepository extends BaseRepository<MesWcCheckRecord, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCheckRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCheckRepository.java
new file mode 100644
index 0000000..54fcdd5
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCheckRepository.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesWcCheck;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/23 7:30 PM
+ * @Description:
+ **/
+public interface MesWcCheckRepository extends BaseRepository<MesWcCheck, 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 0ee655a..0090881 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
@@ -364,6 +364,7 @@ public class MesHqlPack {
 
     /**
      * MES班组信息查询条件封装
+     *
      * @param shiftGroup
      * @param organizeCode
      * @return
@@ -397,7 +398,7 @@ public class MesHqlPack {
 
         return packBean;
     }
-/******************created by wynne*************/
+
     /**
      * MES 报废信息查询
      *
@@ -418,6 +419,24 @@ public class MesHqlPack {
         return packBean;
     }
 
+
+    /**
+     * MES 开线管控
+     *
+     * @param mesWcCheck
+     * @return
+     */
+    public static DdlPackBean getMesWcCheck(MesWcCheck mesWcCheck, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesWcCheck,organizeCode);
+//        DdlPreparedPack.getNumEqualPack(mesWcCheck.getIsValid(),"isValid",packBean);
+        DdlPreparedPack.getStringLikerPack(mesWcCheck.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesWcCheck.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(mesWcCheck.getCheckType(), "checkType", packBean);
+        DdlPreparedPack.getStringLikerPack(mesWcCheck.getCheckObj(), "checkObj", packBean);
+        DdlPreparedPack.getStringLikerPack(mesWcCheck.getCheckItem(), "checkItem", packBean);
+        return packBean;
+    }
+
     /**
      * MES PCN系统配置信息条件查询
      *

From bc1dea29ad9c0d911f0fa6e16a53c38670482348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com>
Date: Wed, 25 Sep 2019 17:39:11 +0800
Subject: [PATCH 19/28] =?UTF-8?q?po=E3=80=81asn=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java |  3 +++
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java |  5 +++++
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java  | 11 +++++++++++
 3 files changed, 19 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
index 64ea546..6e21241 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
@@ -176,6 +176,9 @@ public class WmsASNMaster extends BaseBean {
     @ApiParam("项目")
     private String prodCfgTypeCode;
 
+    @Transient
+    private List<String> orderNoList;
+
     public WmsASNMaster() {
     }
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
index b583ee5..c9fab25 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
@@ -133,6 +133,11 @@ public class WmsCSOrderDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description")
     public Integer differenceType;
 
+    public Integer getDifferenceType() {
+        return this.differenceType == null ?
+        -1: this.differenceType;
+    }
+
     public Double getQty() {
         return this.qty == null ? 0 : this.qty;
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
index 8b24b26..1477d82 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
@@ -144,6 +144,17 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam("前端信息")
     private String message;
 
+    @Transient
+    @ApiParam("计划日期开始")
+    private String planDateStart;
+
+    @Transient
+    @ApiParam("计划日期结束")
+    private String planDateEnd;
+
+    @Transient
+    private List<String> orderNoList;
+
     public int getPoStatusVal() {
         return this.poStatus == null ? 0 : this.poStatus;
     }

From 80bad03881286bb3746f52eb787a7fdc21a87d71 Mon Sep 17 00:00:00 2001
From: wangjie <jhforever.wang@estsh.com>
Date: Wed, 25 Sep 2019 19:12:42 +0800
Subject: [PATCH 20/28] =?UTF-8?q?mes-pcn=E7=94=9F=E4=BA=A7=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/pcn/bean/MesCustProdLine.java  |  38 ++++
 .../i3plus/pojo/mes/pcn/bean/MesCustomer.java      |  54 ++++++
 .../i3plus/pojo/mes/pcn/bean/MesPlanOrder.java     | 141 ++++++++++++++
 .../estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java |  42 ++++
 .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java     |  60 ++++++
 .../i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java  | 216 +++++++++++++++++++++
 .../pojo/mes/pcn/model/GenSerialNoModel.java       |  69 +++++++
 .../mes/pcn/model/MesWorkOrderButtonModel.java     |  39 ++++
 .../i3plus/pojo/mes/pcn/model/RequestModel.java    | 107 ++++++++++
 .../pcn/repository/MesCustProdLineRepository.java  |  16 ++
 .../mes/pcn/repository/MesCustomerRepository.java  |  17 ++
 .../pcn/repository/MesNumberRuleRepository.java    |  15 ++
 .../repository/MesNumberSerialnoRepository.java    |  16 ++
 .../mes/pcn/repository/MesPlanOrderRepository.java |  16 ++
 .../mes/pcn/repository/MesProdCfgRepository.java   |  16 ++
 .../pcn/repository/MesShiftGroupRepository.java    |  16 ++
 .../pcn/repository/MesWorkOrderLogRepository.java  |  16 ++
 .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java    |  56 ++++++
 .../i3plus/pojo/mes/bean/MesWorkOrderLog.java      |   5 -
 19 files changed, 950 insertions(+), 5 deletions(-)
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java

diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java
new file mode 100644
index 0000000..465a22a
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java
@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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 : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_CUST_PROD_LINE")
+@Api("客户产线代码")
+public class MesCustProdLine extends BaseBean {
+    @Column(name="CUST_PROD_LINE_CODE")
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
+
+    @Column(name="CUST_PROD_LINE_NAME")
+    @ApiParam("客户产线名称")
+    private String custProdLineName;
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java
new file mode 100644
index 0000000..9283664
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java
@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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 : crish
+ * @CreateDate : 2019-04-22
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_CUSTOMER")
+@Api("客户产线代码")
+public class MesCustomer extends BaseBean {
+    @Column(name="CUSTOMER_CODE")
+    @ApiParam("客户代码")
+    private String customerCode;
+
+    @Column(name="CUSTOMER_NAME")
+    @ApiParam("客户名称")
+    private String customerName;
+
+    @Column(name="BRIEF_TEXT")
+    @ApiParam("客户简称")
+    private String briefText;
+
+    @Column(name="ADDRESS")
+    @ApiParam("客户地址")
+    private String address;
+
+    @Column(name="CONTACT")
+    @ApiParam("客户联系人")
+    private String contact;
+
+    @Column(name="TELEPHONE")
+    @ApiParam("客户电话")
+    private String telephone;
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java
new file mode 100644
index 0000000..b71f632
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java
@@ -0,0 +1,141 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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: Crish
+ * @CreateDate:2019-04-16-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PLAN_ORDER")
+@Api("生产主计划")
+public class MesPlanOrder extends BaseBean {
+    @Column(name="ORDER_NO")
+    @ApiParam("生产计划单号")
+    private String orderNo;
+
+    @Column(name="PO_TYPE")
+    @ApiParam("计划类型")
+    private Integer planType;
+
+    @Column(name="PROD_CFG_CODE")
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name="PLAN_QTY")
+    @ApiParam("计划数量")
+    private Double planQty;
+
+    @Column(name="DECOMPOSE_QTY")
+    @ApiParam("分解数量")
+    private Double decomposeQty;
+
+    @Column(name="STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name="START_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam("计划开始时间")
+    private String startTime;
+
+    @Column(name="END_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam("计划结束时间")
+    private String endTime;
+
+    @Column(name="DELIVERY_DATE")
+    @ApiParam("交货日期")
+    private String deliveryDate;
+
+    @Column(name="CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name="CUST_ORDER_NO")
+    @ApiParam("客户订单号")
+    private String custOrderNo;
+
+    @Column(name="SOURCE")
+    @ApiParam("计划来源")
+    private String source;
+
+    @Column(name="MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    /**********************  冗余字段 *********************************/
+
+    @Transient
+    @ApiParam(value="区域")
+    public String areaCode;
+
+    @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;
+
+    public double getPlanQtyVal() {
+        return this.planQty == null ? 0.0d : this.planQty;
+    }
+
+    public double getDecomposeQtyVal() {
+        return this.decomposeQty == null ? 0.0d : this.decomposeQty;
+    }
+
+    public int getStatusVal() {
+        return this.status == null ? 0 : this.status;
+    }
+
+    public int getPlanTypeVal() {
+        return this.planType == null ? 0 : this.planType;
+    }
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java
new file mode 100644
index 0000000..17322bb
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java
@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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 :产品配置
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PROD_CFG")
+@Api("产品配置")
+public class MesProdCfg extends BaseBean {
+    @Column(name="PROD_CFG_CODE")
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+
+    @Column(name="PROD_CFG_NAME")
+    @ApiParam("产品配置名称")
+    private String prodCfgName;
+
+    @Column(name="PROD_CFG_Type_CODE")
+    @ApiParam("产品配置类型代码")
+    private String prodCfgTypeCode;
+}
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 dd8dc61..9ff0258 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
@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.pcn.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.pcn.model.MesWorkOrderButtonModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -11,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -35,6 +37,10 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("物料号")
     private String partNo;
 
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
     @Column(name="PROD_CFG_CODE")
     @ApiParam("产品配置代码")
     private String prodCfgCode;
@@ -79,6 +85,10 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
     @Column(name="WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;
@@ -127,6 +137,56 @@ public class MesWorkOrder extends BaseBean {
     @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;
     }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java
new file mode 100644
index 0000000..c8f9018
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java
@@ -0,0 +1,216 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+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;
+
+    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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java
new file mode 100644
index 0000000..8f8db3d
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java
@@ -0,0 +1,69 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/8/23 11:42 AM
+ * @Description:
+ **/
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("生成条码模型")
+public class GenSerialNoModel {
+
+    @ApiParam("规则代码")
+    private String ruleCode;
+
+    @ApiParam("规则描述")
+    private String ruleDesc;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("客户物料号")
+    private String custPartNo;
+
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @ApiParam("产地")
+    private String prodLocation;
+
+    @ApiParam("前缀")
+    private String prefix;
+
+    @ApiParam("编码规则")
+    private String numberRule;
+
+    @ApiParam("序号长度")
+    private Integer serialnoLength;
+
+    @ApiParam("增量")
+    private Integer serialnoIncrement;
+
+    @ApiParam("最大值后循环")
+    private Integer isCycle;
+
+    @ApiParam("当前编号前缀")
+    private String currentNumberPrefix;
+
+    @ApiParam("当前序号")
+    private Integer currentSerialno;
+
+    @ApiParam("当前编号")
+    private String currentNumber;
+
+
+    public GenSerialNoModel(String ruleCode){
+        this.ruleCode=ruleCode;
+    }
+
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java
new file mode 100644
index 0000000..8cd2304
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java
@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes生产工单页面按钮控制model")
+public class MesWorkOrderButtonModel implements Serializable {
+
+    @ApiParam("修改按钮")
+    private boolean updateButton;
+
+    @ApiParam("启动按钮")
+    private boolean startUpButton;
+
+    @ApiParam("暂停按钮")
+    private boolean suspendButton;
+
+    @ApiParam("取消按钮")
+    private boolean revokeButton;
+
+    @ApiParam("关闭按钮")
+    private boolean closeButton;
+
+
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java
new file mode 100644
index 0000000..9ffc448
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java
@@ -0,0 +1,107 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPart;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueOrder;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder;
+
+import java.util.List;
+
+/**
+ * @Description: 生产计划，生产队列，生产工单的复杂请求数据结构的统一请求模型
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-29-11:58
+ * @Modify:
+ **/
+public class RequestModel {
+
+    private List<MesWorkOrder> workOrderList; // 工单数据集
+
+    private List<MesPart> partList; // 物料数据集
+
+    private List<MesQueueOrder> queueOrderList; // 生产队列数据集
+
+    private Double currentSeq; // 生产队列中的当前序列号
+
+    private Double nextSeq; // 生产队列中的下一个序列号
+
+    private Integer srcStatus; // 源状态
+
+    private Integer destStatus; // 目的状态
+
+    public RequestModel(List<MesQueueOrder> queueOrderList, Double currentSeq, Double nextSeq) {
+        this.queueOrderList = queueOrderList;
+        this.currentSeq = currentSeq;
+        this.nextSeq = nextSeq;
+    }
+
+    public RequestModel(List<MesQueueOrder> queueOrderList, Integer srcStatus, Integer destStatus) {
+        this.queueOrderList = queueOrderList;
+        this.srcStatus = srcStatus;
+        this.destStatus = destStatus;
+    }
+
+    public RequestModel(List<MesWorkOrder> workOrderList, List<MesPart> partList) {
+        this.workOrderList = workOrderList;
+        this.partList = partList;
+    }
+
+    public List<MesWorkOrder> getWorkOrderList() {
+        return workOrderList;
+    }
+
+    public RequestModel() {
+    }
+
+    public void setWorkOrderList(List<MesWorkOrder> workOrderList) {
+        this.workOrderList = workOrderList;
+    }
+
+    public List<MesPart> getPartList() {
+        return partList;
+    }
+
+    public void setPartList(List<MesPart> partList) {
+        this.partList = partList;
+    }
+
+    public List<MesQueueOrder> getQueueOrderList() {
+        return queueOrderList;
+    }
+
+    public void setQueueOrderList(List<MesQueueOrder> queueOrderList) {
+        this.queueOrderList = queueOrderList;
+    }
+
+    public Double getCurrentSeq() {
+        return currentSeq == null ? 0.0d : currentSeq;
+    }
+
+    public void setCurrentSeq(Double currentSeq) {
+        this.currentSeq = currentSeq;
+    }
+
+    public Double getNextSeq() {
+        return nextSeq == null ? 0.0d : nextSeq;
+    }
+
+    public void setNextSeq(Double nextSeq) {
+        this.nextSeq = nextSeq;
+    }
+
+    public Integer getSrcStatus() {
+        return srcStatus == null ? 0 : srcStatus;
+    }
+
+    public void setSrcStatus(Integer srcStatus) {
+        this.srcStatus = srcStatus;
+    }
+
+    public Integer getDestStatus() {
+        return destStatus == null ? 0 : destStatus;
+    }
+
+    public void setDestStatus(Integer destStatus) {
+        this.destStatus = destStatus;
+    }
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java
new file mode 100644
index 0000000..cbca918
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java
@@ -0,0 +1,16 @@
+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.MesCustProdLine;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-19-11:15
+ * @Modify:
+ **/
+@Repository
+public interface MesCustProdLineRepository extends BaseRepository<MesCustProdLine, Long> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java
new file mode 100644
index 0000000..c006be6
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java
@@ -0,0 +1,17 @@
+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.MesCustomer;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-22-16:12
+ * @Modify:
+ **/
+@Repository
+public interface MesCustomerRepository extends BaseRepository<MesCustomer, Long> {
+
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java
new file mode 100644
index 0000000..d3b014d
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.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.MesNumberRule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/8/23 1:22 PM
+ * @Description:
+ **/
+@Repository
+public interface MesNumberRuleRepository extends BaseRepository<MesNumberRule, Long> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java
new file mode 100644
index 0000000..11299b0
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java
@@ -0,0 +1,16 @@
+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.MesNumberSerialno;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/8/23 1:23 PM
+ * @Description:
+ **/
+
+@Repository
+public interface MesNumberSerialnoRepository extends BaseRepository<MesNumberSerialno, Long> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java
new file mode 100644
index 0000000..c4ba8c9
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java
@@ -0,0 +1,16 @@
+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.MesPlanOrder;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-17-17:08
+ * @Modify:
+ **/
+@Repository
+public interface MesPlanOrderRepository extends BaseRepository<MesPlanOrder, Long> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java
new file mode 100644
index 0000000..1413862
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java
@@ -0,0 +1,16 @@
+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.MesProdCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesProdCfgRepository extends BaseRepository<MesProdCfg, Long> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java
new file mode 100644
index 0000000..544c627
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java
@@ -0,0 +1,16 @@
+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.MesShiftGroup;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesShiftGroupRepository extends BaseRepository<MesShiftGroup, Long> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java
new file mode 100644
index 0000000..fea2dfb
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java
@@ -0,0 +1,16 @@
+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.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-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 84b0dff..4e0281a 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
@@ -96,5 +96,61 @@ public class MesHqlPack {
         return packBean;
     }
 
+    /**
+     * 生产工单查询条件封装
+     *
+     * @param mesWorkOrder
+     * @return
+     */
+    public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        if (StringUtils.isNotEmpty(mesWorkOrder.getOrderNo())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesWorkOrder.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) {
+            DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCenterCode())) {
+            DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", 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.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.getCreateDateTimeStart(),
+                mesWorkOrder.getCreateDateTimeEnd(),
+                "createDatetime", packBean, true);
+        DdlPreparedPack.getOrderDefault(mesWorkOrder);
+        DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean);
+        return packBean;
+    }
 
 }
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
index e48bba7..df1dcb6 100644
--- 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
@@ -183,11 +183,6 @@ public class MesWorkOrderLog extends BaseBean {
     @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;
     }

From be30cecf13b50ea5a16d672bf3bfb03d13fef2bc Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Wed, 25 Sep 2019 20:48:10 +0800
Subject: [PATCH 21/28] add integration to aps

---
 .../pojo/aps/annotation/FieldAnnotation.java       |   2 +
 .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java   |  31 +++++++
 .../estsh/i3plus/pojo/aps/bean/ExportDetail.java   |   2 +
 .../estsh/i3plus/pojo/aps/bean/ExportProject.java  |   6 +-
 .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java   |   4 +
 .../estsh/i3plus/pojo/aps/bean/ImportDetail.java   |  18 ++++
 .../estsh/i3plus/pojo/aps/bean/ImportProject.java  |  22 +++++
 .../cn/estsh/i3plus/pojo/aps/bean/Material.java    |  31 +++++++
 .../cn/estsh/i3plus/pojo/aps/bean/OperInput.java   |  36 ++++++++
 .../cn/estsh/i3plus/pojo/aps/bean/OperOutput.java  |  42 ++++++++-
 .../estsh/i3plus/pojo/aps/bean/OperResource.java   |  36 ++++++++
 .../cn/estsh/i3plus/pojo/aps/bean/Operation.java   |  49 ++++++++++
 .../estsh/i3plus/pojo/aps/bean/PlanFeedback.java   |  19 ++++
 .../estsh/i3plus/pojo/aps/bean/ProductOrder.java   |  18 ++++
 .../estsh/i3plus/pojo/aps/bean/ProductRouting.java |  26 ++++++
 .../cn/estsh/i3plus/pojo/aps/bean/SysParam.java    |   2 +-
 .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java   |  41 +++++++++
 .../cn/estsh/i3plus/pojo/aps/bean/WorkInput.java   |  50 ++++++++++
 .../cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java  |  51 +++++++++++
 .../estsh/i3plus/pojo/aps/bean/WorkRelation.java   | 102 +++++++++++++++++++++
 .../estsh/i3plus/pojo/aps/bean/WorkResource.java   |  46 ++++++++++
 .../cn/estsh/i3plus/pojo/aps/common/BeanInfo.java  |   1 -
 .../estsh/i3plus/pojo/aps/common/BeanRelation.java |  29 ++++--
 .../pojo/aps/{bean => common}/DateDuration.java    |   7 +-
 .../estsh/i3plus/pojo/aps/holders/EDayShift.java   |   1 -
 .../i3plus/pojo/aps/holders/EImportDetail.java     |   5 +
 .../estsh/i3plus/pojo/aps/holders/EMaterial.java   |   2 +-
 .../i3plus/pojo/aps/holders/EResCalendar.java      |   2 -
 .../estsh/i3plus/pojo/aps/holders/EResource.java   |   2 -
 .../i3plus/pojo/aps/holders/EStandOperation.java   |   1 -
 .../cn/estsh/i3plus/pojo/aps/holders/EWork.java    |   2 +-
 .../src/main/resources/relations/ExportProject.xml |   2 +-
 .../src/main/resources/relations/ImportProject.xml |   2 +-
 .../src/main/resources/relations/Material.xml      |   2 +-
 .../src/main/resources/relations/ResCalendar.xml   |   4 -
 35 files changed, 666 insertions(+), 30 deletions(-)
 rename modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/{bean => common}/DateDuration.java (98%)
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java
index f91c7b4..86caaa2 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java
@@ -8,7 +8,9 @@ import java.lang.annotation.Target;
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface FieldAnnotation {
+    boolean property() default true;
     boolean modify() default true;
     boolean display() default true;
     int pric() default 2;
+    boolean mainkey() default false;
 }
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 aa093ab..b11e5dc 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,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
@@ -53,7 +54,37 @@ public class BaseOrder extends BaseAPS {
     @ApiParam(value ="接单日期")
     private Date receiveDate;
 
+    @Column(name="MATERIAL_ID")
+    @ApiParam(value ="物料")
+    @FieldAnnotation(property = false)
+    private Long materialId;
+
     public List<Work> getWorks() {
         return BeanRelation.list(this, EBaseOrder.Works);
     }
+
+    public Material getMaterial() {
+        return BeanRelation.get(this, EBaseOrder.Material);
+    }
+
+    public void setMaterial(Material material) {
+        this.materialId = material != null ? material.getId() : 0l;
+        BeanRelation.set(this, EBaseOrder.Material, material);
+    }
+
+    public List<WorkRelation> getPrevRelations() {
+        return BeanRelation.list(this, EBaseOrder.PrevRelations);
+    }
+
+    public List<WorkRelation> getPostRelations() {
+        return BeanRelation.list(this, EBaseOrder.PostRelations);
+    }
+
+    public List<BaseOrder> getUpperOrders() {
+        return BeanRelation.list(this, EBaseOrder.UpperOrders);
+    }
+
+    public List<BaseOrder> getLowerOrders() {
+        return BeanRelation.list(this, EBaseOrder.LowerOrders);
+    }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java
index d6926c9..9343571 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EExportDetail;
@@ -41,6 +42,7 @@ public class ExportDetail extends BaseAPS {
 
     @Column(name="PROJECT_ID")
     @ApiParam(value ="导出项目ID")
+    @FieldAnnotation(property = false)
     private Long projectId;
 
     public ExportProject getProject() {
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java
index 7438e17..27d70a9 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java
@@ -1,8 +1,10 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EExportProject;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -29,7 +31,9 @@ public class ExportProject extends BaseAPS {
     private String name;
 
     @Column(name="LINK_ID")
-    @ApiParam(value ="数据源连接")
+    @ApiParam(value ="数据连接对象")
+    @FieldAnnotation(property = false)
+    @JsonIgnore
     private Long linkId;
 
     public DataLink getLink() {
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
index 664b43b..aee742f 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
@@ -71,6 +71,10 @@ public class FieldInfo extends BaseCode {
     @ApiParam(value ="位置")
     private String position;
 
+    @Column(name="MAIN_KEY")
+    @ApiParam(value ="主键标识")
+    private Boolean mainKey;
+
     @JsonIgnore
     private transient Class<? extends BaseBean> clazz;
     @JsonIgnore
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java
index 102cd83..fb8b71f 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java
@@ -1,7 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.enums.IMPORT_DETAIL_TYPE;
+import cn.estsh.i3plus.pojo.aps.holders.EExportDetail;
+import cn.estsh.i3plus.pojo.aps.holders.EImportDetail;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -33,4 +37,18 @@ public class ImportDetail extends BaseAPS {
     @Column(name="IN_NAME")
     @ApiParam(value ="内部表名")
     private String inName;
+
+    @Column(name="PROJECT_ID")
+    @ApiParam(value ="导入项目ID")
+    @FieldAnnotation(property = false)
+    private Long projectId;
+
+    public ImportProject getProject() {
+        return BeanRelation.get(this, EImportDetail.Project);
+    }
+
+    public void setProject(ImportProject project) {
+        this.projectId = project != null ? project.getId() : 0l;
+        BeanRelation.set(this, EImportDetail.Project, project);
+    }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java
index bb21896..731a820 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java
@@ -1,6 +1,9 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EImportProject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -8,6 +11,7 @@ import lombok.Data;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.util.List;
 
 /**
  * @Description :数据导入明细集合
@@ -24,4 +28,22 @@ public class ImportProject extends BaseAPS {
     @Column(name="NAME")
     @ApiParam(value ="标识名")
     private String name;
+
+    @Column(name="LINK_ID")
+    @ApiParam(value ="数据连接对象")
+    @FieldAnnotation(property = false)
+    private Long linkId;
+
+    public DataLink getLink() {
+        return BeanRelation.get(this, EImportProject.Link);
+    }
+
+    public void setLink(DataLink link) {
+        this.linkId = link != null ? link.getId() : 0l;
+        BeanRelation.set(this, EImportProject.Link, link);
+    }
+
+    public List<ImportDetail> getDetails() {
+        return BeanRelation.list(this, EImportProject.Details);
+    }
 }
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 c0ae1a0..a42d97e 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
@@ -1,9 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.common.BaseCode;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 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 cn.estsh.i3plus.pojo.aps.holders.EMaterial;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -11,6 +13,7 @@ import lombok.Data;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.util.List;
 
 /**
  * @Description :物料
@@ -103,4 +106,32 @@ public class Material extends BaseCode {
     @Column(name="MAX_STOCK_COUNT")
     @ApiParam(value ="最大库存数量")
     private Double maxStockCount;
+
+    public List<ProductRouting> getProductRoutings() {
+        return BeanRelation.list(this, EMaterial.ProductRoutings);
+    }
+
+    public List<OperInput> getOperInputs() {
+        return BeanRelation.list(this, EMaterial.OperInputs);
+    }
+
+    public List<OperOutput> getOperOutputs() {
+        return BeanRelation.list(this, EMaterial.OperOutputs);
+    }
+
+    public List<WorkInput> getWorkInputs() {
+        return BeanRelation.list(this, EMaterial.WorkInputs);
+    }
+
+    public List<WorkOutput> getWorkOutputs() {
+        return BeanRelation.list(this, EMaterial.WorkOutputs);
+    }
+
+    public List<WorkRelation> getWorkRelations() {
+        return BeanRelation.list(this, EMaterial.WorkRelations);
+    }
+
+    public List<BaseOrder> getOrders() {
+        return BeanRelation.list(this, EMaterial.Orders);
+    }
 }
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 1c8cdc3..1ad9690 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,7 +1,10 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
+import cn.estsh.i3plus.pojo.aps.holders.EOperInput;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -9,6 +12,7 @@ import lombok.Data;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.util.List;
 
 /**
  * @Description :工序输入
@@ -45,4 +49,36 @@ public class OperInput extends BaseAPS {
     @Column(name="MIN_SPACE_TIME")
     @ApiParam(value ="最小时间间隔")
     private String minSpaceTime;
+
+    @Column(name="OPERATION_ID")
+    @ApiParam(value ="工序")
+    @FieldAnnotation(property = false)
+    private Long operationId;
+
+    @Column(name="MATERIAL_ID")
+    @ApiParam(value ="物料")
+    @FieldAnnotation(property = false)
+    private Long materialId;
+
+    public Operation getOperation() {
+        return BeanRelation.get(this, EOperInput.Operation);
+    }
+
+    public void setOperation(Operation oper) {
+        this.operationId = oper != null ? oper.getId() : 0l;
+        BeanRelation.set(this, EOperInput.Operation, oper);
+    }
+
+    public Material getMaterial() {
+        return BeanRelation.get(this, EOperInput.Material);
+    }
+
+    public void setMaterial(Material material) {
+        this.materialId = material != null ? material.getId() : 0l;
+        BeanRelation.set(this, EOperInput.Material, material);
+    }
+
+    public List<WorkInput> getWorkInputs() {
+        return BeanRelation.list(this, EOperInput.WorkInputs);
+    }
 }
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 82ab4cf..41a13fa 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,6 +1,9 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EOperOutput;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -8,6 +11,7 @@ import lombok.Data;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.util.List;
 
 /**
  * @Description :工序输出
@@ -21,15 +25,47 @@ import javax.persistence.Table;
 @Table(name = "APS_OPER_OUTPUT")
 @Api("工序输出")
 public class OperOutput extends BaseAPS {
-    @Column(name="output_Count")
+    @Column(name="OUTPUT_COUNT")
     @ApiParam(value ="输出数量")
     private Double outputCount;
 
-    @Column(name="yield")
+    @Column(name="YIELD")
     @ApiParam(value ="成品率")
     private Double yield;
 
-    @Column(name="fix_Scrap_Count")
+    @Column(name="FIX_SCRAP_COUNT")
     @ApiParam(value ="固定报废数")
     private Double fixScrapCount;
+
+    @Column(name="OPERATION_ID")
+    @ApiParam(value ="工序")
+    @FieldAnnotation(property = false)
+    private Long operationId;
+
+    @Column(name="MATERIAL_ID")
+    @ApiParam(value ="物料")
+    @FieldAnnotation(property = false)
+    private Long materialId;
+
+    public Operation getOperation() {
+        return BeanRelation.get(this, EOperOutput.Operation);
+    }
+
+    public void setOperation(Operation oper) {
+        this.operationId = oper != null ? oper.getId() : 0l;
+        BeanRelation.set(this, EOperOutput.Operation, oper);
+    }
+
+    public Material getMaterial() {
+        return BeanRelation.get(this, EOperOutput.Material);
+    }
+
+    public void setMaterial(Material material) {
+        this.materialId = material != null ? material.getId() : 0l;
+        BeanRelation.set(this, EOperOutput.Material, material);
+    }
+
+    public List<WorkOutput> getWorkOutputs() {
+        return BeanRelation.list(this, EOperOutput.WorkOutputs);
+    }
 }
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 4de47b0..f0859f7 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,7 +1,10 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
+import cn.estsh.i3plus.pojo.aps.holders.EOperResource;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -9,6 +12,7 @@ import lombok.Data;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.util.List;
 
 /**
  * @Description :工序资源
@@ -53,4 +57,36 @@ public class OperResource extends BaseAPS {
     @Column(name="PRIORITY")
     @ApiParam(value ="优先级")
     private Integer priority;
+
+    @Column(name="OPERATION_ID")
+    @ApiParam(value ="工序")
+    @FieldAnnotation(property = false)
+    private Long operationId;
+
+    @Column(name="RESOURCE_ID")
+    @ApiParam(value ="资源")
+    @FieldAnnotation(property = false)
+    private Long resourceId;
+
+    public Operation getOperation() {
+        return BeanRelation.get(this, EOperResource.Operation);
+    }
+
+    public void setOperation(Operation oper) {
+        this.operationId = oper != null ? oper.getId() : 0l;
+        BeanRelation.set(this, EOperResource.Operation, oper);
+    }
+
+    public Resource getResource() {
+        return BeanRelation.get(this, EOperResource.Resource);
+    }
+
+    public void setResource(Resource res) {
+        this.resourceId = res != null ? res.getId() : 0l;
+        BeanRelation.set(this, EOperResource.Resource, res);
+    }
+
+    public List<WorkResource> getWorkResources() {
+        return BeanRelation.list(this, EOperResource.WorkResources);
+    }
 }
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 cba41d4..4f6513a 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,15 +1,20 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
 import cn.estsh.i3plus.pojo.aps.enums.TAIL_DEAL;
+import cn.estsh.i3plus.pojo.aps.holders.EOperation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import org.springframework.context.annotation.Bean;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.util.List;
 
 /**
  * @Description :工序
@@ -71,4 +76,48 @@ public class Operation extends BaseAPS {
     @Column(name="MIN_SPACE_TIME")
     @ApiParam(value ="最小时间间隔")
     private String minSpaceTime;
+
+    @Column(name="PRODUCT_ROUTING_ID")
+    @ApiParam(value ="工艺路线")
+    @FieldAnnotation(property = false)
+    private Long productRoutingId;
+
+    @Column(name="STAND_OPERATION_ID")
+    @ApiParam(value ="标准工序")
+    @FieldAnnotation(property = false)
+    private Long standOperationId;
+
+    public ProductRouting getProductRouting() {
+        return BeanRelation.get(this, EOperation.ProductRouting);
+    }
+
+    public void setProductRouting(ProductRouting routing) {
+        this.productRoutingId = routing != null ? routing.getId() : 0l;
+        BeanRelation.set(this, EOperation.ProductRouting, routing);
+    }
+
+    public List<OperInput> getOperInputs() {
+        return BeanRelation.list(this, EOperation.OperInputs);
+    }
+
+    public List<OperOutput> getOperOutputs() {
+        return BeanRelation.list(this, EOperation.OperOutputs);
+    }
+
+    public List<Resource> getOperResources() {
+        return BeanRelation.list(this, EOperation.OperResources);
+    }
+
+    public StandOperation getStandOperation() {
+        return BeanRelation.get(this, EOperation.StandOperation);
+    }
+
+    public void setStandOperation(StandOperation std) {
+        this.standOperationId = std != null ? std.getId() : 0l;
+        BeanRelation.set(this, EOperation.StandOperation, std);
+    }
+
+    public List<Work> getWorks() {
+        return BeanRelation.list(this, EOperation.Works);
+    }
 }
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 dd7e68d..40b004b 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,9 +1,14 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EPlanFeedback;
 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;
 
@@ -19,4 +24,18 @@ import javax.persistence.Table;
 @Table(name = "APS_PLAN_FEEDBACK")
 @Api("物料")
 public class PlanFeedback extends BaseAPS {
+
+    @Column(name="WORK_ID")
+    @ApiParam(value ="工作")
+    @FieldAnnotation(property = false)
+    private Long workId;
+
+    public Work getWork() {
+        return BeanRelation.get(this, EPlanFeedback.Work);
+    }
+
+    public void setWork(Work work) {
+        this.workId = work != null ? work.getId() : 0l;
+        BeanRelation.set(this, EPlanFeedback.Work, work);
+    }
 }
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 a1712da..64f17c0 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,9 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EProductOrder;
+import cn.estsh.i3plus.pojo.aps.holders.EProductRouting;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -80,4 +84,18 @@ public class ProductOrder extends BaseOrder {
     @Column(name="LACK_COUNT")
     @ApiParam(value ="缺少量")
     private Double lackCount;
+
+    @Column(name="PRODUCT_ROUTING_ID")
+    @ApiParam(value ="工艺路线")
+    @FieldAnnotation(property = false)
+    private Long productRoutingId;
+
+    public ProductRouting getProductRouting() {
+        return BeanRelation.get(this, EProductOrder.ProductRouting);
+    }
+
+    public void setProductRouting(ProductRouting routing) {
+        this.productRoutingId = routing != null ? routing.getId() : 0l;
+        BeanRelation.set(this, EProductOrder.ProductRouting, routing);
+    }
 }
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 88a415c..ed21d2d 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,6 +1,9 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseCode;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EProductRouting;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -9,6 +12,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description :工艺路线
@@ -33,4 +37,26 @@ public class ProductRouting extends BaseCode {
     @Column(name="PRIORITY")
     @ApiParam(value ="优先级")
     private Integer priority;
+
+    @Column(name="MATERIAL_ID")
+    @ApiParam(value ="物料")
+    @FieldAnnotation(property = false)
+    private Long materialId;
+
+    public Material getMaterial() {
+        return BeanRelation.get(this, EProductRouting.Material);
+    }
+
+    public void setMaterial(Material material) {
+        this.materialId = material != null ? material.getId() : 0l;
+        BeanRelation.set(this, EProductRouting.Material, material);
+    }
+
+    public List<Operation> getOperations() {
+        return BeanRelation.list(this, EProductRouting.Operations);
+    }
+
+    public List<ProductOrder> getProductOrders() {
+        return BeanRelation.list(this, EProductRouting.ProductOrders);
+    }
 }
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 799f34a..70f77de 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
@@ -26,7 +26,7 @@ public class SysParam extends BaseAPS {
     @ApiParam(value ="基准时间")
     private Date baseTime;
 
-    @Column(name="max_Interrupt_Count")
+    @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 60ca0c0..2dc7c4b 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,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.enums.WORK_STATUS;
@@ -13,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description :工作
@@ -96,8 +98,14 @@ public class Work extends BaseCode {
 
     @Column(name="ORDER_ID")
     @ApiParam(value ="订单")
+    @FieldAnnotation(property = false)
     private Long orderId;
 
+    @Column(name="OPERATION_ID")
+    @ApiParam(value ="工序")
+    @FieldAnnotation(property = false)
+    private Long operationId;
+
     public BaseOrder getOrder() {
         return BeanRelation.get(this, EWork.Order);
     }
@@ -106,4 +114,37 @@ public class Work extends BaseCode {
         this.orderId = order != null ? order.getId() : 0l;
         BeanRelation.set(this, EWork.Order, order);
     }
+
+    public List<WorkResource> getWorkResources() {
+        return BeanRelation.list(this, EWork.WorkResources);
+    }
+
+    public List<WorkInput> getWorkInputs() {
+        return BeanRelation.list(this, EWork.WorkInputs);
+    }
+
+    public List<WorkOutput> getWorkOutputs() {
+        return BeanRelation.list(this, EWork.WorkOutputs);
+    }
+
+    public List<WorkRelation> getWorkRelationInputs() {
+        return BeanRelation.list(this, EWork.WorkRelationInputs);
+    }
+
+    public List<WorkRelation> getWorkRelationOutputs() {
+        return BeanRelation.list(this, EWork.WorkRelationOutputs);
+    }
+
+    public Operation getOperation() {
+        return BeanRelation.get(this, EWork.Operation);
+    }
+
+    public void setOperation(Operation oper) {
+        this.operationId = oper != null ? oper.getId() : 0l;
+        BeanRelation.set(this, EWork.Operation, oper);
+    }
+
+    public List<PlanFeedback> getPlanFeedbacks() {
+        return BeanRelation.list(this, EWork.PlanFeedbacks);
+    }
 }
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 b37c70d..2a5dc70 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,6 +1,9 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EWorkInput;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -9,6 +12,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description :工作输入
@@ -33,4 +37,50 @@ public class WorkInput extends BaseAPS {
     @Column(name="SHORT_COUNT")
     @ApiParam(value ="短缺数量")
     private Double shortCount;
+
+    @Column(name="WORK_ID")
+    @ApiParam(value ="工作")
+    @FieldAnnotation(property = false)
+    private Long workId;
+
+    @Column(name="MATERIAL_ID")
+    @ApiParam(value ="物料")
+    @FieldAnnotation(property = false)
+    private Long materialId;
+
+    @Column(name="OPER_INPUT_ID")
+    @ApiParam(value ="工序输入")
+    @FieldAnnotation(property = false)
+    private Long operInputId;
+
+    public Work getWork() {
+        return BeanRelation.get(this, EWorkInput.Work);
+    }
+
+    public void setWork(Work work) {
+        this.workId = work != null ? work.getId() : 0l;
+        BeanRelation.set(this, EWorkInput.Work, work);
+    }
+
+    public List<WorkRelation> getWorkRelations() {
+        return BeanRelation.list(this, EWorkInput.WorkRelations);
+    }
+
+    public Material getMaterial() {
+        return BeanRelation.get(this, EWorkInput.Material);
+    }
+
+    public void setMaterial(Material material) {
+        this.materialId = material != null ? material.getId() : 0l;
+        BeanRelation.set(this, EWorkInput.Material, material);
+    }
+
+    public OperInput getOperInput() {
+        return BeanRelation.get(this, EWorkInput.OperInput);
+    }
+
+    public void setOperInput(OperInput input) {
+        this.operInputId = input != null ? input.getId() : 0l;
+        BeanRelation.set(this, EWorkInput.OperInput, input);
+    }
 }
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 16023ec..16ce459 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,14 +1,19 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EWorkOutput;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import org.springframework.context.annotation.Bean;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description :工作输出
@@ -33,4 +38,50 @@ public class WorkOutput extends BaseAPS {
     @Column(name="REMAIN_COUNT")
     @ApiParam(value ="多余数量")
     private Double remainCount;
+
+    @Column(name="WORK_ID")
+    @ApiParam(value ="工作")
+    @FieldAnnotation(property = false)
+    private Long workId;
+
+    @Column(name="MATERIAL_ID")
+    @ApiParam(value ="物料")
+    @FieldAnnotation(property = false)
+    private Long materialId;
+
+    @Column(name="OPER_OUTPUT_ID")
+    @ApiParam(value ="工序输出")
+    @FieldAnnotation(property = false)
+    private Long operOutputId;
+
+    public Work getWork() {
+        return BeanRelation.get(this, EWorkOutput.Work);
+    }
+
+    public void setWork(Work work) {
+        this.workId = work != null ? work.getId() : 0l;
+        BeanRelation.set(this, EWorkOutput.Work, work);
+    }
+
+    public List<WorkRelation> getWorkRelations() {
+        return BeanRelation.list(this, EWorkOutput.WorkRelations);
+    }
+
+    public Material getMaterial() {
+        return BeanRelation.get(this, EWorkOutput.Material);
+    }
+
+    public void setMaterial(Material material) {
+        this.materialId = material != null ? material.getId() : 0l;
+        BeanRelation.set(this, EWorkOutput.Material, material);
+    }
+
+    public OperOutput getOperOutput() {
+        return BeanRelation.get(this, EWorkOutput.OperOutput);
+    }
+
+    public void setOperOutput(OperOutput output) {
+        this.operOutputId = output != null ? output.getId() : 0l;
+        BeanRelation.set(this, EWorkOutput.OperOutput, output);
+    }
 }
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 07095c3..8894581 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,8 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
 import cn.estsh.i3plus.pojo.aps.enums.WORK_RELATION_TYPE;
+import cn.estsh.i3plus.pojo.aps.holders.EWork;
+import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -50,4 +54,102 @@ public class WorkRelation extends BaseAPS {
     @Column(name="FIX_COUNT")
     @ApiParam(value ="是否固定数量")
     private Boolean fixCount;
+
+    @Column(name="WORK_INPUT_ID")
+    @ApiParam(value ="工作输入")
+    @FieldAnnotation(property = false)
+    private Long workInputId;
+
+    @Column(name="WORK_OUTPUT_ID")
+    @ApiParam(value ="工作输出")
+    @FieldAnnotation(property = false)
+    private Long workOutputId;
+
+    @Column(name="PREV_WORK_ID")
+    @ApiParam(value ="前工作")
+    @FieldAnnotation(property = false)
+    private Long prevWorkId;
+
+    @Column(name="POST_WORK_ID")
+    @ApiParam(value ="后工作")
+    @FieldAnnotation(property = false)
+    private Long postWorkId;
+
+    @Column(name="PREV_ORDER_ID")
+    @ApiParam(value ="前订单")
+    @FieldAnnotation(property = false)
+    private Long prevOrderId;
+
+    @Column(name="POST_ORDER_ID")
+    @ApiParam(value ="后订单")
+    @FieldAnnotation(property = false)
+    private Long postOrderId;
+
+    @Column(name="MATERIAL_ID")
+    @ApiParam(value ="物料")
+    @FieldAnnotation(property = false)
+    private Long materialId;
+
+    public WorkInput getWorkInput() {
+        return BeanRelation.get(this, EWorkRelation.WorkInput);
+    }
+
+    public void setWorkInput(WorkInput input) {
+        this.workInputId = input != null ? input.getId() : 0l;
+        BeanRelation.set(this, EWorkRelation.WorkInput, input);
+    }
+
+    public WorkOutput getWorkOutput() {
+        return BeanRelation.get(this, EWorkRelation.WorkOutput);
+    }
+
+    public void setWorkOutput(WorkOutput output) {
+        this.workOutputId = output != null ? output.getId() : 0l;
+        BeanRelation.set(this, EWorkRelation.WorkOutput, output);
+    }
+
+    public Work getPrevWork() {
+        return BeanRelation.get(this, EWorkRelation.PrevWork);
+    }
+
+    public void setPrevWork(Work work) {
+        this.prevWorkId = work != null ? work.getId() : 0l;
+        BeanRelation.set(this, EWorkRelation.PrevWork, work);
+    }
+
+    public Work getPostWork() {
+        return BeanRelation.get(this, EWorkRelation.PostWork);
+    }
+
+    public void setPostWork(Work work) {
+        this.postWorkId = work != null ? work.getId() : 0l;
+        BeanRelation.set(this, EWorkRelation.PostWork, work);
+    }
+
+    public BaseOrder getPrevOrder() {
+        return BeanRelation.get(this, EWorkRelation.PrevOrder);
+    }
+
+    public void setPrevOrder(BaseOrder order) {
+        this.prevOrderId = order != null ? order.getId() : 0l;
+        BeanRelation.set(this, EWorkRelation.PrevOrder, order);
+    }
+
+    public BaseOrder getPostOrder() {
+        return BeanRelation.get(this, EWorkRelation.PostOrder);
+    }
+
+    public void setPostOrder(BaseOrder order) {
+        this.postOrderId = order != null ? order.getId() : 0l;
+        BeanRelation.set(this, EWorkRelation.PostOrder, order);
+    }
+
+    public Material getMaterial() {
+        return BeanRelation.get(this, EWorkRelation.Material);
+    }
+
+    public void setMaterial(Material material) {
+        this.materialId = material != null ? material.getId() : 0l;
+        BeanRelation.set(this, EWorkRelation.Material, material);
+    }
 }
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 34842fb..2e9b10d 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,7 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
+import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EWorkResource;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -53,4 +57,46 @@ public class WorkResource extends BaseAPS {
     @Column(name="MAX_POST_SD_TIME")
     @ApiParam(value ="最大后设置中断时间")
     private String maxPostSdTime;
+
+    @Column(name="WORK_ID")
+    @ApiParam(value ="工作")
+    @FieldAnnotation(property = false)
+    private Long workId;
+
+    @Column(name="RESOURCE_ID")
+    @ApiParam(value ="资源")
+    @FieldAnnotation(property = false)
+    private Long resourceId;
+
+    @Column(name="OPER_RESOURCE_ID")
+    @ApiParam(value ="工序资源")
+    @FieldAnnotation(property = false)
+    private Long operResourceId;
+
+    public Work getWork() {
+        return BeanRelation.get(this, EWorkResource.Work);
+    }
+
+    public void setWork(Work work) {
+        this.workId = work != null ? work.getId() : 0l;
+        BeanRelation.set(this, EWorkResource.Work, work);
+    }
+
+    public Resource getResource() {
+        return BeanRelation.get(this, EWorkResource.Resource);
+    }
+
+    public void setResource(Resource res) {
+        this.resourceId = res != null ? res.getId() : 0l;
+        BeanRelation.set(this, EWorkResource.Resource, res);
+    }
+
+    public OperResource getOperResource() {
+        return BeanRelation.get(this, EWorkResource.OperResource);
+    }
+
+    public void setOperResource(OperResource res) {
+        this.operResourceId = res != null ? res.getId() : 0l;
+        BeanRelation.set(this, EWorkResource.OperResource, res);
+    }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java
index 9a60943..016d92e 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java
@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.aps.common;
 
-import cn.estsh.i3plus.pojo.aps.bean.DateDuration;
 import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java
index 915391e..85b62df 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java
@@ -12,6 +12,12 @@ import java.util.function.Predicate;
 public class BeanRelation {
     Map<Class<? extends BaseBean>, Map<Long, Map<Enum<?>, List<BaseBean>>>> caches = new HashMap<>();
 
+    private void init() {
+        for (Class<? extends BaseBean> cls : BeanInfo.getBeanClasses()) {
+            caches.put(cls, new ConcurrentHashMap<>());
+        }
+    }
+
     private static Map<Long, BeanRelation> relations = new ConcurrentHashMap<>();
     private static BeanRelation get() {
         Long userId = 0l;
@@ -21,6 +27,7 @@ public class BeanRelation {
                 relation = relations.get(userId);
                 if (relation == null) {
                     relation = new BeanRelation();
+                    relation.init();
                     relations.put(userId, relation);
                 }
             }
@@ -30,7 +37,15 @@ public class BeanRelation {
     }
 
     private static Map<Enum<?>, List<BaseBean>> createRelation(Class<? extends BaseBean> cls) {
-        return null;
+        Map<Enum<?>, List<BaseBean>> result = new HashMap<>();
+        BeanInfo beanInfo = BeanInfo.getBeanInfo(cls);
+        if (beanInfo == null) {
+            return result;
+        }
+        for (Enum<?> holder : beanInfo.getAllHolders()) {
+            result.put(holder, new ArrayList<>());
+        }
+        return result;
     }
 
     public static Map<Enum<?>, List<BaseBean>> get(BaseBean bean) {
@@ -46,10 +61,6 @@ public class BeanRelation {
         return temp;
     }
 
-    public static void init() {
-
-    }
-
     public static <T extends BaseBean> T get(BaseBean bean, Enum<?> holder) {
         List<T> beans = (List<T>)get(bean).get(holder);
         if (beans == null || beans.isEmpty()) {
@@ -72,7 +83,13 @@ public class BeanRelation {
                 return (T)bean;
             }
         } else {
-            //List<BaseAPS> relaBeans =
+            List<BaseBean> relaBeans = list(bean, args[index]);
+            for (BaseBean relaBean : relaBeans) {
+                T temp = getImpl(relaBean, pred, args, index + 1);
+                if (temp != null) {
+                    return temp;
+                }
+            }
         }
 
         return null;
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/common/DateDuration.java
similarity index 98%
rename from modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DateDuration.java
rename to modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java
index d394a8f..f68cc74 100644
--- 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/common/DateDuration.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.aps.bean;
+package cn.estsh.i3plus.pojo.aps.common;
 
 import java.util.AbstractMap;
 import java.util.ArrayList;
@@ -80,7 +80,8 @@ public class DateDuration {
         return this.time * 1000;
     }
 
-    public String getString() {
+    @Override
+    public String toString() {
         if (this.rate > PRECISION)
             return this.getValue();
 
@@ -130,7 +131,7 @@ public class DateDuration {
         if (this.time >= 0)
             this.time /= val;
         this.rate  /=  val;
-        this.value = getString();
+        this.value = toString();
     }
 
     /**
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
index e1142a0..1c7f79e 100644
--- 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
@@ -1,5 +1,4 @@
 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/EImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java
new file mode 100644
index 0000000..f78c6ac
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java
@@ -0,0 +1,5 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EImportDetail {
+    Project
+}
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
index d24c26a..65cc748 100644
--- 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
@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
 public enum EMaterial {
-    ProductRouting,
+    ProductRoutings,
     OperInputs,
     OperOutputs,
     WorkInputs,
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
index c8e2201..86fd054 100644
--- 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
@@ -1,6 +1,4 @@
 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
index 8064356..175536d 100644
--- 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
@@ -1,6 +1,4 @@
 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
index 200b2a1..08ae7b4 100644
--- 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
@@ -1,5 +1,4 @@
 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
index 330d898..507848d 100644
--- 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
@@ -8,5 +8,5 @@ public enum EWork {
     WorkRelationInputs,
     WorkRelationOutputs,
     Operation,
-    PlanFeedback
+    PlanFeedbacks
 }
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml
index 4c21b36..443516d 100644
--- a/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml
@@ -2,6 +2,6 @@
 <Class name="ExportProject">
     <Relation field="Link" name="DataLink" type="MULTI_TO_ONE">
     </Relation>
-    <Relation field="Details" name="ExportDetail" type="ONE_TO_MULTI" owner="true">
+    <Relation field="Details" name="ExportDetail" reverse="Project" 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/ImportProject.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml
index 8128db4..9f0d45d 100644
--- a/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml
@@ -2,6 +2,6 @@
 <Class name="ImportProject">
     <Relation field="Link" name="DataLink" type="MULTI_TO_ONE">
     </Relation>
-    <Relation field="Details" name="ImportDetail" type="ONE_TO_MULTI" owner="true">
+    <Relation field="Details" name="ImportDetail" reverset="Project" 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/Material.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml
index 7d7cb1e..51da8ba 100644
--- a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml
@@ -1,5 +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 field="ProductRoutings" 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/ResCalendar.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml
index 30dc59a..d35accc 100644
--- a/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml
@@ -1,7 +1,3 @@
 <?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

From 87dfdc64711edc0ffd362418e52dc173e04255ee Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Thu, 26 Sep 2019 10:49:23 +0800
Subject: [PATCH 22/28] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B9=E6=B3=95notIn?=
 =?UTF-8?q?PackArray=EF=BC=88=EF=BC=89=EF=BC=8C=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB=20notInPack()=20notInPackString()?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

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 edb8348..3d97300 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
@@ -504,6 +504,19 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装not in String查询语句
+     *
+     * @param data
+     * @param columnName
+     * @param packBean
+     */
+    public static void getNotInPackArray(Object[] data, String columnName, DdlPackBean packBean) {
+        if (data != null && data.length > 0) {
+            packBean.addColumnQuery(columnName," and model." + columnName + " not in (:m_" + columnName + ")", Arrays.asList(data));
+        }
+    }
+
+    /**
      * 封装in String查询语句
      *
      * @param data
@@ -559,9 +572,9 @@ public class DdlPreparedPack {
             data = "";
             for (int i = 0; i < dataArray.length; i++) {
                 if (i == dataArray.length - 1) {
-                    data += "'" + dataArray[i] + "'";
+                    data += "" + dataArray[i] + "";
                 } else {
-                    data += "'" + dataArray[i] + "',";
+                    data += "" + dataArray[i] + ",";
                 }
             }
             packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);

From 49bdbacc2f70cd180552d73ce0fe45a8ad8b9b14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= <gragon.xu@estsh.com>
Date: Thu, 26 Sep 2019 10:51:12 +0800
Subject: [PATCH 23/28] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=B7=AE=E5=BC=82?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=A0=B7=E5=BC=8F=E9=9C=80=E6=B1=82=EF=BC=88?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=8C=BA=EF=BC=9A=E7=BA=A2=E8=89=B2=EF=BC=9B?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D=EF=BC=8C=E6=95=B0=E9=87=8F=EF=BC=9A=E9=BB=84?=
 =?UTF-8?q?=E8=89=B2=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java
index 1911b04..ee8cdc6 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java
@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.model.wms;
 
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.ApiParam;
-import io.swagger.models.auth.In;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -39,15 +38,12 @@ public class WmsMessageStyleModel implements Serializable {
 
     public WmsMessageStyleModel() {
     }
+
     public WmsMessageStyleModel(String message, Integer selectQty) {
         this.message = message;
-        if(selectQty==1){
-        this.wsStatus=10;
-     }
-     if(selectQty==2){
-         this.wsStatus=20;
-     }
+        this.wsStatus = selectQty;
     }
+
     public WmsMessageStyleModel(String message) {
         this.message = message;
     }

From e42cd80b8bfbb4196807e3834ddde043bf809b74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com>
Date: Thu, 26 Sep 2019 16:17:25 +0800
Subject: [PATCH 24/28] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0=E5=BE=85=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     | 38 ++++++++++++++++++++++
 .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java  |  4 +--
 .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java  | 17 ++++++++++
 3 files changed, 57 insertions(+), 2 deletions(-)

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 0137da0..44b70e6 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
@@ -377,6 +377,44 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 条码打印状态  （库存条码打印字段使用）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRINT_STATUS {
+        PRINTED(1, "已打印"), NOPRINT(2, "未打印"), GENERATE(3, "退料生成条码");
+
+        private int value;
+        private String description;
+
+        PRINT_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
      * 库位类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
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 43dfd15..37201b2 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
@@ -128,11 +128,11 @@ public class WmsStockSn extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description")
     private Integer snStatus;
     /**
-     * 1:已打印；2：未打印
+     * 1:已打印；2：未打印；3：退料生成条码
      */
     @Column(name = "PRINTED")
     @ApiParam(value = "是否打印", example = "0")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description")
     private Integer printed;
 
     @Column(name = "PDATE")
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 38ae263..b6cafeb 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
@@ -208,6 +208,12 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
+
+        //  查询计划时间在指定范围的单号，查询这些单号的数据
+        if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) {
+            DdlPreparedPack.getInPackList(wmsPOMaster.getOrderNoList(), "orderNo", result);
+        }
+
         getStringBuilderPack(wmsPOMaster, result);
 
         return result;
@@ -593,6 +599,11 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);
         DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result);
 
+        //  查询计划时间在指定范围的单号，查询这些单号的数据
+        if (StringUtils.isNotBlank(wmsASNMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsASNMaster.getPlanDateEnd())) {
+            DdlPreparedPack.getInPackList(wmsASNMaster.getOrderNoList(), "orderNo", result);
+        }
+
         getStringBuilderPack(wmsASNMaster, result);
 
         return result;
@@ -1529,6 +1540,12 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result);
         result.setOrderByStr(wmsStockSn.orderBy());
 
+        if(wmsStockSn.getPrinted()!= null){
+            if(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue() == wmsStockSn.getPrinted()){
+                DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue(),"printed",result);
+            }
+        }
+
         getStringBuilderPack(wmsStockSn, result);
         return result;
     }

From 8f7d3b371bdc36d9f494c9f84d17bb1f2204e92a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= <gragon.xu@estsh.com>
Date: Thu, 26 Sep 2019 18:42:29 +0800
Subject: [PATCH 25/28] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?=
 =?UTF-8?q?=EF=BC=9A=E5=9B=9E=E6=98=BE=E7=BB=99=E5=89=8D=E7=AB=AF=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E6=AD=A5=E9=AA=A4=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/model/wms/WmsActionResponseBean.java      |  7 ++--
 .../pojo/wms/bean/WmsActionGroupDetails.java       | 40 ++++++++++++++++++++--
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java
index 40edbf5..a5a4d10 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java
@@ -35,8 +35,11 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     @ApiParam("进度")
     public String percent = "消息提示：";
 
-    @ApiParam("当前步骤")
-    public Integer currentStep;
+    @ApiParam("当前步骤类型名称")
+    public String currentStepTypeName;
+
+    @ApiParam("当前步骤名称")
+    public String currentStepName;
 
     @ApiParam("总步数")
     public int totalStep;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java
index 1cdfb49..e8455c4 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java
@@ -84,6 +84,10 @@ public class WmsActionGroupDetails extends BaseBean {
     private String asName;
 
     @Transient
+    @ApiParam(value = "步骤类型名称")
+    private String atName;
+
+    @Transient
     @ApiParam(value = "流程名称")
     private String agName;
 
@@ -112,11 +116,13 @@ public class WmsActionGroupDetails extends BaseBean {
     @ApiParam(value = "是否自动开窗", example = "2")
     private Integer isAutoOpenWindow;
 
+    @Column(name = "SEARCH_KEY")
     @ApiParam(value = "搜索KEY")
-    public String searchKey;
+    private String searchKey;
 
+    @Column(name = "GROUP_KEY")
     @ApiParam(value = "分组KEY")
-    public String groupKey;
+    private String groupKey;
 
     public int getSeqVal() {
         return this.seq == null ? 0 : this.seq;
@@ -153,4 +159,34 @@ public class WmsActionGroupDetails extends BaseBean {
     public int getLenCheckVal() {
         return this.lenCheck == null ? 0 : this.lenCheck;
     }
+
+    public WmsActionGroupDetails() {
+    }
+
+    public WmsActionGroupDetails(Long agId, Integer seq, Integer okSeq, Integer ngSeq, Integer valueType, Integer toUpper,
+                                 Integer lenCheck, String regularCheck, String regularCheckFailMsg, Long asId, Long atId,
+                                 String asName, String atName, String goToBtnCode, String goToBtnName, Integer preShow,
+                                 Long showAmId, Integer isCommitAble, Integer isAutoOpenWindow, String searchKey, String groupKey) {
+        this.agId = agId;
+        this.seq = seq;
+        this.okSeq = okSeq;
+        this.ngSeq = ngSeq;
+        this.valueType = valueType;
+        this.toUpper = toUpper;
+        this.lenCheck = lenCheck;
+        this.regularCheck = regularCheck;
+        this.regularCheckFailMsg = regularCheckFailMsg;
+        this.asId = asId;
+        this.atId = atId;
+        this.asName = asName;
+        this.atName = atName;
+        this.goToBtnCode = goToBtnCode;
+        this.goToBtnName = goToBtnName;
+        this.preShow = preShow;
+        this.showAmId = showAmId;
+        this.isCommitAble = isCommitAble;
+        this.isAutoOpenWindow = isAutoOpenWindow;
+        this.searchKey = searchKey;
+        this.groupKey = groupKey;
+    }
 }

From 1d281da5314cdb84f80dfd2e18c79c7b7e26d6b3 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Thu, 26 Sep 2019 20:34:57 +0800
Subject: [PATCH 26/28] add order spread to aps

---
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java      | 3 ++-
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java      | 5 +++++
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java      | 5 +++++
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java  | 6 ++++++
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java     | 6 ++++++
 .../main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java | 2 +-
 .../i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml  | 2 +-
 7 files changed, 26 insertions(+), 3 deletions(-)

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 b11e5dc..cf27632 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
@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import io.swagger.annotations.Api;
@@ -21,7 +22,7 @@ import java.util.List;
  **/
 @Data
 @Api("订单基类")
-public class BaseOrder extends BaseAPS {
+public class BaseOrder extends BaseCode {
     @Column(name="COUNT")
     @ApiParam(value ="数量")
     private Double count;
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
index aee742f..817df4a 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
@@ -15,6 +15,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.lang.reflect.Method;
+import java.sql.JDBCType;
 
 /**
  * @Description :字段信息
@@ -75,6 +76,10 @@ public class FieldInfo extends BaseCode {
     @ApiParam(value ="主键标识")
     private Boolean mainKey;
 
+    @Column(name="JDBC_TYPE")
+    @ApiParam(value ="数据库类型")
+    private JDBCType jdbcType;
+
     @JsonIgnore
     private transient Class<? extends BaseBean> clazz;
     @JsonIgnore
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 701ac20..54d7fc4 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,7 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -36,4 +38,7 @@ public class Inventory extends BaseOrder {
     @ApiParam(value ="多余量")
     private Double excessCount;
 
+    public Work getWork() {
+        return BeanRelation.get(this, EBaseOrder.Works);
+    }
 }
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 7fe588b..b1676d8 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,7 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -43,4 +45,8 @@ public class PurchaseOrder extends BaseOrder {
     @Column(name="EXCESS_COUNT")
     @ApiParam(value ="多余量")
     private Double excessCount;
+
+    public Work getWork() {
+        return BeanRelation.get(this, EBaseOrder.Works);
+    }
 }
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 ee332b9..f5a85dd 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,7 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -40,4 +42,8 @@ public class SalesOrder extends BaseOrder {
     @Column(name="CALC_LEAD_TIME")
     @ApiParam(value ="提前期计算值")
     private String calcLeadTime;
+
+    public Work getWork() {
+        return BeanRelation.get(this, EBaseOrder.Works);
+    }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java
index e2dba7e..49e3a5f 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java
@@ -243,7 +243,7 @@ public class BeanRelationUtil {
      * 将指定包下的类加载到内存中
      * @param packName
      */
-    private static List<Class<?>> loadClass(String packName) {
+    public static List<Class<?>> loadClass(String packName) {
         List<Class<?>> clses = new ArrayList<>();
         ClassLoader loader = Thread.currentThread().getContextClassLoader();
         String strFile = packName.replaceAll("\\.", "/");
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml
index 9f0d45d..624a636 100644
--- a/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml
@@ -2,6 +2,6 @@
 <Class name="ImportProject">
     <Relation field="Link" name="DataLink" type="MULTI_TO_ONE">
     </Relation>
-    <Relation field="Details" name="ImportDetail" reverset="Project" type="ONE_TO_MULTI" owner="true">
+    <Relation field="Details" name="ImportDetail" reverse="Project" type="ONE_TO_MULTI" owner="true">
     </Relation>
 </Class>
\ No newline at end of file

From cd8a5df9912699b16f584add423085d5f3057f8c Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Thu, 26 Sep 2019 21:06:05 +0800
Subject: [PATCH 27/28] =?UTF-8?q?VDA=20=E7=94=9F=E4=BA=A7=E5=BF=AB?=
 =?UTF-8?q?=E9=80=9F=E5=85=A5=E5=BA=93=E7=BB=84=E4=BB=B6=E5=BC=80=E5=8F=91?=
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, 3 insertions(+), 1 deletion(-)

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 0137da0..29d6961 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
@@ -560,7 +560,9 @@ public class WmsEnumUtil {
         ASN(200, "ASN", "ASN"),
         PO(210, "PO", "PO"),
         QC(220, "QC", "QC"),
-        AMPR(230, "AMPR", "AMPR");
+        AMPR(230, "AMPR", "AMPR"),
+        FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"),
+        VDA_REPORT(250, "VDA_REPORT", "VDA生产报工");
 
 
         private int value;

From 4173f0637fdb1baff6d696171474db00127f70d5 Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Thu, 26 Sep 2019 21:44:31 +0800
Subject: [PATCH 28/28] =?UTF-8?q?=E5=AE=89=E7=81=AF=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/andon/bean/AndonManageQueue.java  |  4 ++++
 .../estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java   |  7 +++++--
 .../java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java   |  2 +-
 .../cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 17 +++++++++++++++--
 4 files changed, 25 insertions(+), 5 deletions(-)

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 e03b224..a58c464 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
@@ -260,6 +260,10 @@ public class AndonManageQueue extends BaseBean {
     private List<Object> statusList;
 
     @Transient
+    @ApiParam(value = "查询条件：ANDON状态")
+    private List<Object> typeList;
+
+    @Transient
     @ApiParam(value = "比例", example = "0")
     private Double proportion;
 
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
index f89b4d0..e356a41 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
@@ -271,11 +271,13 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result);
-        DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getActionCode(), "actionCode", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getAndonOrderNo(), "andonOrderNo", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getShiftCode(), "shiftCode", result);
+        DdlPreparedPack.getInPackList(andonManageQueue.getStatusList(), "statusCode", result); // 只有安灯任务管理特殊用途
         DdlPreparedPack.getInPackArray(obj, "statusCode", result);
+        DdlPreparedPack.getInPackList(andonManageQueue.getTypeList(), "alarmCode", result); // 只有安灯任务管理特殊用途
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
 
         if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){
             DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true);
@@ -285,7 +287,8 @@ public class AndonHqlPack {
         // 根据优先级倒序，序号升序排序
 //        DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
 //                new String[]{"priorityLevel", "seq"}, result);
-        result.setOrderByStr(andonManageQueue.orderBy());
+
+         result.setOrderByStr(andonManageQueue.orderBy());
 
         return result;
     }
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
index 457b27d..716a027 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
@@ -134,7 +134,7 @@ public abstract class BaseBean implements Serializable {
         String result = "";
         if (orderByParam!=null&&orderByParam.trim().length()>0) {
             result = " order by " + orderByParam;
-            if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
+            if(ascOrDesc!= null && ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
                 result += " asc";
             }else{
                 result += " desc";
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 3d97300..f249d04 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
@@ -530,6 +530,19 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装not in List查询语句
+     *
+     * @param data
+     * @param columnName
+     * @param packBean
+     */
+    public static void getNotInPackList(List<?> data, String columnName, DdlPackBean packBean) {
+        if (data != null && data.size() > 0) {
+            packBean.addColumnQuery(columnName," and model." + columnName + "not in (:m_" + columnName + ")", data);
+        }
+    }
+
+    /**
      * 封装in String查询语句
      *
      * @param data
@@ -572,9 +585,9 @@ public class DdlPreparedPack {
             data = "";
             for (int i = 0; i < dataArray.length; i++) {
                 if (i == dataArray.length - 1) {
-                    data += "" + dataArray[i] + "";
+                    data += "'" + dataArray[i] + "'";
                 } else {
-                    data += "" + dataArray[i] + ",";
+                    data += "'" + dataArray[i] + "',";
                 }
             }
             packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);