|
|
@@ -1048,7 +1048,7 @@ public class InventoryListActivity extends IBossBaseActivity implements OnClickL
|
|
|
info.setWeight(jsonObject1.optString("Weight"));
|
|
|
info.setColorNumber(jsonObject1.optString("ColorNumber"));
|
|
|
info.setPackage(jsonObject1.optString("Package"));
|
|
|
- if (jsonObject1.has("CirculateType")
|
|
|
+ if (jsonObject1.has("CirculateType") && jsonObject1.has("InventoryQuantity")
|
|
|
&& jsonObject1.optString("CirculateType").equals("1")) {
|
|
|
info.setInventoryQuantity(
|
|
|
String.valueOf(jsonObject1.optInt("InventoryQuantity")));
|
|
|
@@ -1068,7 +1068,7 @@ public class InventoryListActivity extends IBossBaseActivity implements OnClickL
|
|
|
}
|
|
|
|
|
|
if (jsonObject1.has("CanSaleQuantity")) {
|
|
|
- if (jsonObject1.has("CirculateType")
|
|
|
+ if (jsonObject1.has("CirculateType") && jsonObject1.has("CanSaleQuantity")
|
|
|
&& jsonObject1.optString("CirculateType").equals("1")) {
|
|
|
info.setCanSaleQuantity(
|
|
|
String.valueOf(jsonObject1.optInt("CanSaleQuantity")));
|