Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -2593,6 +2593,8 @@ public class MesPcnEnumUtil {
         TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"),
         TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"),
         TIME_MODULE_START("timeModuleStart", "定时组件开始"),
+        ADDITIONAL_TIPS("additionalTips", "额外帮助信息显示"),
+        ADDITIONAL_TIPS_HIDE("additionalTipsHide", "额外帮助信息隐藏"),
         TIME_MODULE_STOP("timeModuleStop", "定时组件暂停");
         //TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件");
 
@@ -3556,8 +3558,9 @@ public class MesPcnEnumUtil {
         JUMP_STEP(10, "JUMP_STEP", "跳过工步"),
         REDO_PROCESS(20, "REDO_PROCESS", "重做工序"),
         JUMP_PROCESS(30, "JUMP_PROCESS", "跳过工序"),
-        NORMAL_COMPLETE(40, "NORMAL_COMPLETE", "正常完成");
-
+        NORMAL_COMPLETE(40, "NORMAL_COMPLETE", "正常完成"),
+        CLEAR_CACHE(50, "CLEAR_CACHE", "工步已清空缓存，执行完工步之后无需放入StationRequestBean");
+        
         private int value;
         private String code;
         private String description;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -11,7 +10,10 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.Table;
 
 /**
  * @Description :作业记录参数表
@@ -40,7 +42,10 @@ public class WmsActionLogData extends BaseBean {
     @ApiParam(value = "交易类型编号")
     public String transTypeCode;
 
-    @Transient
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "业务单号")
+    public String orderNo;
+
     @Column(name = "MOVE_NO")
     @ApiParam(value = "移动单单号")
     public String moveNo;

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-PROD-SNAPSHOT
+sonar.projectVersion=1.0-TEST-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./