Merge branch 'develop' into develop2

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

@@ -365,6 +365,9 @@ public class OrderImport extends Controller {
                             break;
                         default:
                             if(itemRow.getBoolean("iscustomsize") && itemRow.getLong("pricingmetod")==1 && itemRow.getString("spec").equals("custom")){
+                                logger.info("price:"+itemPrice.getContractprice());
+                                logger.info("length:"+new BigDecimal(itemRow.getString("length")));
+                                logger.info("width:"+new BigDecimal(itemRow.getString("width")));
                                 defaultprice = itemPrice.getContractprice().multiply(new BigDecimal(itemRow.getString("length"))).multiply(new BigDecimal(itemRow.getString("width"))).divide(new BigDecimal("1000000"), 4, BigDecimal.ROUND_HALF_UP);
                             }else{
                                 defaultprice = itemPrice.getContractprice();