订单导入bug修复

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

@@ -246,16 +246,18 @@ public class OrderImport extends Controller {
                     sqlFactoryupload.addParameter("rowno", getRowNo(sa_orderid));
                     sqlFactoryupload.addParameter("itemid", row.getLong("itemid"));
                     sqlFactoryupload.addParameter("remarks", row.getString("remarks"));
-                    sqlFactoryupload.addParameter("customproperties",  row.getString("customproperties"));
+
                     sqlFactoryupload.addParameter("sa_promotion_itemsid", 0);
                     // 商品信息
                     Row itemRow = getItemRow(row.getLong("itemid"));
                     if(itemRow.getBoolean("iscustomsize")){
                         sqlFactoryupload.addParameter("length", row.getDouble("length"));
                         sqlFactoryupload.addParameter("width",  row.getDouble("width"));
+                        sqlFactoryupload.addParameter("customproperties",  row.getString("customproperties"));
                     }else{
                         sqlFactoryupload.addParameter("length", itemRow.getDouble("length"));
                         sqlFactoryupload.addParameter("width",  itemRow.getDouble("width"));
+                        sqlFactoryupload.addParameter("customproperties",  "");
                     }
 
 
@@ -317,6 +319,20 @@ public class OrderImport extends Controller {
                 dbConnect.runSqlUpdate(sqllist);
                 // 重新排序
                 updateRowNo(sa_orderid);
+
+                new OrderItems(content).updateAccountclassinfos(sa_orderid);
+                new OrderItemsHelper(this).executeDataFunction(sa_orderid);
+                //生成摘要
+                SQLFactory   sqlFactory = new SQLFactory(this, "查询定制费用统计");
+                sqlFactory.addParameter("sa_orderid", sa_orderid);
+                Rows tempRows = dbConnect.runSqlQuery(sqlFactory);
+                if (tempRows.isNotEmpty()) {
+                    String remarks = StringUtils.join(tempRows.toArray("remarks"), ";");
+                    dbConnect.runSqlUpdate("UPDATE sa_order set abstract ='" + remarks + "' WHERE sa_orderid='" + sa_orderid + "'");
+
+                } else {
+                    dbConnect.runSqlUpdate("UPDATE sa_order set abstract ='' WHERE sa_orderid='" + sa_orderid + "'");
+                }
             }
             if (iserr) {
                 ExcelFactory excelFactory = new ExcelFactory("sa_ordererr");