erp地址调整

src/custom/restcontroller/sale/shoppingcart/ShoppingCart.java

@@ -242,6 +242,13 @@ public class ShoppingCart extends Controller {
 
         Rows promotionItemsRows = dbConnect.runSqlQuery("select * from sa_promotion_items where siteid='"+siteid+"' and sa_promotionid="+content.getLongValue("sa_promotionid"));
         RowsMap promotionItemsRowsMap =promotionItemsRows.toRowsMap("itemid");
+
+        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) {
             if ((attRowsMap.getOrDefault(row.getString("itemid"), new Rows())).isEmpty()) {
                 row.put("attinfos", defaultImageRows);
@@ -280,6 +287,91 @@ public class ShoppingCart extends Controller {
                 row.put("gradeprice", 0);
             }
             row.put("tradefield", tradefieldRowsMap.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());
+                        }
+
+                    }
+
+                }
+            } 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());
+                        }
+                    }
+
+                }
+            } else {
+                row.put("lengthschemedetails", new JSONArray());
+            }
+            //选项
+            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());
+            }
         }
 //        if (isExport) {
 //            //去除不需要导出项

src/custom/utility/ERPDocking.java

@@ -33,8 +33,8 @@ public class ERPDocking {
             url = "http://192.168.3.89:8001/rest/ws_v2/basicDrp";
         }
         if (siteid.equalsIgnoreCase("CCYOSG")) {
-            url = "http://192.168.3.89:8009/rest/ws_v2/basicDrp";
-//            url = "http://124.71.196.182:8001/rest/ws_v2/basicDrp";
+//            url = "http://192.168.3.89:8009/rest/ws_v2/basicDrp";
+            url = "http://124.71.196.182:8001/rest/ws_v2/basicDrp";
         }
         System.err.println(siteid + ":" + url);
     }