Merge remote-tracking branch 'origin/develop' into develop-test

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

@@ -278,6 +278,13 @@ public class tpartreimbursementdetail extends Controller {
         }
         Long sa_tpartreimbursementid = content.getLong("sa_tpartreimbursementid");
 
+        QuerySQL t6 =SQLFactory.createQuerySQL( this,"sa_tpartreimbursementdetail","sa_orderitemsid").setTableAlias("t1");
+        t6.addJoinTable(JOINTYPE.inner,"sa_tpartreimbursement","t2","t2.sa_tpartreimbursementid=t1.sa_tpartreimbursementid");
+        t6.addQueryFields("sumcheckqty","ifnull(sum(t1.checkqty),0)");
+        t6.setWhere("t2.status='审核'");
+        t6.addGroupBy("t1.sa_orderitemsid");
+
+
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_tpartreimbursementdetail", "sa_tpartreimbursementdetailid", "remarks", "sa_orderitemsid", "sa_tpartreimbursementid", "qty", "checkqty", "hongbillno");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.inner, "sa_orderitems", "t2", "t1.sa_orderitemsid = t2.sa_orderitemsid AND t1.siteid = t2.siteid",
@@ -285,6 +292,7 @@ public class tpartreimbursementdetail extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t3", "t2.itemid = t3.itemid AND t2.siteid = t3.siteid", "itemno", "itemname", "spec", "model");
         querySQL.addJoinTable(JOINTYPE.left, "sa_order", "t4", "t2.sa_orderid = t4.sa_orderid AND t2.siteid = t4.siteid", "sonum");
         querySQL.addJoinTable(JOINTYPE.left, "sa_warrantycard", "t5", "t2.cardno = t5.cardno AND t2.siteid = t5.siteid", "name", "phonenumber", "address");
+        querySQL.addJoinTable(JOINTYPE.left, t6, "t6", "t6.sa_orderitemsid = t1.sa_orderitemsid ", "sumcheckqty");
         querySQL.addQueryFields("amount", "ROUND(t2.price*t1.qty,2)");
         querySQL.addQueryFields("orderitems_qty", "t2.qty");
         querySQL.setSiteid(siteid);
@@ -292,6 +300,11 @@ public class tpartreimbursementdetail extends Controller {
         querySQL.setWhere(where.toString());
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
+
+        for (Row row:rows) {
+            row.putIfAbsent("sumcheckqty",0);
+        }
+
         return getSucReturnObject().setData(rows).toString();
     }