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

src/custom/restcontroller/webmanage/sale/aftersalesmag/SQL/审核订单列表查询.sql

@@ -1,5 +1,5 @@
-select  t1.* from sa_order t1 left join sa_orderitems t2  on t1.sa_orderid=t2.sa_orderid and t1.siteid=t2.siteid  where 
-                $where$ 
-                and (ifnull(t2.qty,0)-ifnull(t2.undeliqty,0))>ifnull(t2.returnqty,0) 
+select  t1.* from sa_order t1 left join sa_orderitems t2  on t1.sa_orderid=t2.sa_orderid and t1.siteid=t2.siteid  where
+                $where$
+                and (ifnull(t2.qty,0)-ifnull(t2.undeliqty,0))>ifnull(t2.returnqty,0)
                 and t1.siteid=$siteid$
                 and t1.sys_enterpriseid=$sys_enterpriseid$  group by  t1.sa_orderid

src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -326,7 +326,7 @@ public class Item extends Controller {
         for (Row row : rows) {
             JSONArray jsonArrayResult = JSONArray.parseArray(result);
             if(!jsonArrayResult.isEmpty()){
-                row.put("invbal_qty",((JSONObject)jsonArrayResult.get(0)).getBigDecimal("fqty"));
+                row.put("invbal_qty",((JSONObject)jsonArrayResult.get(0)).getBigDecimal("FQty"));
             }else{
                 row.put("invbal_qty",0);
             }