|
|
@@ -180,6 +180,54 @@ public class favorites extends Controller {
|
|
|
|
|
|
}
|
|
|
}
|
|
|
+ //选项
|
|
|
+ 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"));
|
|
|
+ row.put("max", sizecustomizedschemesRowsMap.get(materialschemeid).get(0).getBigDecimal("max"));
|
|
|
+ row.put("decimalplaces", sizecustomizedschemesRowsMap.get(materialschemeid).get(0).getBigDecimal("decimalplaces"));
|
|
|
+ if (sizeschemedetailsRowsMap.containsKey(materialschemeid)) {
|
|
|
+ row.put("materialschemedetails", sizeschemedetailsRowsMap.get(materialschemeid));
|
|
|
+ } else {
|
|
|
+ row.put("materialschemedetails", new JSONArray());
|
|
|
+ }
|
|
|
+
|
|
|
+ } else {
|
|
|
+ row.put("materialschemedetails", new JSONArray());
|
|
|
+ }
|
|
|
+ //颜色
|
|
|
+ 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"));
|
|
|
+ row.put("max", sizecustomizedschemesRowsMap.get(colorschemeid).get(0).getBigDecimal("max"));
|
|
|
+ row.put("decimalplaces", sizecustomizedschemesRowsMap.get(colorschemeid).get(0).getBigDecimal("decimalplaces"));
|
|
|
+ if (sizeschemedetailsRowsMap.containsKey(colorschemeid)) {
|
|
|
+ row.put("colorsschemedetails", sizeschemedetailsRowsMap.get(colorschemeid));
|
|
|
+ } else {
|
|
|
+ row.put("colorsschemedetails", new JSONArray());
|
|
|
+ }
|
|
|
+
|
|
|
+ } else {
|
|
|
+ row.put("colorsschemedetails", new JSONArray());
|
|
|
+ }
|
|
|
+ //工艺
|
|
|
+ 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"));
|
|
|
+ row.put("max", sizecustomizedschemesRowsMap.get(cheekschemeid).get(0).getBigDecimal("max"));
|
|
|
+ row.put("decimalplaces", sizecustomizedschemesRowsMap.get(cheekschemeid).get(0).getBigDecimal("decimalplaces"));
|
|
|
+ if (sizeschemedetailsRowsMap.containsKey(cheekschemeid)) {
|
|
|
+ row.put("cheekschemedetails", sizeschemedetailsRowsMap.get(cheekschemeid));
|
|
|
+ } else {
|
|
|
+ row.put("cheekschemedetails", new JSONArray());
|
|
|
+ }
|
|
|
+
|
|
|
+ } else {
|
|
|
+ row.put("cheekschemedetails", new JSONArray());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
ArrayList<Long> ids = itemrows.toArrayList("itemid", new ArrayList<>());
|