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

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -532,7 +532,7 @@ public class OrderItems extends Controller {
         String itemname = orderitemsRow.getString("itemname");
         BigDecimal canoffqty_old = orderitemsRow.getBigDecimal("canoffqty");
 
-        Rows rows = dbConnect.runSqlQuery("SELECT sum(t2.qty) checkqty from sa_tpartreimbursement t1 " +
+        Rows rows = dbConnect.runSqlQuery("SELECT sum(t2.checkqty) checkqty from sa_tpartreimbursement t1 " +
                 "INNER JOIN sa_tpartreimbursementdetail t2 ON t2.sa_tpartreimbursementid=t1.sa_tpartreimbursementid " +
                 "WHERE t1.status='审核' and t2.sa_orderitemsid='" + sa_orderitemsid + "'");
         BigDecimal checkqty = rows.isEmpty() ? BigDecimal.ZERO : rows.get(0).getBigDecimal("checkqty");