Merge remote-tracking branch 'origin/test' into test

modules/i3plus-pojo-andon/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-andon</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-aps/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-aps</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-base/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-base</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-form/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-form</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
 

modules/i3plus-pojo-hardswitch/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-hardswitch</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <profiles>
         <profile>

modules/i3plus-pojo-ics/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-ics</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-jobflow/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-jobflow</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <profiles>
         <profile>

modules/i3plus-pojo-lac/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-lac</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-mes-pcn/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-mes-pcn</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-mes/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-mes</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

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<MesOperateObjectAttribute> operateObjectAttributes;
+
+    @Transient
+    @ApiParam("手工录入集合")
+    private List<String> attributes;
 }

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;
 }

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;

modules/i3plus-pojo-model/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-model</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-platform/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-platform</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-ptl/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-ptl</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-report/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-report</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
 

modules/i3plus-pojo-softswitch/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-softswitch</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
 

modules/i3plus-pojo-sweb/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-sweb</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-wms/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-wms</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-workflow/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-workflow</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <profiles>
         <profile>