|
|
@@ -750,9 +750,9 @@ class ConstructionService extends Service
|
|
|
$data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
|
|
|
$data['data'][$key]['customer_contact_title'] = $emp[$value['customer_contact_id']] ?? '';
|
|
|
$data['data'][$key]['state_title'] = Construction::$name[$value['state']] ?? '';
|
|
|
- $tmp_sales = $sales_map[$value['sales_order_id']] ?? [];
|
|
|
+ $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]['sales_order_number'] = $tmp_sales;
|
|
|
$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']] ?? '';
|
cqpCow