From 41efdd4de8d02fdf839c5cab97854cba1192b13b Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Mon, 21 Sep 2020 18:51:00 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=902798=20=E6=AD=A6=E6=B1=89PRD-AMP-WMS2A?=
 =?UTF-8?q?MP=E5=90=8C=E6=AD=A5=E6=8B=89=E5=8A=A8=E9=9B=B6=E4=BB=B6?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8E=A5=E5=8F=A3=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/base/util/StringUtil.java     | 13 +++++++++++--
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 12 +++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java
index 6a7a274..d9c48c7 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java
@@ -12,11 +12,11 @@ import java.util.regex.Pattern;
 public class StringUtil {
 
 	public static boolean isEmpty(Object obj){
-		
+
 		if(obj ==null || obj.toString().trim().equals("")){
 			return true;
 		}
-		
+
 		return false;
 	}
 
@@ -33,4 +33,13 @@ public class StringUtil {
 		}
 		return fieldNames;
 	}
+
+	public static boolean isEmptyAndNull(Object obj){
+
+		if(obj == null || obj.toString().trim().equals("") || "null".equalsIgnoreCase(obj.toString().trim())){
+			return true;
+		}
+
+		return false;
+	}
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index f9b3812..df3cbdf 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -520,6 +520,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("物料库位")
     private String partLocateNo;
 
+    @Transient
+    @ApiParam("数量总和")
+    private Double sumQty;
+
     public WmsStockSn() {
     }
 
@@ -850,5 +854,11 @@ public class WmsStockSn extends BaseBean {
         this.organizeCode = organizeCode;
     }
 
-
+    public WmsStockSn(WmsStockSn wmsStockSn, Double sumQty) {
+        this.partNo = wmsStockSn.getPartNo();
+        this.vendorNo = wmsStockSn.getVendorNo();
+        this.unit = wmsStockSn.getUnit();
+        this.partNameRdd = wmsStockSn.getPartNameRdd();
+        this.sumQty = sumQty;
+    }
 }