Browse Source

修复复制订单时定制费用丢失的问题

eganwu 1 year ago
parent
commit
efaa98f14e
1 changed files with 14 additions and 13 deletions
  1. 14 13
      src/custom/restcontroller/webmanage/sale/order/Order.java

+ 14 - 13
src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -253,19 +253,6 @@ public class Order extends Controller {
 
         dbConnect.runSqlUpdate(sqlList);
 
-        //查询商品费用方案方法
-        orderItemsHelper.executeDataFunction(sa_orderid);
-        //生成摘要
-        sqlFactory = new SQLFactory(this, "查询定制费用统计");
-        sqlFactory.addParameter("sa_orderid", sa_orderid);
-        rows = dbConnect.runSqlQuery(sqlFactory);
-        if (rows.isNotEmpty()) {
-            String remarks = StringUtils.join(rows.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 + "'");
-        }
 
 
         content.put("sa_orderid", sa_orderid);
@@ -3071,6 +3058,20 @@ public class Order extends Controller {
             dbConnect.runSqlUpdate(updateAccountclassinfos(sa_orderid_copy, ordercopyRows.get(0).getLong("sa_accountclassid"), ordercopyRows.get(0).getLong("sys_enterpriseid")));
         }
 
+        //查询商品费用方案方法
+       new OrderItemsHelper(this).executeDataFunction(sa_orderid_copy);
+        //生成摘要
+        sqlFactory = new SQLFactory(this, "查询定制费用统计");
+        sqlFactory.addParameter("sa_orderid", sa_orderid_copy);
+        rows = dbConnect.runSqlQuery(sqlFactory);
+        if (rows.isNotEmpty()) {
+            String remarks = StringUtils.join(rows.toArray("remarks"), ";");
+            dbConnect.runSqlUpdate("UPDATE sa_order set abstract ='" + remarks + "' WHERE sa_orderid='" + sa_orderid_copy + "'");
+
+        } else {
+            dbConnect.runSqlUpdate("UPDATE sa_order set abstract ='' WHERE sa_orderid='" + sa_orderid_copy + "'");
+        }
+
         return selectDetail();
     }