diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index f04b9e2..430bead 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -492,9 +492,9 @@ public class WmsEnumUtil {
         OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"),
         NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库"),
         SUPPLIER_RETURN_SMRR(190, "SUPPLIER_RETURN_SMRR", "供应商退货(SMRR)"),
-        NC_DISMANTLING_PICKING(160,"NC_DISMANTLING_PICKING","NC拆解领料"),
-        NC_DISMANTLING_RETREAT(170,"NC_DISMANTLING_RETREAT","NC拆解退料"),
-        LINE_EDGE_SCRAPPING_OUT(180,"LINE_EDGE_SCRAPPING_OUT","线边报废出库");
+        NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"),
+        NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"),
+        LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库");
 
 
         private int value;
@@ -851,7 +851,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_QC_STATUS {
-        NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40,"ISOLATED", "报废");
+        NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "ISOLATED", "报废");
 
         private int value;
         private String code;
@@ -919,7 +919,7 @@ public class WmsEnumUtil {
         private int value;
         private String description;
 
-        CS_ORDER_TYPE(int value,String description) {
+        CS_ORDER_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -948,12 +948,12 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CS_ORDER_STATUS {
-        CREATE(10,"CREATE", "创建"),
-        STARTING_INVENTORY(20,"STARTING_INVENTORY", "开启盘点"),
-        IN_INVENTORY(30,"IN_INVENTORY", "盘点中"),
-        INVENTORY_FINISH(40,"INVENTORY_FINISH", "盘点完成"),
-        THAWING(50,"THAWING", "已解冻"),
-        CLOSED(60, "CLOSED","已关闭");
+        CREATE(10, "CREATE", "创建"),
+        STARTING_INVENTORY(20, "STARTING_INVENTORY", "开启盘点"),
+        IN_INVENTORY(30, "IN_INVENTORY", "盘点中"),
+        INVENTORY_FINISH(40, "INVENTORY_FINISH", "盘点完成"),
+        THAWING(50, "THAWING", "已解冻"),
+        CLOSED(60, "CLOSED", "已关闭");
 
         private int value;
         private String code;
@@ -2376,4 +2376,38 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 几步法
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STEP {
+        ONE_STEP(1, "一步法"), TWO_STEP(2, "两步法");
+
+        private int value;
+        private String description;
+
+        STEP(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        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;
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java
index c889b78..382f824 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java
@@ -3,8 +3,6 @@ package cn.estsh.i3plus.pojo.wms.bean;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 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;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -16,8 +14,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description : 作业类型
@@ -61,7 +57,7 @@ public class WmsOpType extends BaseBean {
 
     @Column(name = "LAST_TRANS_TIME")
     @ApiParam(value = "末次处理时间")
-    public String lastTransTime;
+    private String lastTransTime;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -75,7 +71,7 @@ public class WmsOpType extends BaseBean {
 
     @Column(name = "SPLIT_RULE")
     @ApiParam(value = "拆分规则")
-    public String splitRule;
+    private String splitRule;
 
     @Column(name = "IS_MERGE")
     @ApiParam(value = "是否合并单据", example = "0")
@@ -83,7 +79,7 @@ public class WmsOpType extends BaseBean {
 
     @Column(name = "MERGE_RULE")
     @ApiParam(value = "合并规则")
-    public String mergeRule;
+    private String mergeRule;
 
     @Column(name = "IS_AUTO_CLOSE")
     @ApiParam(value = "任务未完是否关闭", example = "0")