|
|
@@ -139,8 +139,14 @@ public class accessoryorder extends Controller {
|
|
|
//查询数量金额
|
|
|
RowsMap OrderAmountRowsMap = beans.order.Order.getSumOrderAmount(this, ids);
|
|
|
|
|
|
+ RowsMap ContactsRowsMap = beans.order.Order.getContactsRowsMap(this, rows.toArrayList("rec_contactsid", new ArrayList<>()));
|
|
|
+
|
|
|
for (Row row : rows) {
|
|
|
Long id = row.getLong("sa_orderid");
|
|
|
+ if(ContactsRowsMap.containsKey(row.getString("rec_contactsid"))){
|
|
|
+ row.put("contacts", ContactsRowsMap.get(row.getString("rec_contactsid")).get(0));
|
|
|
+ }
|
|
|
+
|
|
|
if (OrderAmountRowsMap.get(id.toString()).isNotEmpty()) {
|
|
|
row.put("amount", OrderAmountRowsMap.get(id.toString()).get(0).getBigDecimal("amount"));
|
|
|
row.put("defaultamount", OrderAmountRowsMap.get(id.toString()).get(0).getBigDecimal("defaultamount"));
|
|
|
@@ -348,7 +354,7 @@ public class accessoryorder extends Controller {
|
|
|
//查询配件订单列表(管理端)
|
|
|
public QuerySQL queryListManage(String where) throws YosException {
|
|
|
QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_order",
|
|
|
- "sa_orderid", "sonum", "type", "status", "submitdate", "checkdate", "remarks", "createby", "checkby", "billdate", "tradefield", "delivery", "tracknumber", "mailno");
|
|
|
+ "sa_orderid", "sonum", "type", "status", "submitdate", "checkdate", "remarks", "createby", "checkby", "billdate", "tradefield", "delivery", "tracknumber", "mailno","rec_contactsid");
|
|
|
querySQL.setTableAlias("t1");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t2.sys_enterpriseid = t1.sys_enterpriseid and t2.siteid = t1.siteid",
|
|
|
"enterprisename");
|