yjc/erp
1
0
Fork 0
mirror of https://gitee.com/hzchunfen/erp.git synced 2025-12-01 14:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

鲜花2.0-采购流程变更

Browse Source
This commit is contained in:
杨建炊 2024-09-07 16:46:29 +08:00
parent 1b6bd4ffc4
commit f9c0662282
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,8 +95,11 @@ class GoodsCombinationController extends Controller
$item['children'] = $items; $item['children'] = $items;
unset($item['combinationGoods']); unset($item['combinationGoods']);
} }
$rolesName = $request->user()->getRoleNames()->toArray();
$data = ["manage" => ["is_admin" => in_array($rolesName[0]
, ["运营", "超级管理员", "管理员", "系统管理员", "店铺运营"]) ? 1 : 0]];
return GoodsSkuResource::collection($skus); return GoodsSkuResource::collection($skus)->additional($data);
} }
public function store(Request $request) public function store(Request $request)
@ -115,8 +118,8 @@ class GoodsCombinationController extends Controller
} }
$externalSkuId = $request->input('external_sku_id') ?? $externalSkuId = $request->input('external_sku_id') ??
GeneratorUtils::generateCombinationGoodNumber($request->combination_goods); GeneratorUtils::generateCombinationGoodNumber($request->combination_goods);
$hasCodeSku = GoodsSku::query()->where("external_sku_id",$externalSkuId)->first(); $hasCodeSku = GoodsSku::query()->where("external_sku_id", $externalSkuId)->first();
if(!empty($hasCodeSku)){ if (!empty($hasCodeSku)) {
throw new \Exception("该组合商品编码已存在"); throw new \Exception("该组合商品编码已存在");
} }
DB::beginTransaction(); DB::beginTransaction();

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

@ -133,13 +133,15 @@ class GoodsSkusController extends Controller
$sku['cost'] = 0; $sku['cost'] = 0;
} }
if (!empty($sku['yesterday_num'])) { if (!empty($sku['yesterday_num'])) {
$sku['sale_ratio'] = round($sku['stock'] / $sku['yesterday_num'], 2) * 100; $sku['sale_ratio'] = round($sku['stock'] / $sku['yesterday_num'], 2) * 100;
} else { } else {
$sku['sale_ratio'] = 0; $sku['sale_ratio'] = 0;
} }
} }
return GoodsSkuResource::collection($goodsSkus); $data = ["manage"=>["is_admin"=>in_array($rolesName[0],["运营","超级管理员","管理员","系统管理员","店铺运营"])?1:0]];
return GoodsSkuResource::collection($goodsSkus)->additional($data);
} }
private function preparQueryGoodsSkus(Request $request, &$builder) private function preparQueryGoodsSkus(Request $request, &$builder)