冲突解决

modules/i3plus-pojo-andon/pom.xml

@@ -13,7 +13,6 @@
     <artifactId>i3plus-pojo-andon</artifactId>
     <packaging>jar</packaging>
 
-
     <dependencies>
         <dependency>
             <groupId>i3plus.pojo</groupId>

modules/i3plus-pojo-base/pom.xml

@@ -13,7 +13,6 @@
     <artifactId>i3plus-pojo-base</artifactId>
     <packaging>jar</packaging>
 
-
     <dependencies>
         <dependency>
             <groupId>org.apache.shiro</groupId>

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -4600,4 +4600,49 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 容器使用状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_CONTAINER_STATUS {
+        FREE(10, "空闲"),
+        OCCUPY(20, "占用");
+
+        private int value;
+        private String description;
+
+        MES_CONTAINER_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;
+        }
+
+        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;
+        }
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -3269,4 +3269,49 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 容器使用状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_CONTAINER_STATUS {
+        FREE(10, "空闲"),
+        OCCUPY(20, "占用");
+
+        private int value;
+        private String description;
+
+        MES_CONTAINER_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;
+        }
+
+        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;
+        }
+    }
 }

modules/i3plus-pojo-hardswitch/pom.xml

@@ -13,7 +13,6 @@
     <artifactId>i3plus-pojo-hardswitch</artifactId>
     <packaging>jar</packaging>
 
-
     <profiles>
         <profile>
             <id>dev</id>

modules/i3plus-pojo-lac/pom.xml

@@ -13,7 +13,6 @@
     <artifactId>i3plus-pojo-lac</artifactId>
     <packaging>jar</packaging>
 
-
     <dependencies>
         <dependency>
             <groupId>i3plus.pojo</groupId>

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

@@ -13,7 +13,6 @@
     <artifactId>i3plus-pojo-mes-pcn</artifactId>
     <packaging>jar</packaging>
 
-
     <dependencies>
         <dependency>
             <groupId>i3plus.pojo</groupId>

modules/i3plus-pojo-mes/pom.xml

@@ -13,7 +13,6 @@
     <artifactId>i3plus-pojo-mes</artifactId>
     <packaging>jar</packaging>
 
-
     <dependencies>
         <dependency>
             <groupId>i3plus.pojo</groupId>

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java

@@ -106,6 +106,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("打印缓存id")
     private String printId;
 
+    @Column(name = "CT_NO")
+    @ApiParam("容器编号")
+    private String ctNo;
+
     public MesPackage() {
     }
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java

@@ -132,4 +132,10 @@ public class MesPlc extends BaseBean implements Serializable {
     @Column(name = "TOOLING_CODE ")
     @ApiParam("工装代码")
     private String toolingCode;
+
+
+    @Transient
+    @ApiParam("标签数据")
+    private String tableValue;
+
 }

modules/i3plus-pojo-model/pom.xml

@@ -13,7 +13,6 @@
     <artifactId>i3plus-pojo-model</artifactId>
     <packaging>jar</packaging>
 
-
     <dependencies>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

modules/i3plus-pojo-report/pom.xml

@@ -13,7 +13,6 @@
     <artifactId>i3plus-pojo-report</artifactId>
     <packaging>jar</packaging>
 
-
     <dependencies>
 
         <dependency>

modules/i3plus-pojo-softswitch/pom.xml

@@ -13,7 +13,6 @@
     <artifactId>i3plus-pojo-softswitch</artifactId>
     <packaging>jar</packaging>
 
-
     <dependencies>
 
         <dependency>