cf_cloud/erp
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

a订单导出

Browse Source
This commit is contained in:
杨建炊 2024-11-04 11:31:56 +08:00
parent c60786f798
commit 985d4c8b59
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Goods/GoodsCombinationController.php
View File

@ -92,7 +92,7 @@ class GoodsCombinationController extends Controller
} }
$finalIds = array_merge($finalIds, array_keys($goodsSkus)); $finalIds = array_merge($finalIds, array_keys($goodsSkus));
$idField = implode(',', $finalIds); $idField = implode(',', $finalIds);
$goodsSkusBuilder->orderByRaw("FIELD(id, {$idField})"); $goodsSkusBuilder->orderByRaw("FIELD({$idField},id) {$sortValue}");
} else { } else {
$goodsSkusBuilder->orderBy($sortField, $sortValue); $goodsSkusBuilder->orderBy($sortField, $sortValue);
} }

4
app/Http/Controllers/Goods/GoodsSkusController.php
View File

@ -104,7 +104,7 @@ class GoodsSkusController extends Controller
$sortField = $request->input('sort_field', 'id');//stock sale_stock order_goods_num $sortField = $request->input('sort_field', 'id');//stock sale_stock order_goods_num
$sortValue = $request->input('sort_value', 'desc'); $sortValue = $request->input('sort_value', 'desc');
$goodsSkusBuilder = (clone $builder)->with(['goods' => function ($query) { $goodsSkusBuilder = (clone $builder)->filter()->with(['goods' => function ($query) {
$query->with(['type' => function ($query) { $query->with(['type' => function ($query) {
$query->with("parentType:id,name")->select(["id", "name", "parent_id"]); $query->with("parentType:id,name")->select(["id", "name", "parent_id"]);
}]); }]);
@ -128,7 +128,7 @@ class GoodsSkusController extends Controller
} }
$finalIds = array_merge($finalIds, array_keys($goodsSkus)); $finalIds = array_merge($finalIds, array_keys($goodsSkus));
$idField = implode(',', $finalIds); $idField = implode(',', $finalIds);
$goodsSkusBuilder->orderByRaw("FIELD(id, {$idField})"); $goodsSkusBuilder->orderByRaw("FIELD({$idField},id) {$sortValue}");
} else { } else {
$goodsSkusBuilder->orderBy($sortField, $sortValue); $goodsSkusBuilder->orderBy($sortField, $sortValue);
} }