2 Commits 229c604a6e ... e943ef2a47

Author SHA1 Message Date
  沈静伟 e943ef2a47 Merge remote-tracking branch 'origin/develop' into develop 1 year ago
  沈静伟 c558548b13 解决订单上一条下一条顺序出错问题 1 year ago
1 changed files with 2 additions and 1 deletions
  1. 2 1
      src/custom/restcontroller/sale/order/Order.java

+ 2 - 1
src/custom/restcontroller/sale/order/Order.java

@@ -82,6 +82,7 @@ public class Order extends Controller {
         //查询收货人信息
         for (Row row : rows) {
             Rows dataRows = dataRowsMap.getOrDefault(row.getString("sa_orderid"), new Rows());
+            dataRows.removeColumn(new String[]{"rowindex"});
             if (dataRows.isNotEmpty()) {
                 row.putAll(dataRows.get(0));
             } else {
@@ -121,7 +122,7 @@ public class Order extends Controller {
     //查询订单列表(经销商)
     public QuerySQL queryList(String where) throws YosException {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_order",
-                "sa_orderid","sonum","status","type","billdate","tradefield","remarks");
+                "sa_orderid", "sonum", "status", "type", "billdate", "tradefield", "remarks");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sa_brand", "t3", "t3.sa_brandid = t1.sa_brandid",
                 "brandname");