时间筛选本地

app/Http/Controllers/ReceiveRecordController.php

@@ -33,10 +33,26 @@ class ReceiveRecordController extends Controller
         $warehouse = $request->input("warehouse");
 
         if ($timeSt && $timeEn){
-            $builder->whereBetween("record_at",[$timeSt.':00', $timeEn.':00']);
+            $builder->where(function ($query) use($timeSt, $timeEn) {
+                /** @var Builder $query */
+                $query->whereBetween("record_at",[$timeSt.':00', $timeEn.':00'])
+                    ->orWhereBetween("location_at",[$timeSt.':00', $timeEn.':00']);
+            });
         }else{
-            if ($timeSt)$builder->where("record_at",'>=',$timeSt.':00');
-            if ($timeEn)$builder->where("record_at",'<=',$timeEn.':00');
+            if ($timeSt){
+                $builder->where(function ($query) use($timeSt) {
+                    /** @var Builder $query */
+                    $query->where("record_at",'>=',$timeSt.':00')
+                        ->orWhere("location_at",'>=',$timeSt.':00');
+                });
+            }
+            if ($timeEn) {
+                $builder->where(function ($query) use($timeEn) {
+                    /** @var Builder $query */
+                    $query->where("record_at",'<=',$timeEn.':00')
+                        ->orWhere("location_at",'<=',$timeEn.':00');
+                });
+            }
         }
         if ($logisticNumber!==null){
             mb_regex_encoding('utf-8');