Jenkins自动合并

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

@@ -4875,4 +4875,49 @@ public class WmsEnumUtil {
         }
     }
 
+
+    /**
+     * 流程提交类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum GROUP_COMMIT_MODE {
+        JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"),REF_GROUP(30, 30, "关联分组号提交");
+
+        private int value;
+        private int code;
+        private String description;
+
+        GROUP_COMMIT_MODE(int value, int code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public int getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(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 valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
 }

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -69,15 +70,14 @@ public class WmsActionGroup extends BaseBean {
     @AnnoOutputColumn
     private Integer autoInit;
 
-    // 1=true, 2 = false
+    @Column(name = "COMMIT_MODE", nullable = false)
-    @Column(name = "IS_COMMIT_REF_MOVE", nullable = false)
+    @ApiParam(value = "提交移动单模式")
-    @ApiParam(value = "是否连带提交创建状态移动单", example = "2")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.GROUP_COMMIT_MODE.class)
-    @AnnoOutputColumn
+    private Integer commitMode;
-    private Integer isCommitRefMove;
 
     // 1=true, 2 = false
     @Column(name = "IS_AUTO_COMMIT", nullable = false)
-    @ApiParam(value = "是否自动提交", example = "1")
+    @ApiParam(value = "是否自动提交")
     @AnnoOutputColumn
     private Integer isAutoCommit;
 
@@ -102,8 +102,8 @@ public class WmsActionGroup extends BaseBean {
         return this.endAmId == null ? 0 : this.endAmId.longValue();
     }
 
-    public int getIsCommitRefMoveVal() {
+    public int getCommitModeVal() {
-        return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue();
+        return this.commitMode == null ? 0 : this.commitMode.intValue();
     }
 
     public int getIsAutoCommitVal() {