Merge remote-tracking branch 'origin/develop' into develop-green

src/custom/restcontroller/webmanage/sale/item/SQL/货品档案更新.sql

@@ -49,7 +49,7 @@ SET changeuserid=$userid$,
     customprice=$customprice$,
     pricingmetod=$pricingmetod$,
     cheekschemeid=$cheekschemeid$,
-    colorschemeid=$customprice$,
+    colorschemeid=$colorschemeid$,
     materialschemeid=$materialschemeid$
 WHERE itemid = $itemid$
   and siteid = $siteid$

src/custom/restcontroller/webmanage/sale/logistics/LSALogisticsHelper.java

@@ -81,6 +81,7 @@ public class LSALogisticsHelper extends BaseClass {
         updateSQL.setValue("address", controller.content.getStringValue("address"));
         updateSQL.setValue("remarks", controller.content.getStringValue("remarks"));
         updateSQL.setWhere("sa_logisticsid", sa_logisticsid);
+        updateSQL.setValue("sys_enterpriseid", controller.content.getLongValue("sys_enterpriseid"));
         updateSQL.setWhere("siteid", controller.siteid);
         return updateSQL;
     }

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

@@ -1411,7 +1411,7 @@ public class Order extends Controller {
         //验证结算企业
         Long pay_enterpriseid = row.getLong("pay_enterpriseid");
         if (pay_enterpriseid <= 0) {
-            dbConnect.runSqlQuery("UPDATE sa_order set pay_enterpriseid=sys_enterpriseid  WHERE sa_orderid=" + sa_orderid);
+            dbConnect.runSqlUpdate("UPDATE sa_order set pay_enterpriseid=sys_enterpriseid  WHERE sa_orderid=" + sa_orderid);
 //            return getErrReturnObject().setErrMsg("请选择结算企业").toString();
         }
         Long sys_enterprise_financeid = row.getLong("sys_enterprise_financeid");

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

@@ -1093,8 +1093,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) {
@@ -1139,6 +1141,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/OrderItemsHelper.java

@@ -414,12 +414,20 @@ public class OrderItemsHelper extends BaseClass {
                             if (!customschemeItem.getString("value").equals("spec")) {
                                 customproperties.add(customschemeItem.getString("description") + ":" + itemRowsMap.get(itemid).get(0).getString(customschemeItem.getString("value")));
                             } else {
-                                customproperties.add("尺寸:" + item.getStringValue("length") + "*" + item.getStringValue("width"));
+                                String material = "选项:" + item.getStringValue("custommaterial");
+                                String colors = "颜色:" + item.getStringValue("customcolors");
+                                String cheek = "工艺:" + item.getStringValue("customcheek");
+                                String size = "尺寸:" + item.getStringValue("length") + "*" + item.getStringValue("width");
+                                customproperties.add(material +";"+ colors+";"+ cheek +";"+ size);
                             }
 
                         }
                     } else {
-                        customproperties.add("尺寸:" + item.getStringValue("length") + "*" + item.getStringValue("width"));
+                        String material = "选项:" + item.getStringValue("custommaterial");
+                        String colors = "颜色:" + item.getStringValue("customcolors");
+                        String cheek = "工艺:" + item.getStringValue("customcheek");
+                        String size = "尺寸:" + item.getStringValue("length") + "*" + item.getStringValue("width");
+                        customproperties.add(material +";"+ colors+";"+ cheek +";"+ size);
                     }
                 }
 

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,