Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -25,7 +25,7 @@ import java.io.Serializable;
 @Entity
 //以子类table为准
 @javax.persistence.Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)
-@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换
+//@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换
 public abstract class BaseBean implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -622,6 +622,40 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 作业任务：作业类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OP_TYPE_CODE {
+        RC("RC", "收货"),
+        QC("QC", "质检"),
+        PICK("PICK", "拣货"),
+        OUTSTOCK("OUTSTOCK", "出库"),
+        INSTOCK("INSTOCK", "入库"),
+        MOVESTOCK("MOVESTOCK", "移库"),
+        CS("CS", "盘点");
+        private String value;
+        private String description;
+
+        OP_TYPE_CODE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+
+
+    /**
      * 作业任务状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)