|
@@ -797,6 +797,16 @@ class ProductService extends Service
|
|
|
$top_depart = $user['depart_top'][0] ?? [];
|
|
|
//特殊功能按钮
|
|
|
$special_button = $user['special_button'] ?? [];
|
|
|
+
|
|
|
+ //库存
|
|
|
+ $stock_map = [];
|
|
|
+ if(! empty($search['storehouse_id'])){
|
|
|
+ $stock = ProductInventoryService::getRealStock($product_id, $search['storehouse_id']);
|
|
|
+ foreach ($stock as $value){
|
|
|
+ $stock_map[$value['product_id']] = $value;
|
|
|
+ }unset($stock);
|
|
|
+ }
|
|
|
+
|
|
|
foreach ($data['data'] as $key => $value){
|
|
|
$tmp = [];
|
|
|
if(isset($detail_map[$value['id']])){
|
|
@@ -828,6 +838,8 @@ class ProductService extends Service
|
|
|
$data['data'][$key]['product_attribute_title'] = Product::$product_attribute[$value['product_attribute']] ?? "";
|
|
|
$data['data'][$key]['color'] = Product::$product_attribute_color[$value['product_attribute']] ?? [];
|
|
|
$data['data'][$key]['img'] = $img[$value['id']] ?? "";
|
|
|
+ //库存
|
|
|
+ $data['data'][$key]['stock'] = $stock_map[$value['id']] ?? [];
|
|
|
|
|
|
//成本隐藏
|
|
|
$price = "******";
|