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

Merge branch 'develop' into base

base
panliang 2023-08-11 14:34:24 +08:00
parent 1fde10e909 9d4047032c
commit 21ddd653fa
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ class StockTotalController extends AdminController
// return Grid::make(ProductSku::with(['productSku.category', 'stockLogs']), function (Grid $grid) { // return Grid::make(ProductSku::with(['productSku.category', 'stockLogs']), function (Grid $grid) {
return Grid::make(new StoreTockRepository, function (Grid $grid) { return Grid::make(new StoreTockRepository, function (Grid $grid) {
$tags = StockLog::tags()->get(); $tags = StockLog::tags()->get();
$grid->column('store_name', '门店');
$grid->column('name', '产品'); $grid->column('name', '产品');
$grid->column('category_name', '分类'); $grid->column('category_name', '分类');
$grid->column('cost_price', '成本单价'); $grid->column('cost_price', '成本单价');

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

@ -32,6 +32,7 @@ class StoreTockRepository extends Repository
$cost_price = data_get($item->productSku, 'cost_price') / 100; $cost_price = data_get($item->productSku, 'cost_price') / 100;
$subData = [ $subData = [
'id' => $item->product_sku_id, 'id' => $item->product_sku_id,
'store_name' => data_get($item->store, 'title'),
'name' => data_get($item->productSku, 'name'), 'name' => data_get($item->productSku, 'name'),
'category_id' => data_get($item->productSku, 'category.id'), 'category_id' => data_get($item->productSku, 'category.id'),
'category_name' => data_get($item->productSku, 'category.name'), 'category_name' => data_get($item->productSku, 'category.name'),
@ -62,6 +63,7 @@ class StoreTockRepository extends Repository
public function getQuery(Grid\Model $model) public function getQuery(Grid\Model $model)
{ {
$query = ProductSku::with([ $query = ProductSku::with([
'store',
'productSku.category', 'productSku.category',
'stockLogs' => function ($q) use ($model) { 'stockLogs' => function ($q) use ($model) {
$q->select('id', 'product_sku_id', DB::raw('abs(`amount`) as `amount`'), 'tag_id'); $q->select('id', 'product_sku_id', DB::raw('abs(`amount`) as `amount`'), 'tag_id');