Merge branch 'develop' into develop2

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

@@ -246,11 +246,14 @@ public class OrderImport extends Controller {
                                     iserr = true;
                                     row.put("msg", "此商品必须填写长宽");
                                     rowserr.add(row);
-                                }
-                                if((StringUtils.isBlank(row.getString("width"))?0:row.getDouble("width"))==0){
+                                }else if((StringUtils.isBlank(row.getString("width"))?0:row.getDouble("width"))==0){
                                     iserr = true;
                                     row.put("msg", "此商品必须填写长宽");
                                     rowserr.add(row);
+                                }else{
+                                    row.put("itemid", itemsRows.get(0).getString("itemid"));
+                                    rowssuc.add(row);
+
                                 }
                             }else{
                                 row.put("itemid", itemsRows.get(0).getString("itemid"));