pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

Merge branch 'develop' into base

base
panliang 2023-08-14 15:09:01 +08:00
parent 6ddc184458 61118088c8
commit 191770ebf1
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Admin/Controllers/Store/StockTotalController.php
View File

@ -14,7 +14,6 @@ class StockTotalController extends AdminController
protected function grid() protected function grid()
{ {
// return Grid::make(ProductSku::with(['productSku.category', 'stockLogs']), function (Grid $grid) {
$request = request(); $request = request();
if (!$request->filled('date.start')) { if (!$request->filled('date.start')) {
$request->offsetSet('date.start', now()->startOfMonth()->format('Y-m-d')); $request->offsetSet('date.start', now()->startOfMonth()->format('Y-m-d'));

2
app/Admin/Repositories/StoreTockRepository.php
View File

@ -89,7 +89,7 @@ class StoreTockRepository extends Repository
$start = Carbon::createFromFormat('Y-m-d', $start)->startOfDay(); $start = Carbon::createFromFormat('Y-m-d', $start)->startOfDay();
$q->where('created_at', '<=', $start); $q->where('created_at', '<=', $start);
} }
$q->orderBy('created_at', 'desc')->limit(1); $q->orderBy('created_at', 'desc');
}, },
]); ]);