From 09ea0aa25986c7385eda23696c103c4feda14785 Mon Sep 17 00:00:00 2001
From: Silliter <sliter.yuan@estsh.com>
Date: Sun, 4 Nov 2018 11:35:18 +0800
Subject: [PATCH] =?UTF-8?q?wms=E5=B7=A5=E5=8E=82=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E7=B1=BB=E4=B9=A6=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/wms/bean/StockArea.java   | 24 ++++++++++++++++++++++
 .../estsh/i3plus/pojo/wms/bean/StockLocation.java  | 23 +++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java
index 6a8d1d1..0f59530 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java
@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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;
@@ -33,4 +35,26 @@ public class StockArea extends BaseBean {
     @Column(name="AREA_NAME")
     @ApiParam("仓库区域名称")
     public String areaName;
+
+    @Column(name="WH_ID")
+    @ApiParam(value = "仓库编号", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    public Long whId;
+
+    @Column(name="WH_CODE_RDD")
+    @ApiParam("仓库代码")
+    public String whCodeRdd;
+
+    @Column(name="WH_NAME_RDD")
+    @ApiParam("仓库名称")
+    public String whNameRdd;
+
+    public Long getWhId() {
+        if(whId != null) {
+            return whId.longValue();
+        }else{
+            return whId;
+        }
+    }
+
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockLocation.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockLocation.java
index 51020d9..c44b785 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockLocation.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockLocation.java
@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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;
@@ -33,4 +35,25 @@ public class StockLocation extends BaseBean {
     @Column(name="LOC_NAME")
     @ApiParam("仓库库位名称")
     public String locName;
+
+    @Column(name="AREA_ID")
+    @ApiParam(value = "库区编号", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    public Long areaId;
+
+    @Column(name="AREA_CODE_RDD")
+    @ApiParam("库区代码")
+    public String areaCodeRdd;
+
+    @Column(name="AREA_NAME_RDD")
+    @ApiParam("库区名称")
+    public String areaNameRdd;
+
+    public Long getAreaId() {
+        if(areaId != null) {
+            return areaId.longValue();
+        }else{
+            return areaId;
+        }
+    }
 }