diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java
index 527cbea..1d24b39 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java
@@ -25,6 +25,7 @@ import javax.persistence.Table;
 @Table(name = "APS_ASSIST_RESOURCE_SET_TIME")
 @Api("副资源设置时间")
 public class AssistResourceSetTime extends BaseAPS {
+    private static final long serialVersionUID = 901172392855536686L;
     @Column(name="RES_CODE")
     @ApiParam(value ="资源编码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)
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 7c2d0ac..e87a86a 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
@@ -34,6 +34,7 @@ import java.util.List;
 @ExcludeImportExport
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class BaseOrder extends BaseAPS {
+    private static final long serialVersionUID = -2571085172798608026L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)
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 a0f6d02..0142e58 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
@@ -24,6 +24,7 @@ import javax.persistence.MappedSuperclass;
 @Api("规则参数基类")
 @ExcludeImportExport
 public class BaseRule extends BaseAPS {
+    private static final long serialVersionUID = -1818853814377611968L;
     @Column(name="CODE")
     @ApiParam(value ="规则编码")
     @FieldAnnotation(popSearch = true, mainkey = true)
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 23159bc..5dc8c0c 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
@@ -22,6 +22,7 @@ import javax.persistence.Table;
 @Table(name = "APS_CANCEL_PLAN_RULE")
 @Api("取消计划规则")
 public class CancelPlanRule extends BaseRule {
+    private static final long serialVersionUID = 2674055522875545446L;
     @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/DataLink.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java
index aa07354..0d537d2 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
@@ -25,6 +25,7 @@ import javax.persistence.Table;
 @Table(name = "APS_DATA_LINK")
 @Api("数据集成数据连接信息")
 public class DataLink extends BaseAPS {
+    private static final long serialVersionUID = 8324774871058505466L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(notEmpty = true)
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 acdf7e4..c6dc31a 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
@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("班次")
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class DayShift extends BaseAPS {
+    private static final long serialVersionUID = 7964370027924366093L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java
index 156673e..ea42942 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java
@@ -25,6 +25,7 @@ import javax.persistence.Table;
 @Table(name = "APS_DYNAMIC_SET_TIME")
 @Api("动态设置时间")
 public class DynamicSetTime extends BaseAPS {
+    private static final long serialVersionUID = -1696499471488104793L;
     @Column(name="RES_CODE")
     @ApiParam(value ="资源代码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)
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 31196db..e859fe8 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
@@ -27,6 +27,7 @@ import javax.persistence.Table;
 @Api("数据导出明细")
 public class ExportDetail extends BaseAPS {
 
+    private static final long serialVersionUID = -8898414164032180539L;
     @Column(name="OUT_NAME")
     @ApiParam(value ="外部表名")
     private String outName;
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 8183437..bf6ca40 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
@@ -29,6 +29,7 @@ import java.util.List;
 @Table(name = "APS_EXPORT_PROJECT")
 @Api("数据导出明细集合")
 public class ExportProject extends BaseAPS {
+    private static final long serialVersionUID = -7281303629295174330L;
     @Column(name="NAME")
     @ApiParam(value ="标识名")
     private String name;
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java
index 5ffa2de..cff475c 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java
@@ -23,6 +23,7 @@ import javax.persistence.Table;
 @Table(name = "APS_EXPRESSION_RECORD")
 @Api("表达式记录")
 public class ExpressionRecord extends BaseAPS {
+    private static final long serialVersionUID = 4038954046132896632L;
     @Column(name="BEAN_NAME")
     @ApiParam(value ="表名")
     private String beanName;
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 194075b..b8ed589 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
@@ -35,6 +35,7 @@ import java.sql.JDBCType;
 @Api("字段信息")
 @ExcludeImportExport
 public class FieldInfo extends BaseAPS {
+    private static final long serialVersionUID = -6195036426929675850L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)
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 00ba1ea..9a6c5e3 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
@@ -24,6 +24,7 @@ import javax.persistence.Table;
 @Table(name = "APS_FIELD_SET_RULE")
 @Api("属性赋值规则")
 public class FieldSetRule extends BaseRule {
+    private static final long serialVersionUID = 6880145972942618559L;
     @Column(name="BEAN")
     @ApiParam(value ="实体名")
     private ApsEnumUtil.FIELD_SET_BEAN bean;
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java
index 0d5f15e..57deab2 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java
@@ -31,6 +31,7 @@ import javax.validation.constraints.Min;
 @Api("炉容量")
 public class FurnaceCapacity extends BaseAPS {
 
+    private static final long serialVersionUID = -5657804042629460659L;
     @Column(name="RES_CODES")
     @ApiParam(value ="资源编码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java
index 9d8340d..ed046aa 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java
@@ -32,6 +32,7 @@ import java.util.List;
 @Api("炉资源计划")
 public class FurnacePlan extends BaseAPS {
 
+    private static final long serialVersionUID = 6816465736285211114L;
     @Column(name="CAPACITY", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="已占用的能力")
     private Double capacity;
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java
index 40835b2..d31c13f 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java
@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api("组炉设置")
 public class FurnaceSetting extends BaseAPS {
 
+    private static final long serialVersionUID = -4566911526487268870L;
     @Column(name="RES_CODES")
     @ApiParam(value ="资源编码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)
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 4199073..58997dc 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
@@ -24,6 +24,7 @@ import javax.persistence.Table;
 @Table(name = "APS_HEURISTIC_RULE")
 @Api("排程运算规则")
 public class HeuristicRule extends BaseRule {
+    private static final long serialVersionUID = -4856714428377308150L;
     @Column(name="WORK_FILTER")
     @ApiParam(value ="工作筛选")
     private String workFilter;
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 0eaaeaa..ecb13e1 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
@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("数据导入明细")
 public class ImportDetail extends BaseAPS {
 
+    private static final long serialVersionUID = 1264030397500660450L;
     @Column(name="OUT_NAME")
     @ApiParam(value ="外部表名")
     private String outName;
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 6cc2b67..35aaf50 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
@@ -28,6 +28,7 @@ import java.util.List;
 @Table(name = "APS_IMPORT_PROJECT")
 @Api("数据导入明细集合")
 public class ImportProject extends BaseAPS {
+    private static final long serialVersionUID = -1899074765155621438L;
     @Column(name="NAME")
     @ApiParam(value ="标识名")
     private String name;
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 741324f..8fab6d1 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
@@ -26,6 +26,7 @@ import javax.persistence.Table;
 @Table(name = "APS_INVENTORY")
 @Api("库存")
 public class Inventory extends BaseOrder {
+    private static final long serialVersionUID = 2378846162007550439L;
     @Column(name="SPECIFY_TOP_ORDER")
     @ApiParam(value ="指定顶层订单")
     private String specifyTopOrder;
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 95baac0..a8a491e 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
@@ -24,6 +24,7 @@ import javax.persistence.Table;
 @Table(name = "APS_MAT_CALC_RULE")
 @Api("物料运算规则")
 public class MatCalcRule extends BaseRule {
+    private static final long serialVersionUID = 2102986260688118982L;
     @Column(name="MATERIAL_FILTER")
     @ApiParam(value ="物料筛选")
     private String materialFilter;
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 7c7c313..effc70e 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
@@ -34,6 +34,7 @@ import java.util.List;
 @Api("物料")
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class Material extends BaseAPS {
+    private static final long serialVersionUID = -7928225487946173108L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java
index e362742..779b527 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java
@@ -25,6 +25,7 @@ import javax.persistence.Table;
 @Table(name = "APS_MATERIAL_SET_TIME")
 @Api("物料设置时间")
 public class MaterialSetTime extends BaseAPS {
+    private static final long serialVersionUID = -7996431489447641539L;
     @Column(name="RES_CODE")
     @ApiParam(value ="资源编码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)
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 11cedff..2d389fa 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
@@ -29,6 +29,7 @@ import java.util.List;
 @Table(name = "APS_OPER_INPUT")
 @Api("工序输入")
 public class OperInput extends BaseAPS {
+    private static final long serialVersionUID = 6653235155693766804L;
     @Column(name="OPERATION_ID")
     @ApiParam(value ="工序")
     @FieldAnnotation(relation = "Operation", notEmpty = true, display = false)
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 476d45b..e17e69d 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
@@ -28,6 +28,7 @@ import java.util.List;
 @Table(name = "APS_OPER_OUTPUT")
 @Api("工序输出")
 public class OperOutput extends BaseAPS {
+    private static final long serialVersionUID = 3185682762290147209L;
     @Column(name="OPERATION_ID")
     @ApiParam(value ="工序")
     @FieldAnnotation(relation = "Operation", notEmpty = true, display = false)
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 b6923c0..e054949 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
@@ -29,6 +29,7 @@ import java.util.List;
 @Table(name = "APS_OPER_RESOURCE")
 @Api("工序资源")
 public class OperResource extends BaseAPS {
+    private static final long serialVersionUID = -8683889582369342606L;
     @Column(name="OPERATION_ID")
     @ApiParam(value ="工序")
     @FieldAnnotation(relation = "Operation", notEmpty = true, display = false)
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 274574b..218f7f3 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
@@ -29,6 +29,7 @@ import java.util.List;
 @Table(name = "APS_OPERATION")
 @Api("工序")
 public class Operation extends BaseAPS {
+    private static final long serialVersionUID = 4394179144091116858L;
     @Column(name="NUMBER")
     @ApiParam(value ="工序号")
     @FieldAnnotation(notEmpty = true)
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java
index 0c6a9a5..b5dad6b 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java
@@ -24,6 +24,7 @@ import java.util.Date;
 @Api("订单树")
 @ExcludeImportExport
 public class OrderTree extends BaseAPS {
+    private static final long serialVersionUID = -7505923374791695738L;
     @ApiParam(value ="物料编码")
     private String material;
 
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 0281199..2c394a3 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
@@ -26,6 +26,7 @@ import java.util.Date;
 @Table(name = "APS_OVERTIME_CALENDAR")
 @Api("加班日历")
 public class OvertimeCalendar extends BaseAPS {
+    private static final long serialVersionUID = -501715721073189464L;
     @Column(name="RES_CODES")
     @ApiParam(value ="资源代码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java
index 9756426..6fbd9d1 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java
@@ -32,6 +32,7 @@ import java.util.List;
 @Api("父工作")
 @ExcludeImportExport
 public class ParentWork extends BaseAPS {
+    private static final long serialVersionUID = 8792781216193806606L;
     @Column(name="count", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="数量")
     private Double count;
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 860e0a3..8855d00 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
@@ -27,6 +27,7 @@ import javax.persistence.Table;
 @Api("工作反馈")
 public class PlanFeedback extends BaseAPS {
 
+    private static final long serialVersionUID = 2520555825093741381L;
     @Column(name="WORK_ID")
     @ApiParam(value ="工作")
     @FieldAnnotation(property = false)
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 37548d8..dee531b 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
@@ -30,6 +30,7 @@ import java.util.List;
 @Table(name = "APS_PRODUCT_ORDER")
 @Api("生产订单")
 public class ProductOrder extends BaseOrder {
+    private static final long serialVersionUID = 6900226668783662736L;
     @Column(name="EST")
     @ApiParam(value ="最早开始时间")
     private Date est;
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 06ac508..a109c6a 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
@@ -33,6 +33,7 @@ import java.util.List;
 @Api("工艺路线")
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class ProductRouting extends BaseAPS {
+    private static final long serialVersionUID = 4905294866468216722L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)
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 b6687d9..bee905c 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
@@ -27,6 +27,7 @@ import javax.persistence.Table;
 @Table(name = "APS_PURCHASE_ORDER")
 @Api("采购订单")
 public class PurchaseOrder extends BaseOrder {
+    private static final long serialVersionUID = 4699381603433121631L;
     @Column(name="SPECIFY_TOP_ORDER")
     @ApiParam(value ="指定顶层订单")
     private String specifyTopOrder;
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 96de9d2..d37f81a 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
@@ -29,6 +29,7 @@ import java.util.List;
 @Table(name = "APS_RES_CALENDAR")
 @Api("日历")
 public class ResCalendar extends BaseAPS {
+    private static final long serialVersionUID = 8338930205816433211L;
     @Column(name="RES_CODES")
     @ApiParam(value ="资源编码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)
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 515cd7b..7733715 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
@@ -33,6 +33,7 @@ import java.util.List;
 @Api("资源")
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class Resource extends BaseAPS {
+    private static final long serialVersionUID = 3304084329600816457L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java
index df02228..31fb91b 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java
@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @ExcludeImportExport
 public class RuleDetail extends BaseAPS {
 
+    private static final long serialVersionUID = -6433950357039396107L;
     @Column(name="TYPE")
     @ApiParam(value ="规则类型")
     private ApsEnumUtil.RULE_TYPE 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 85b3191..28e424e 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
@@ -29,6 +29,7 @@ import java.util.List;
 @Api("规则组合")
 @ExcludeImportExport
 public class RuleGroup extends BaseAPS {
+    private static final long serialVersionUID = 4741897751041891075L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     private String code;
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 d973fb4..7baa32a 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
@@ -28,6 +28,7 @@ import java.util.Date;
 @Table(name = "APS_SALES_ORDER")
 @Api("销售订单")
 public class SalesOrder extends BaseOrder {
+    private static final long serialVersionUID = -511784925441907538L;
     @Column(name="LOW_EST")
     @ApiParam(value ="底阶最早开始时间")
     private Date lowEst;
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java
index fbe37f0..6d0f976 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java
@@ -26,6 +26,7 @@ import javax.persistence.Table;
 @ExcludeImportExport
 public class SerialNumber extends BaseAPS {
 
+    private static final long serialVersionUID = 312483211086701109L;
     @Column(name="NUMBER")
     @ApiParam(value ="流水号")
     private Integer number;
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java
index 6b83309..bc0ec95 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java
@@ -27,6 +27,7 @@ import javax.persistence.Table;
 @Api("运输时间")
 public class ShippingTime extends BaseAPS {
 
+    private static final long serialVersionUID = -8698904420363808737L;
     @Column(name="PREV_RES_CODE")
     @ApiParam(value ="前资源编码")
     @FieldAnnotation(relation = "PrevRes")
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 b24c7aa..48ace75 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
@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api("标准工序")
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class StandOperation extends BaseAPS {
+    private static final long serialVersionUID = -6869403951765771775L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)
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 2a24fcb..669df55 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,6 +26,7 @@ import java.util.Date;
 @Table(name = "APS_SYS_PARAM")
 @Api("系统参数")
 public class SysParam extends BaseAPS {
+    private static final long serialVersionUID = 3115620726438869596L;
     @Column(name="BASE_TIME")
     @ApiParam(value ="基准时间")
     private Date baseTime;
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 472b69c..9b898b5 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
@@ -34,6 +34,7 @@ import java.util.List;
 @Api("工作")
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class Work extends BaseAPS {
+    private static final long serialVersionUID = 6471740978550523187L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true, modify = false)
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 94e1a71..4390af5 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
@@ -29,6 +29,7 @@ import java.util.List;
 @Table(name = "APS_WORK_INPUT")
 @Api("工作输入")
 public class WorkInput extends BaseAPS {
+    private static final long serialVersionUID = 2654389476284740183L;
     @Column(name="WORK_ID")
     @ApiParam(value ="工作")
     @FieldAnnotation(relation = "Work")
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 ef453ce..7f04aba 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
@@ -31,6 +31,7 @@ import java.util.List;
 @Api("工作输出")
 public class WorkOutput extends BaseAPS {
 
+    private static final long serialVersionUID = 6031001499619328313L;
     @Column(name="WORK_ID")
     @ApiParam(value ="工作")
     @FieldAnnotation(relation = "Work")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
index 455ae2c..53c1be7 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
@@ -35,6 +35,7 @@ import java.util.List;
 @Api("工作计划")
 public class WorkPlan extends BaseAPS {
 
+    private static final long serialVersionUID = 5489548115780676195L;
     @Column(name="WORK_ID")
     @ApiParam(value ="工作")
     @FieldAnnotation(relation = "Work")
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 1bfbecf..607a948 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
@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("工作关联")
 public class WorkRelation extends BaseAPS {
 
+    private static final long serialVersionUID = -5824884364328962956L;
     @Column(name="MATERIAL_ID")
     @ApiParam(value ="物料")
     @FieldAnnotation(relation = "Material", modify = false)
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 795117a..727c9a2 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
@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("工作资源")
 public class WorkResource extends BaseAPS {
 
+    private static final long serialVersionUID = 4791940404968841144L;
     @Column(name="WORK_ID")
     @ApiParam(value ="工作")
     @FieldAnnotation(relation = "Work")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java
index 96ba229..9c98bdb 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java
@@ -25,6 +25,7 @@ import java.util.HashMap;
 @MappedSuperclass
 @ExcludeImportExport
 public abstract class BaseAPS extends BaseBean {
+    private static final long serialVersionUID = -8638842158403944318L;
     @JsonIgnore
     @Lob
     @FieldAnnotation(property = false)
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
index c2732ee..58d22b3 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
@@ -19,7 +19,7 @@ public class AndonEnumUtil {
     public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE {
         INNER(10, "内部处理"),
         OUTER(20, "外部处理"),
-        REVIEW(30, "人工审核");
+        REVIEW(30, "人工确认");
 
         private int value;
         private String description;
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 b6f8338..d115557 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
@@ -6148,4 +6148,50 @@ public class MesEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * 盲检类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TOPIC_TYPE {
+        COLOUR(10, "颜色"),
+        GRADE(20, "等级"),
+        TO_CONFIGURE(30, "配置");
+
+        private int value;
+        private String description;
+
+        TOPIC_TYPE(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) {
+            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 c34d351..7eb6955 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
@@ -612,6 +612,16 @@ public class MesPcnEnumUtil {
             return tmp;
         }
 
+        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 MES_MATCH_TYPE getByValue(int value) {
             for (MES_MATCH_TYPE mesMatchType : values()) {
                 if (mesMatchType.getValue() == value) {
@@ -4044,4 +4054,50 @@ public class MesPcnEnumUtil {
         }
     }
 
+
+    /**
+     * 盲检类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TOPIC_TYPE {
+        COLOUR(10, "零件颜色"),
+        GRADE(20, "等级"),
+        TO_CONFIGURE(30, "配置");
+
+        private int value;
+        private String description;
+
+        TOPIC_TYPE(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) {
+            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/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
index 8791cb5..679e650 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
@@ -14,6 +14,83 @@ import static cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil.MONITOR_PROCESS_
 public class PtlPcnEnumUtil {
 
     /**
+     * 状态机异常处理方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE {
+        INNER(10, "内部处理"),
+        OUTER(20, "外部处理"),
+        REVIEW(30, "人工确认");
+
+        private int value;
+        private String description;
+
+        ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 状态机异常处理状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS {
+        TRUE(10, "已处理"),
+        FALSE(20, "未处理");
+
+        private int value;
+        private String description;
+
+        ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 状态机异常缓存标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG {
+        FALSE(10, "否"),
+        TRUE(20, "是"),
+        ORIGINAL(30, "原先");
+
+        private int value;
+        private String description;
+
+        ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * 控制器状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
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 196d4e9..b03f825 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
@@ -7399,6 +7399,81 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 库位利用率
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LOCATE_PROPORTION {
+        ZERO(10, "ZERO", "0%"),
+        GENERAL(20, "GENERAL", "0%-30%"),
+        MEDIUM(30, "MEDIUM", "30%-60%"),
+        WELL(40, "WELL", "60%-100%");
+
+        private int value;
+        private String code;
+        private String description;
+
+        LOCATE_PROPORTION(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static LOCATE_PROPORTION codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
      * BH同步标识
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java
index cba882b..2f35bf8 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java
@@ -60,4 +60,8 @@ public class MesBlindHistory extends BaseBean implements Serializable {
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
+    @Transient
+    @ApiParam("主队列编号")
+    private String orderNo;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java
index 1d8bdde..147e91c 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java
@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -62,4 +63,8 @@ public class MesBlindRule extends BaseBean implements Serializable {
     @ApiParam("零件颜色")
     private String partColor;
 
+    @Transient
+    @ApiParam("零件颜色")
+    private String rightKey;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java
index 91ddc09..b82bbae 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java
@@ -51,7 +51,7 @@ public class MesBlindTopicSetting extends BaseBean implements Serializable {
     private Integer topicType;
 
     @Column(name = "QTY")
-    @ApiParam("答案数量")
+    @ApiParam("错误答案数量")
     private Integer qty;
 
     @Column(name = "WORK_CELL_CODE")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java
index 28b8235..c130f5b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java
@@ -82,6 +82,12 @@ public class GenSerialNoModel {
     @ApiParam("当前编号")
     private String currentNumber;
 
+    @ApiParam("物料类型3")
+    private String categoryCode3;
+
+    @ApiParam("零件号后4位")
+    private String partNoAfterFour;
+
 
     public GenSerialNoModel(String ruleCode) {
         this.ruleCode = ruleCode;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java
index af48ce8..01e2d64 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java
@@ -32,4 +32,11 @@ public class MesBlindProbleModel extends BaseBean {
 
     @ApiParam(value = "正确答案")
     private String rightKey;
+
+    @ApiParam(value = "工厂代码")
+    private String organizeCode;
+
+    @ApiParam("序号")
+    private String topicId;
+
 }
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 7ba5be9..07ac37c 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
@@ -2888,28 +2888,29 @@ public class MesHqlPack {
         return result;
     }
 
-//    public static DdlPackBean getMesBlindRule(MesBlindRule mesBlindRule) {
-//        DdlPackBean packBean = getAllBaseData(mesBlindRule.getOrganizeCode());
-//        DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarType(), "carType", packBean);
-//        DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarColor(), "carColor", packBean);
-//        DdlPreparedPack.getStringLikerPack(mesBlindRule.getPartCode(), "partCode", packBean);
-//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartName(), "partName", packBean);
-//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarConfig(), "carConfig", packBean);
-//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarLevel(), "carLevel", packBean);
-//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartColor(), "partColor", packBean);
-//        DdlPreparedPack.getNumEqualPack(mesBlindRule.getIsValid(), "isValid", packBean);
-//        return packBean;
-//    }
-
-//    public static DdlPackBean getMesBlindTopicSetting(MesBlindTopicSetting mesBlindTopicSetting) {
-//        DdlPackBean packBean = getAllBaseData(mesBlindTopicSetting.getOrganizeCode());
-//        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicCode(), "topicCode()", packBean);
-//        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicDesc(), "topicDesc", packBean);
-//        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getWorkCellCode(), "workCellCode", packBean);
-//        DdlPreparedPack.getStringEqualPack(mesBlindTopicSetting.getWorkCenterCode(), "workCenterCode", packBean);
-//        DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getIsValid(), "isValid", packBean);
-//        return packBean;
-//    }
+    public static DdlPackBean getMesBlindRule(MesBlindRule mesBlindRule) {
+        DdlPackBean packBean = getAllBaseData(mesBlindRule.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarType(), "carType", packBean);
+        DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarColor(), "carColor", packBean);
+        DdlPreparedPack.getStringLikerPack(mesBlindRule.getPartCode(), "partCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartName(), "partName", packBean);
+        DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarConfig(), "carConfig", packBean);
+        DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarLevel(), "carLevel", packBean);
+        DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartColor(), "partColor", packBean);
+        DdlPreparedPack.getNumEqualPack(mesBlindRule.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getMesBlindTopicSetting(MesBlindTopicSetting mesBlindTopicSetting) {
+        DdlPackBean packBean = getAllBaseData(mesBlindTopicSetting.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicCode(), "topicCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicDesc(), "topicDesc", packBean);
+        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesBlindTopicSetting.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getTopicType(), "topicType", packBean);
+        DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
 
     /**
      * MES 校枪记录
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
index 6c67531..ce8771b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
@@ -10,6 +10,9 @@ import cn.estsh.i3plus.pojo.mes.bean.*;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Description:
  * @Reference: Mes 条件封装
@@ -541,4 +544,58 @@ public class MesPcnHqlPack {
         return packBean;
     }
 
+    /**
+     * 得到分页后的数据
+     *
+     * @return 分页数据
+     */
+    public static <T> List<T> getPage(List<T> totalList, int currentPage, int pageSize, int totalPage) {
+        if (currentPage <= 0) {
+            currentPage = 1;
+        }
+
+        if (currentPage >= totalPage) {
+            currentPage = totalPage;
+        }
+
+        List<T> subList = new ArrayList<>();
+        if (null != totalList) {
+            subList.addAll(totalList.subList(getStartIndex(totalList, currentPage, pageSize, totalPage),
+                    getEndIndex(totalList, currentPage, pageSize, totalPage)));
+        }
+
+        return subList;
+    }
+
+    private static <T> int getStartIndex(List<T> totalList, int currentPage, int pageSize, int totalRecord) {
+        if (null == totalList) {
+            return 0;
+        }
+        int startIndex = (currentPage - 1) * pageSize;
+        if (startIndex > totalRecord) {
+            startIndex = totalRecord;
+        }
+        if (startIndex < 0) {
+            startIndex = 0;
+        }
+        return startIndex;
+    }
+
+    private static <T> int getEndIndex(List<T> totalList, int currentPage, int pageSize, int totalRecord) {
+        if (null == totalList) {
+            return 0;
+        }
+        int endIndex = getStartIndex(totalList, currentPage, pageSize, totalRecord) + pageSize;
+        if (endIndex < 0) {
+            endIndex = 0;
+        }
+        if (endIndex < getStartIndex(totalList, currentPage, pageSize, totalRecord)) {
+            endIndex = getStartIndex(totalList, currentPage, pageSize, totalRecord);
+        }
+        if (endIndex > totalRecord) {
+            endIndex = totalRecord;
+        }
+        return endIndex;
+    }
+
 }
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java
new file mode 100644
index 0000000..3dbf05e
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java
@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.model.mes;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description : Mes电检检测实体字段Model信息
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-06-01 09:53
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+public class MesElectricDataModel implements Serializable {
+
+    private static final long serialVersionUID = -6376845639646546495L;
+
+    @ApiParam(value = "车型")
+    public String carType;
+
+    @ApiParam(value = "颜色代码")
+    public String colorCode;
+
+    @ApiParam(value = "日期时间")
+    private String dateTime;
+
+    @ApiParam(value = "生产序号")
+    private String productSeq;
+
+    @ApiParam(value = "车型信息")
+    private String carTypeInfo;
+
+    @ApiParam(value = "生产模式")
+    private String productModel;
+
+    @ApiParam(value = "产品生产号")
+    private String productNumber;
+
+    @ApiParam(value = "备用")
+    private String spare;
+
+    @ApiParam(value = "所有零件信息包括所有选配信息")
+    private String other;
+
+    @ApiParam(value = "电检结果")
+    private String electricResult;
+
+    @ApiParam(value = "文件名称")
+    private String ftpFileName;
+}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricMarkUpDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricMarkUpDataModel.java
new file mode 100644
index 0000000..70d7af5
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricMarkUpDataModel.java
@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.model.mes;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description : Mes电检检测补录数据实体字段Model信息
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-06-02 09:53
+ * @Modify:
+ **/
+@Data
+public class MesElectricMarkUpDataModel implements Serializable {
+
+    private static final long serialVersionUID = -6376845779646546495L;
+
+    @ApiParam(value = "工作中心代码")
+    public String workCenterCode;
+
+    @ApiParam(value = "工作单元代码")
+    public String workCellCode;
+
+    @ApiParam(value = "过程条码")
+    private String serialNumber;
+
+    @ApiParam(value = "产品生产号")
+    private String productNumber;
+
+    @ApiParam(value = "电检结果")
+    private String electricResult;
+
+    @ApiParam(value = "测试时间")
+    private String testDateTime;
+
+    @ApiParam(value = "是否补录")
+    private Integer isMarkUp;
+
+    @ApiParam(value = "补录时间")
+    private String markUpDateTime;
+
+    @ApiParam(value = "开始时间")
+    private String startDateTimeStr;
+
+    @ApiParam(value = "结束时间")
+    private String endDateTimeStr;
+
+    public MesElectricMarkUpDataModel(String workCenterCode, String workCellCode, String serialNumber, String productNumber,
+                                      String electricResult, String testDateTime, Integer isMarkUp, String markUpDateTime) {
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.serialNumber = serialNumber;
+        this.productNumber = productNumber;
+        this.electricResult = electricResult;
+        this.testDateTime = testDateTime;
+        this.isMarkUp = isMarkUp;
+        this.markUpDateTime = markUpDateTime;
+    }
+}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateModel.java
new file mode 100644
index 0000000..d3c3112
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateModel.java
@@ -0,0 +1,73 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-06-02 9:27
+ * @Modify:
+ **/
+@Data
+public class WmsLocateModel implements Serializable {
+
+    private static final long serialVersionUID = 2433931236774158401L;
+
+    @ApiParam(value = "箱数")
+    public Long snBoxQty;
+
+    @ApiParam(value = "最大包装数量")
+    public Integer maxPackageQty;
+
+    @ApiParam(value = "库位利用率值")
+    public Double proportionValue;
+
+    @ApiParam(value = "库位代码")
+    public String locateNo;
+
+    @ApiParam(value = "库位名称")
+    public String locateName;
+
+    @ApiParam(value = "存储区代码")
+    public String zoneNo;
+
+    @ApiParam(value = "存储区名称")
+    public String zoneName;
+
+    @ApiParam(value = "仓库代码")
+    public String whNo;
+
+    @ApiParam(value = "仓库名称")
+    public String whNoName;
+
+    @ApiParam(value = "组织代码")
+    public String organizeCode;
+
+    @ApiParam(value = "库位利用率查询")
+    public Integer proportion;
+
+    @ApiParam(value = "库位利用率")
+    public String proportionValueStr;
+
+    public WmsLocateModel() {
+    }
+
+    public WmsLocateModel(Long snBoxQty, Integer maxPackageQty, Double proportionValue,
+                          String locateNo, String locateName, String zoneNo,
+                          String zoneName, String whNo, String whNoName, String organizeCode) {
+        this.snBoxQty = snBoxQty;
+        this.maxPackageQty = maxPackageQty;
+        this.proportionValue = proportionValue;
+        this.locateNo = locateNo;
+        this.locateName = locateName;
+        this.zoneNo = zoneNo;
+        this.zoneName = zoneName;
+        this.whNo = whNo;
+        this.whNoName = whNoName;
+        this.organizeCode = organizeCode;
+    }
+}
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java
index ec94e86..1795f20 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java
@@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -56,9 +55,16 @@ public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable
     @ApiParam(value = "缓存标识")
     private Integer cacheFlag;
 
-    @Lob
-    @Column(name = "CONTENT")
-    @ApiParam(value = "内容")
-    private String content;
+    @Column(name = "CACHE_KEY")
+    @ApiParam(value = "缓存KEY")
+    private String cacheKey;
+
+    @Column(name = "HANDLE_TYPE")
+    @ApiParam(value = "处理方式")
+    private Integer handleType;
+
+    @Column(name = "HANDLE_STATUS")
+    @ApiParam(value = "处理状态")
+    private Integer handleStatus;
 
 }
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java
index c079dc1..249a802 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java
@@ -48,7 +48,10 @@ public class CommonMsgModel implements Serializable {
     @ApiModelProperty("外部触发事件")
     private String triggerEvent;
 
-    @ApiModelProperty("流程类型")
-    private Integer routeType;
+    @ApiModelProperty("缓存KEY")
+    private String cacheKey;
+
+    @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
+    private boolean errorInnerAction = false;
 
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
index b9bb342..efdb745 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
@@ -175,6 +175,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
     private Integer destBoxQty;
 
     @Transient
+    @ApiParam(value = "库位利用率")
+    public Integer proportion;
+
+    @Transient
     @ApiParam(value = "错误信息", example = "-1")
     private String errorMsg;
 
diff --git a/sonar-project.properties b/sonar-project.properties
index 932bdd9..3428e74 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-TEST-SNAPSHOT
+sonar.projectVersion=1.0-PROD-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./