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

src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -45,7 +45,7 @@ public class Item extends Controller {
 
         Long itemid = content.getLong("itemid");
         String itemno = content.getString("itemno");
-        boolean isauxunit = content.getBoolean("isauxunit");
+        boolean isauxunit = content.getBooleanValue("isauxunit");
 
         ArrayList<String> sqlList = new ArrayList<>();
 

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

@@ -1640,7 +1640,10 @@ public class Order extends Controller {
                     gradeqty=gradeQtyRowsMap.get(grade).get(0).getBigDecimal("qty");
                 }
                 if(optiontypRowsMap.containsKey(grade)){
-                    rate=optiontypRowsMap.get(grade).get(0).getBigDecimal("remarks");
+                    if(optiontypRowsMap.get(grade).get(0).getBigDecimal("remarks").compareTo(BigDecimal.ZERO)>0){
+                        rate=optiontypRowsMap.get(grade).get(0).getBigDecimal("remarks");
+                    }
+
                 }
                 if((gradeqty.add(qty)).compareTo((sumqty.add(sumqty_current)).multiply(rate).divide(BigDecimal.valueOf(100)))>0){
                     return getErrReturnObject().setErrMsg(grade+"等级的商品总数超过本年提货比例上限").toString();