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

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

@@ -287,6 +287,7 @@ public class expressform extends Controller {
         querySQL.setWhere("t1.type='销售出库' and t1.status='审核' and t1.rb=1 and ifnull(t1.txlogisticid,'')=''");
         querySQL.setWhere(where);
         querySQL.setPage(pageSize, pageNumber);
+        querySQL.setOrderBy("t1.st_stockbillid desc");
         Rows rows = querySQL.query();
         return getSucReturnObject().setData(rows).toString();
     }

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

@@ -1006,7 +1006,7 @@ public class stockbill extends Controller {
                 Rows stockrows = dbConnect.runSqlQuery("select *from st_stock where stockno='" + stockno + "'");
 
 
-                if(st_stockbill_itemsid>0 && dbConnect.runSqlQuery("select 1 from where st_stockbill_items_sku where st_stockbillid=st_stockbill_itemsid and st_stockbillid="+st_stockbillid).size()>0){
+                if(st_stockbill_itemsid>0 && dbConnect.runSqlQuery("select 1 from st_stockbill_items_sku where st_stockbillid=st_stockbill_itemsid and st_stockbillid="+st_stockbillid).size()>0){
                     scanqtyrefresh();
                 }