diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index bc7071b..4988f31 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-andon
jar
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index f902a7c..4104107 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-aps
jar
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index 807bef5..96472ad 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-base
jar
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index b948580..9be7e80 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-form
jar
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index e12eaee..53cfea6 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-hardswitch
jar
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml
index c338f71..5e5ef03 100644
--- a/modules/i3plus-pojo-ics/pom.xml
+++ b/modules/i3plus-pojo-ics/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-ics
jar
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index 1674a47..44c0526 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-jobflow
jar
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index 7637865..122cb94 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-lac
jar
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index bf96e57..f9957c9 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-mes-pcn
jar
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index a758a6a..409b79a 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-mes
jar
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java
index 83c18ad..0fedc5b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java
@@ -123,4 +123,8 @@ public class MesOee extends BaseBean implements Serializable {
@Transient
@ApiParam("自定义数据map")
private List operateObjectAttributes;
+
+ @Transient
+ @ApiParam("手工录入集合")
+ private List attributes;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java
index e05a54e..9a340e4 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java
@@ -50,8 +50,4 @@ public class MesOperateObjectAttribute extends BaseBean implements Serializable
@Transient
@ApiParam("属性值")
private String attributeValue;
-
- @Transient
- @ApiParam("是否自定义属性")
- private boolean customAttribute = false;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
index c6a3d0a..3f0402c 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
@@ -84,6 +84,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
@ApiParam("间隔时间")
private Integer checkInterval = 0;
+ @Column(name = "IS_CONCESSION")
+ @ApiParam("是否允许让步")
+ private Integer isConcession = 0;
+
@Transient
@ApiParam("检测类型名称")
private String checkTypeName;
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index efacfd2..846c302 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-model
jar
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index dba12cc..c94172f 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-platform
jar
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index 81670b2..4dd7471 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-ptl
jar
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index 26a7311..c45f09e 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-report
jar
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index eaf2544..1b72275 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-softswitch
jar
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index 0f615b6..94fb42a 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-sweb
jar
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index 9e5f745..cac0256 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-wms
jar
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index 0fea52b..af52bb4 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-workflow
jar
+ 1.0-TEST-SNAPSHOT