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

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;
+	}
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java

@@ -524,6 +524,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("数量检查")
     private Integer checkQyt;
 
+    @Transient
+    @ApiParam("数量总和")
+    private Double sumQty;
+
     public WmsStockSn() {
     }
 
@@ -854,5 +858,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;
+    }
 }