|
@@ -266,6 +266,10 @@ class ProductInventoryService extends Service
|
|
|
->pluck('title','id')
|
|
|
->toArray();
|
|
|
|
|
|
+ $basic_map = BasicType::whereIn('id',array_unique(array_column($data['data'],'unit')))
|
|
|
+ ->pluck('title','id')
|
|
|
+ ->toArray();
|
|
|
+
|
|
|
$roll_tmp = [];
|
|
|
$order_type = $this->getOrderType();
|
|
|
foreach ($data as $key => $value){
|
|
@@ -290,6 +294,7 @@ class ProductInventoryService extends Service
|
|
|
$data[$key]['product_category_title'] = $category[$value['product_category_id']] ?? '';
|
|
|
$data[$key]['order_name'] = $order_type[$value['order_type']] ?? '';
|
|
|
$data[$key]['crt_time'] = $value['crt_time'] ? date("Y-m-d",$value['crt_time']):'';
|
|
|
+ $data['data'][$key]['unit_title'] = $basic_map[$value['unit']] ?? '';
|
|
|
}
|
|
|
|
|
|
return $data;
|