|
|
@@ -169,7 +169,7 @@ class ScrappService extends Service
|
|
|
->pluck('dispatch_no','id')
|
|
|
->toArray();
|
|
|
foreach ($data['data'] as $key => $value){
|
|
|
- $data['data'][$key]['crt_time'] = $value['crt_time'] ? date("Y-m-d H:i:s", $value['crt_time']) : '';
|
|
|
+// $data['data'][$key]['crt_time'] = $value['crt_time'] ? date("Y-m-d H:i:s", $value['crt_time']) : '';
|
|
|
$data['data'][$key]['finished_title'] = $emp_map[$value['finished_id']] ?? '';
|
|
|
$data['data'][$key]['team_title'] = $team_maps[$value['team_id']] ?? '';
|
|
|
$data['data'][$key]['team_man'] = $team_man_maps[$value['team_id']] ?? '';
|
|
|
@@ -178,6 +178,7 @@ class ScrappService extends Service
|
|
|
$data['data'][$key]['order_number'] = "ZJ" . $value['order_number'];
|
|
|
$data['data'][$key]['sale_order_number'] = $sales_number[$value['sale_orders_product_id']] ?? "";
|
|
|
$data['data'][$key]['dispatch_no'] = $dispatch_no[$value['dispatch_sub_id']] ?? "";
|
|
|
+ $data['data'][$key]['crt_time'] = substr(0,8,$value['dispatch_no']);
|
|
|
}
|
|
|
|
|
|
return $data;
|
cqp