增加输出语句

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

@@ -134,14 +134,22 @@ public class OrderItems extends Controller {
                         if (itemRowsMap.containsKey(item.getString("itemid"))) {
                             if (itemRowsMap.get(item.getString("itemid")).isNotEmpty()) {
                                 if(itemRowsMap.get(item.getString("itemid")).get(0).getLong("sa_customschemeid")>0 && !itemRowsMap.get(item.getString("itemid")).get(0).getBoolean("iscustomsize")){
+                                    System.out.println(0000);
                                     if(customschemeRowsMap.containsKey(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid"))){
+                                         System.out.println(111111);
                                         for (Row customschemeItem:(customschemeRowsMap.get(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid")))) {
+                                            System.out.println(customschemeItem.getString("description"));
+                                            System.out.println(2222);
                                             customproperties.add(customschemeItem.getString("description")+":"+itemRowsMap.get(item.getString("itemid")).get(0).getString(customschemeItem.getString("value")));
                                         }
                                     }
                                 } else if(itemRowsMap.get(item.getString("itemid")).get(0).getBoolean("iscustomsize")){
+                                    System.out.println(3333);
                                     if(customschemeRowsMap.containsKey(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid"))){
+                                        System.out.println(4444);
                                         for (Row customschemeItem:(customschemeRowsMap.get(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid")))) {
+                                            System.out.println(5555);
+                                             System.out.println((customschemeRowsMap.get(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid"))).size());
                                             if(!customschemeItem.getString("value").equals("spec")){
                                                 customproperties.add(customschemeItem.getString("description")+":"+itemRowsMap.get(item.getString("itemid")).get(0).getString(customschemeItem.getString("value")));
                                             }else{

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

@@ -2,6 +2,7 @@ package restcontroller.webmanage.sale.order;
 
 import beans.brand.Brand;
 import beans.itemprice.ItemPrice;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import common.Controller;
 import common.YosException;
@@ -100,11 +101,49 @@ public class PromotionOrder extends Controller {
         RowsMap tradefieldRowsMap = beans.Item.Item.getTradefieldRowsMap(this, ids);
         //品牌
         RowsMap brandRowsMap = Brand.getBrandRowsMap(this, 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) {
             row.put("attinfos", attinfoRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
             row.put("tradefield", tradefieldRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
             row.put("brand", brandRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
 
+            if(row.getLong("widthschemeid")!=0){
+                if(sizecustomizedschemesRowsMap.containsKey(row.getString("widthschemeid"))){
+                    if(sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).isNotEmpty()){
+                        row.put("widthtype",sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).get(0).getString("type"));
+                        row.put("widthmin",sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).get(0).getBigDecimal("min"));
+                        row.put("widthmax",sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).get(0).getBigDecimal("max"));
+                        row.put("widthdecimalplaces",sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).get(0).getBigDecimal("decimalplaces"));
+                        if(sizeschemedetailsRowsMap.containsKey(row.getString("widthschemeid"))){
+                            row.put("widthschemedetails",sizeschemedetailsRowsMap.get(row.getString("widthschemeid")));
+                        }else{
+                            row.put("widthschemedetails",new JSONArray());
+                        }
+
+                    }
+
+                }
+            }
+            if(row.getLong("lengthschemeid")!=0){
+                if(sizecustomizedschemesRowsMap.containsKey(row.getString("lengthschemeid"))){
+                    if(sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).isNotEmpty()){
+                        row.put("lengthtype",sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).get(0).getString("type"));
+                        row.put("lengthmin",sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).get(0).getBigDecimal("min"));
+                        row.put("lengthmax",sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).get(0).getBigDecimal("max"));
+                        row.put("lengthdecimalplaces",sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).get(0).getBigDecimal("decimalplaces"));
+                        if(sizeschemedetailsRowsMap.containsKey(row.getString("lengthschemeid"))){
+                            row.put("lengthschemedetails",sizeschemedetailsRowsMap.get(row.getString("lengthschemeid")));
+                        }else{
+                            row.put("lengthschemedetails",new JSONArray());
+                        }
+                    }
+
+                }
+            }
+
         }
 
 

src/custom/restcontroller/webmanage/sale/order/SQL/促销方案商品列表.sql

@@ -4,6 +4,10 @@ SELECT t1.itemid,
        t1.model,
        t1.batchcontrol,
        t1.orderminqty_auxunit,
+       t1.iscustomsize,
+       t1.widthschemeid,
+       t1.lengthschemeid,
+       t1.sa_customschemeid,
        t3.orderminqty,
        t1.orderaddqty_auxunit,
        t3.orderaddqty,