|
|
@@ -715,7 +715,9 @@ public class ReleaseProductByBatch implements Serializable {
|
|
|
|
|
|
public void setMinPackageByExcel(Object value) {
|
|
|
setMinPackageStr(StringUtilB2C.getStr(value));
|
|
|
- if ((value != null) && (RegexConstant.isNumber(value.toString()))) {
|
|
|
+ if (StringUtils.isEmpty(value)) {
|
|
|
+ setMinPackage(DoubleConstant.minReserve);
|
|
|
+ } else if ((RegexConstant.isNumber(value.toString()))) {
|
|
|
Double minPackQty = Double.valueOf(value.toString());
|
|
|
if (minPackQty <= 0) {
|
|
|
// 输入负数,默认为1
|
|
|
@@ -725,8 +727,6 @@ public class ReleaseProductByBatch implements Serializable {
|
|
|
} else {
|
|
|
setMinPackage(minPackQty);
|
|
|
}
|
|
|
- } else if (StringUtils.isEmpty(value)) {
|
|
|
- setMinPackage(DoubleConstant.minReserve);
|
|
|
} else {
|
|
|
addErrmsg(ErrorInfoConstant.MIN_PACKAGE_INFO.getInfo());
|
|
|
}
|
|
|
@@ -734,7 +734,9 @@ public class ReleaseProductByBatch implements Serializable {
|
|
|
|
|
|
public void setMinBuyQtyByExcel(Object value) {
|
|
|
setMinBuyQtyStr(StringUtilB2C.getStr(value));
|
|
|
- if ((value != null) && (RegexConstant.isNumber(value.toString()))) {
|
|
|
+ if (StringUtils.isEmpty(value)) {
|
|
|
+ setMinBuyQty(getMinPackage());
|
|
|
+ } else if (RegexConstant.isNumber(value.toString())) {
|
|
|
Double minBuy = Double.valueOf(value.toString());
|
|
|
if (minBuy <= 0) {
|
|
|
setMinBuyQty(getMinPackage());
|
|
|
@@ -754,8 +756,6 @@ public class ReleaseProductByBatch implements Serializable {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- } else if (StringUtils.isEmpty(value)) {
|
|
|
- setMinBuyQty(getMinPackage());
|
|
|
} else {
|
|
|
setMinBuyQty(getMinPackage());
|
|
|
}
|