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

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

@@ -157,7 +157,7 @@ public class accessoryorder extends Controller {
         expressformQuery.addJoinTable(JOINTYPE.inner, "st_stockbill", "t4", "t3.st_stockbillid = t4.st_stockbillid", "tracknumber");
         expressformQuery.setWhere("t3.sa_orderid", rows.toArrayList("sa_orderid"));
         expressformQuery.setOrderBy("t1.createdate desc");
-        expressformQuery.setDistinct(true);
+//        expressformQuery.setDistinct(true);
         Rows expressformrows = expressformQuery.query();
         RowsMap expressformrowsMap = expressformrows.toRowsMap("sa_orderid");
         //查询区域信息

src/custom/restcontroller/webmanage/sale/dbstockbill/dbstockbillreceive.java

@@ -52,7 +52,7 @@ public class dbstockbillreceive extends Controller {
         querySQL.setWhere(where);
         querySQL.setWhere("t6.status='审核' and t1.undeliqty>0");
         querySQL.setPage(pageSize, pageNumber);
-        querySQL.setOrderBy(pageSorting);
+        querySQL.setOrderBy("t6.st_dbstockbillid desc");
         Rows rows = querySQL.query();
 
         return getSucReturnObject().setData(rows).toString();

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

@@ -3708,7 +3708,7 @@ public class Order extends Controller {
         expressformQuery.addJoinTable(JOINTYPE.inner, "sa_expressform_stockbill", "t2", "t2.expressformid = t1.expressformid");
         expressformQuery.addJoinTable(JOINTYPE.inner, "st_stockbill_items", "t3", "t3.st_stockbillid = t2.st_stockbillid");
         expressformQuery.setWhere("t3.sa_orderid", sa_orderid);
-        expressformQuery.setDistinct(true);
+        expressformQuery.setOrderBy("t1.createdate desc");
         Rows rows = expressformQuery.query();
 
         return getSucReturnObject().setData(rows).toString();

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

@@ -1032,7 +1032,7 @@ public class serviceorder extends Controller {
         }
 
         if (usertype == 99) {
-            customerphone = userrows.get(0).getString("phonenumber");
+            customerphone = userrows.get(0).getString("scenecontactphonenumber");
         } else {
             if (type.equals("安装")) {
                 customerphone = rows.get(0).getString("scenecontactphonenumber");