merge master

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

@@ -3291,6 +3291,16 @@ public class MesEnumUtil {
             }
             return tmp;
         }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**

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

@@ -111,4 +111,8 @@ public class IfPackageDetail extends BaseBean  implements Serializable {
     @Column(name = "CUST_DELIVERY_LOCATION")
     @ApiParam("客户发往地")
     private String custDeliveryLocation;
+
+    @Column(name = "CUSTOMER_CODE")
+    @ApiParam("客户代码")
+    private String customerCode;
 }

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

@@ -127,4 +127,8 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @Column(name = "CT_NO")
     @ApiParam("容器编号")
     private String ctNo;
+
+    @Column(name = "CUSTOMER_CODE")
+    @ApiParam("客户代码")
+    private String customerCode;
 }

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

@@ -31,7 +31,6 @@ import java.io.Serializable;
 @Api("工位投料信息")
 public class MesCellFeed extends BaseBean implements Serializable {
     private static final long serialVersionUID = 1947971369479107782L;
-
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;

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

@@ -185,6 +185,11 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码打印状态名称")
     private String printStatusName;
 
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public Integer lockVersion;
+
     public MesProduceSn() {
     }
 

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=./