From 6971fdbf60b602ddb2db5e4f35cd6984fbb6e1a3 Mon Sep 17 00:00:00 2001
From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com>
Date: Thu, 4 Apr 2019 14:56:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4json=E5=BA=8F=E5=88=97?=
 =?UTF-8?q?=E5=8C=96not=5Fempty=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
index 9098f50..6f6fcb2 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
+++ b/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;

From edee3a7312fb3555626e9c576eb5022237e1cd4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= <hansen.ke@estsh.com>
Date: Thu, 4 Apr 2019 15:37:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)

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 c219d78..7eacb2d 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
@@ -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)