|
@@ -1124,6 +1124,8 @@ public class OrderItems extends Controller {
|
|
|
}
|
|
|
|
|
|
}
|
|
|
+ } else {
|
|
|
+ row.put("widthschemedetails", new JSONArray());
|
|
|
}
|
|
|
if (row.getLong("lengthschemeid") != 0) {
|
|
|
if (sizecustomizedschemesRowsMap.containsKey(row.getString("lengthschemeid"))) {
|
|
@@ -1140,9 +1142,11 @@ public class OrderItems extends Controller {
|
|
|
}
|
|
|
|
|
|
}
|
|
|
+ } else {
|
|
|
+ row.put("lengthschemedetails", new JSONArray());
|
|
|
}
|
|
|
//选项
|
|
|
- String materialschemeid=row.getString("materialschemeid");
|
|
|
+ String materialschemeid = row.getString("materialschemeid");
|
|
|
if (!materialschemeid.equals("0") && sizecustomizedschemesRowsMap.containsKey(materialschemeid) && sizecustomizedschemesRowsMap.get(materialschemeid).isNotEmpty()) {
|
|
|
row.put("type", sizecustomizedschemesRowsMap.get(materialschemeid).get(0).getString("type"));
|
|
|
row.put("min", sizecustomizedschemesRowsMap.get(materialschemeid).get(0).getBigDecimal("min"));
|
|
@@ -1154,9 +1158,11 @@ public class OrderItems extends Controller {
|
|
|
row.put("materialschemedetails", new JSONArray());
|
|
|
}
|
|
|
|
|
|
+ } else {
|
|
|
+ row.put("materialschemedetails", new JSONArray());
|
|
|
}
|
|
|
//颜色
|
|
|
- String colorschemeid=row.getString("colorschemeid");
|
|
|
+ String colorschemeid = row.getString("colorschemeid");
|
|
|
if (!colorschemeid.equals("0") && sizecustomizedschemesRowsMap.containsKey(colorschemeid) && sizecustomizedschemesRowsMap.get(colorschemeid).isNotEmpty()) {
|
|
|
row.put("type", sizecustomizedschemesRowsMap.get(colorschemeid).get(0).getString("type"));
|
|
|
row.put("min", sizecustomizedschemesRowsMap.get(colorschemeid).get(0).getBigDecimal("min"));
|
|
@@ -1168,9 +1174,11 @@ public class OrderItems extends Controller {
|
|
|
row.put("colorsschemedetails", new JSONArray());
|
|
|
}
|
|
|
|
|
|
+ } else {
|
|
|
+ row.put("colorsschemedetails", new JSONArray());
|
|
|
}
|
|
|
//工艺
|
|
|
- String cheekschemeid=row.getString("cheekschemeid");
|
|
|
+ String cheekschemeid = row.getString("cheekschemeid");
|
|
|
if (!cheekschemeid.equals("0") && sizecustomizedschemesRowsMap.containsKey(cheekschemeid) && sizecustomizedschemesRowsMap.get(cheekschemeid).isNotEmpty()) {
|
|
|
row.put("type", sizecustomizedschemesRowsMap.get(cheekschemeid).get(0).getString("type"));
|
|
|
row.put("min", sizecustomizedschemesRowsMap.get(cheekschemeid).get(0).getBigDecimal("min"));
|
|
@@ -1182,6 +1190,8 @@ public class OrderItems extends Controller {
|
|
|
row.put("cheekschemedetails", new JSONArray());
|
|
|
}
|
|
|
|
|
|
+ } else {
|
|
|
+ row.put("cheekschemedetails", new JSONArray());
|
|
|
}
|
|
|
|
|
|
}
|