|
|
@@ -712,11 +712,7 @@ class ConstructionService extends Service
|
|
|
$customer = Customer::whereIn('id',array_unique(array_column($data['data'],'customer_id')))
|
|
|
->pluck('title','id')
|
|
|
->toArray();
|
|
|
- $sales = SalesOrder::whereIn('id',array_unique(array_column($data['data'],'sales_order_id')))->select('order_number','id','handover_time')->get()->toArray();
|
|
|
- $sales_map = [];
|
|
|
- foreach ($sales as $value){
|
|
|
- $sales_map[$value['id']] = $value;
|
|
|
- }
|
|
|
+ $sales_map = SalesOrder::whereIn('id',array_unique(array_column($data['data'],'sales_order_id')))->pluck('order_number','id')->toArray();
|
|
|
$storehouse = Storehouse::whereIn('id',array_unique(array_column($data['data'],'storehouse_id')))
|
|
|
->pluck('title','id')
|
|
|
->toArray();
|
|
|
@@ -757,7 +753,7 @@ class ConstructionService extends Service
|
|
|
$tmp_sales = $sales_map[$value['sales_order_id']] ?? [];
|
|
|
// $tmp_sales_time = $tmp_sales['handover_time'] ? date("Y-m-d") : "";
|
|
|
$data['data'][$key]['sales_order_number'] = $tmp_sales['order_number'];
|
|
|
- $data['data'][$key]['handover_time'] = $value['handover_time'] ? date("Y-m-d") : "";
|
|
|
+ $data['data'][$key]['handover_time'] = $value['handover_time'] ? date("Y-m-d",$value['handover_time']) : "";
|
|
|
$data['data'][$key]['storehouse_title'] = $storehouse[$value['storehouse_id']] ?? '';
|
|
|
$data['data'][$key]['dispatch_company'] = $dispatch[$value['sales_order_id']] ?? '';
|
|
|
// $data['data'][$key]['pq_state_title'] = Construction::$pq_name[$value['pq_state']] ?? '';
|
cqpCow