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

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

@@ -1600,6 +1600,7 @@ public class Order extends Controller {
                                 return getErrReturnObject().setErrMsg("账户余额不足，还差" + Accountbalance.InsufficientBalance(this, pay_enterpriseid, jsonObject.getLong("sa_accountclassid"), amount1) + "元！").toString();
                             }
                         }
+                        index++;
                     }
                 } else {
                     if (Accountbalance.judgeBalance(this, pay_enterpriseid, sa_accountclassid, amount.add(costamount))) {

src/custom/restcontroller/webmanage/sale/sizecustomizedscheme/sizeschemedetail.java

@@ -53,7 +53,7 @@ public class sizeschemedetail extends Controller {
             saleFactory.addParameter("siteid", siteid);
             saleFactory.addParameter("sa_sizeschemedetailid", createTableID("sa_sizeschemedetail"));
             saleFactory.addParameter("sa_sizecustomizedschemeid", sa_sizecustomizedschemeid);
-            saleFactory.addParameter("num", content.getStringValue("num"));
+            saleFactory.addParameter("num", content.getLongValue("num"));
             saleFactory.addParameter("rowno", maxid+1);
             sqlList.add(saleFactory.getSQL());
         } else {
@@ -61,7 +61,7 @@ public class sizeschemedetail extends Controller {
             saleFactory.addParameter("siteid", siteid);
             saleFactory.addParameter("sa_sizeschemedetailid",  content.getLongValue("sa_sizeschemedetailid"));
             saleFactory.addParameter("sa_sizecustomizedschemeid", sa_sizecustomizedschemeid);
-            saleFactory.addParameter("num", content.getStringValue("num"));
+            saleFactory.addParameter("num", content.getLongValue("num"));
             sqlList.add(saleFactory.getSQL());
         }
         dbConnect.runSqlUpdate(sqlList);