订单添加返回定制产品信息（选项，颜色，工艺）

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -1083,8 +1083,10 @@ public class OrderItems extends Controller {
         RowsMap brandRowsMap = Brand.getBrandRowsMap(this, ids);
         //价格
         HashMap<Long, ItemPrice> itemPriceRowsMap = ItemPrice.getItemPrice(this, sys_enterpriseid, ids);
+
         Rows sizecustomizedschemes = dbConnect.runSqlQuery("select * from sa_sizecustomizedscheme where siteid='" + siteid + "' ");
         RowsMap sizecustomizedschemesRowsMap = sizecustomizedschemes.toRowsMap("sa_sizecustomizedschemeid");
+
         Rows sizeschemedetails = dbConnect.runSqlQuery("select * from sa_sizeschemedetail where siteid='" + siteid + "' ");
         RowsMap sizeschemedetailsRowsMap = sizeschemedetails.toRowsMap("sa_sizecustomizedschemeid");
         for (Row row : rows) {
@@ -1129,6 +1131,48 @@ public class OrderItems 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());
+                }
+
+            }
+            //颜色
+            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());
+                }
+
+            }
+            //工艺
+            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());
+                }
+
+            }
 
         }
         return getSucReturnObject().setData(rows).toString();

src/custom/restcontroller/webmanage/sale/order/SQL/查询可添加商品列表.sql

@@ -15,6 +15,9 @@ SELECT t1.itemid,
        t1.iscustomsize,
        t1.widthschemeid,
        t1.lengthschemeid,
+       t1.materialschemeid,
+       t1.colorschemeid,
+       t1.cheekschemeid,
        t1.sa_customschemeid,
        t4.unitname unit,
        t5.unitname auxunit,

src/custom/restcontroller/webmanage/sale/order/SQL/查询可添加商品列表_总部订单.sql

@@ -13,6 +13,9 @@ SELECT t1.itemid,
        t1.iscustomsize,
        t1.widthschemeid,
        t1.lengthschemeid,
+       t1.materialschemeid,
+       t1.colorschemeid,
+       t1.cheekschemeid,
        t1.sa_customschemeid,
        t4.unitname unit,
        t5.unitname auxunit,

src/custom/restcontroller/webmanage/sale/order/SQL/查询可添加商品列表_特殊订单.sql

@@ -15,6 +15,9 @@ SELECT t1.itemid,
        t1.iscustomsize,
        t1.widthschemeid,
        t1.lengthschemeid,
+       t1.materialschemeid,
+       t1.colorschemeid,
+       t1.cheekschemeid,
        t1.sa_customschemeid,
        t4.unitname unit,
        t5.unitname auxunit,