From d120b1615ac2fdbbabb74b03f6b6c7dd64b2d91c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= <yunhao.wang@estsh.com>
Date: Sun, 15 Sep 2019 14:42:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/CommonEnumUtil.java  | 41 ++--------------------
 1 file changed, 2 insertions(+), 39 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
index bc7bf48..d88aa4a 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.base.enumutil;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
 
 /**
  * @Description :
@@ -868,45 +869,6 @@ public class CommonEnumUtil {
     }
 
     /**
-     * 数学表达式
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MATH_SYMBOL {
-        GREATER(1, ">"),
-        GREATER_OR_EQUAL(2, ">="),
-        LESS(3, "<"),
-        LESS_OR_EQUAL(4, "<="),
-        EQUAL(5, "="),
-        NOT_EQUAL(6, "<>");
-
-        private int value;
-        private String description;
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        private MATH_SYMBOL(int value, String description) {
-            this.value = value;
-            this.description = 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;
-        }
-    }
-
-    /**
      * Content-Type
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -1092,4 +1054,5 @@ public class CommonEnumUtil {
     public static final int VALID = CommonEnumUtil.IS_VAILD.VAILD.getValue();
     // 数据未删除的静态常量
     public static final int FALSE = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
 }

From 05dc432c57c5fab64a099164542948649c4b451e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= <rock.yu@qq.com>
Date: Sun, 15 Sep 2019 15:43:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=92=8C=E5=85=B3=E8=81=94=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
index eaee583..a46cbea 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
@@ -138,6 +138,14 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("关联单号")
     public String refSrc;
 
+    @Column(name="REF_UNIT")
+    @ApiParam("关联单位")
+    public String refUnit;
+
+    @Column(name="REF_QTY")
+    @ApiParam("关联数量")
+    public Double refQty;
+
     @Column(name = "SRC_AREA_NO")
     @ApiParam("来源库存地")
     public String srcAreaNo;