Merge branch 'master' into dev

app-ghs/controllers/OrderController.php

@@ -2642,7 +2642,8 @@ class OrderController extends BaseController
         $page = max(1, (int)($get['page'] ?? 1));
         $fields = ['id', 'orderSn', 'actPrice', 'addTime', 'remainDebtPrice', 'debtPrice', 'payTime', 'sendTime', 'remark', 'tkPrice', 'nextDayTkPrice', 'clearId'];
         Yii::$app->request->setQueryParams(array_merge($get, ['page' => $page, 'pageSize' => $pageSize]));
-        $result = OrderClass::getList($fields, $where, 'addTime DESC');
+        // 待结勾选按发货时间排：同一批发货的单挨在一起；空 sendTime 会沉到底
+        $result = OrderClass::getList($fields, $where, 'sendTime DESC, addTime DESC');
         if (!empty($result['list'])) {
             foreach ($result['list'] as $key => $value) {
                 $debtPrice = $value['debtPrice'] ?? 0;

biz-hd/purchase/services/PurchaseService.php

@@ -193,7 +193,8 @@ class PurchaseService extends BaseService
             ? (int)$get['pageSize'] : 100;
         $page = max(1, (int)($get['page'] ?? 1));
 
-        $list = PurchaseClass::getAllList('*', $where, 'addTime DESC');
+        // 待结勾选按发货时间排：同一批发货的单挨在一起；空 sendTime 会沉到底
+        $list = PurchaseClass::getAllList('*', $where, 'sendTime DESC, addTime DESC');
         $synced = [];
         $clearedSum = '0.00';
         $remainSum = '0.00';