|
@@ -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");
|