配件申请单bug修复

src/custom/restcontroller/webmanage/sale/tpartreimbursement/tpartreimbursement.java

@@ -108,22 +108,24 @@ public class tpartreimbursement extends Controller {
         long sa_tpartreimbursementid = content.getLong("sa_tpartreimbursementid");
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_tpartreimbursement", "*");
         querySQL.setTableAlias("t1");
-
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid","enterprisename","abbreviation");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid","agentnum");
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere("t1.sa_tpartreimbursementid", sa_tpartreimbursementid);
         Rows rows = querySQL.query();
 
-//        QuerySQL querySQLdetail = SQLFactory.createQuerySQL(this, "sa_tpartreimbursementdetail", "sa_tpartreimbursementid", "sa_tpartreimbursementdetailid","qty");
-//        querySQLdetail.setTableAlias("t1");
-//        querySQLdetail.addJoinTable(JOINTYPE.left, "sa_orderitems", "t2", "t1.sa_orderitemsid = t2.sa_orderitemsid AND t1.siteid = t2.siteid", "price");
-//        querySQLdetail.setWhere("t1.siteid", siteid);
-//        querySQLdetail.setWhere("t1.sa_tpartreimbursementid", rows.toArrayList("sa_tpartreimbursementid"));
-//        Rows rowsdetail = querySQL.query();
-//        RowsMap rowsMap = rowsdetail.toRowsMap("sa_tpartreimbursementid");
-//        for (Row row : rows) {
-//            row.put("totalamount", rowsMap.get(row.getString("sa_tpartreimbursementid")).sum("amount"));
-//            row.put("offamount", rowsMap.get(row.getString("sa_tpartreimbursementid")).toRowsMap("offstatus").get("已核销").sum("amount"));
-//        }
+        QuerySQL querySQLdetail = SQLFactory.createQuerySQL(this, "sa_tpartreimbursementdetail", "sa_tpartreimbursementid", "sa_tpartreimbursementdetailid","qty","isverified");
+        querySQLdetail.setTableAlias("t1");
+        querySQLdetail.addJoinTable(JOINTYPE.left, "sa_orderitems", "t2", "t1.sa_orderitemsid = t2.sa_orderitemsid AND t1.siteid = t2.siteid", "price");
+        querySQLdetail.setWhere("t1.siteid", siteid);
+        querySQLdetail.setWhere("t1.sa_tpartreimbursementid", rows.toArrayList("sa_tpartreimbursementid"));
+        querySQLdetail.addQueryFields("amount","ROUND(t2.price*t1.qty)");
+        Rows rowsdetail = querySQL.query();
+        RowsMap rowsMap = rowsdetail.toRowsMap("sa_tpartreimbursementid");
+        for (Row row : rows) {
+            row.put("totalamount", rowsMap.get(row.getString("sa_tpartreimbursementid")).sum("amount"));
+            row.put("offamount", rowsMap.get(row.getString("sa_tpartreimbursementid")).toRowsMap("isverified").get("1").sum("amount"));
+        }
 
         Row row = rows.isNotEmpty() ? rows.get(0) : new Row();
         return getSucReturnObject().setData(row).toString();
@@ -159,7 +161,8 @@ public class tpartreimbursement extends Controller {
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_tpartreimbursement", "*");
         querySQL.setTableAlias("t1");
-
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid","enterprisename","abbreviation");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid","agentnum");
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere(where);
         querySQL.setPage(pageSize, pageNumber);