优化

app-ghs/controllers/OrderController.php

@@ -2608,7 +2608,7 @@ class OrderController extends BaseController
         util::success($out);
     }
 
-    // 客户欠款订单列表：searchTime 筛账单日期 payTime，sendSearchTime 筛发货日期 sendTime
+    // 客户欠款订单列表：searchTime 筛开单日期 addTime，sendSearchTime 筛发货日期 sendTime
     public function actionDebtList()
     {
         $get = Yii::$app->request->get();
@@ -2622,13 +2622,13 @@ class OrderController extends BaseController
             $startTime = $get['startTime'] ?? '';
             $endTime = $get['endTime'] ?? '';
             $period = dateUtil::formatTime($searchTime, $startTime, $endTime);
-            $where['payTime'] = ['between', [$period['startTime'], $period['endTime']]];
+            $where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
         } else {
             if ($mainId == 33447 && $id == 51031) {
                 util::fail('请选时间');
             }
         }
-        // 发货日期筛选：按 xhGhsOrder.sendTime，可与账单日期同时生效
+        // 发货日期筛选：按 xhGhsOrder.sendTime，可与开单日期同时生效
         $sendSearchTime = $get['sendSearchTime'] ?? '';
         if (!empty($sendSearchTime)) {
             $sendStartTime = $get['sendStartTime'] ?? '';

app-hd/controllers/PurchaseController.php

@@ -1468,7 +1468,7 @@ class PurchaseController extends BaseController
         util::success(['button' => $button]);
     }
 
-    //待结款明细 ssh 2021.1.26
+    // 待结款明细：searchTime 筛开单时间 addTime，sendSearchTime 筛发货时间 sendTime
     public function actionDebtList()
     {
         $get = Yii::$app->request->get();
@@ -1494,6 +1494,14 @@ class PurchaseController extends BaseController
             $period = dateUtil::formatTime($searchTime, $startTime, $endTime);
             $where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
         }
+        // 发货时间筛选：按 xhCg.sendTime，可与开单时间同时生效
+        $sendSearchTime = $get['sendSearchTime'] ?? '';
+        if (!empty($sendSearchTime)) {
+            $sendStartTime = $get['sendStartTime'] ?? '';
+            $sendEndTime = $get['sendEndTime'] ?? '';
+            $sendPeriod = dateUtil::formatTime($sendSearchTime, $sendStartTime, $sendEndTime);
+            $where['sendTime'] = ['between', [$sendPeriod['startTime'], $sendPeriod['endTime']]];
+        }
         $respond = PurchaseService::getDebtList($where);
         util::success($respond);
     }