优化

app-ghs/controllers/PurchaseOrderController.php

@@ -683,7 +683,7 @@ class PurchaseOrderController extends BaseController
         }
     }
 
-    //订单列表
+    // 采购入库单列表：searchTime 筛账单时间 entryTime，sendSearchTime 筛发货时间 sendTime
     public function actionList()
     {
         $where = [];
@@ -718,6 +718,7 @@ class PurchaseOrderController extends BaseController
                 $where['ghsName'] = ['like', $search];
             }
         }
+        // 账单时间：采购入库单按入库日 entryTime（没有销售单那种 payTime）
         $searchTime = $get['searchTime'] ?? '';
         if (!empty($searchTime)) {
             $startTime = $get['startTime'] ?? '';
@@ -725,6 +726,14 @@ class PurchaseOrderController extends BaseController
             $period = dateUtil::formatTime($searchTime, $startTime, $endTime);
             $where['entryTime'] = ['between', [$period['startTime'], $period['endTime']]];
         }
+        // 发货时间：按 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']]];
+        }
         $cgStaffId = $get['cgStaffId'] ?? 0;
         if (!empty($cgStaffId)) {
             $where['cgStaffId'] = $cgStaffId;