|
@@ -195,7 +195,6 @@ class ScrappService extends Service
|
|
|
|
|
|
|
|
$first = $result[0] ?? [];
|
|
$first = $result[0] ?? [];
|
|
|
$order['order_number'] = "ZJ" . $first['order_number'];
|
|
$order['order_number'] = "ZJ" . $first['order_number'];
|
|
|
- $order['crt_time'] = $first['crt_time'] ? date("Y-m-d H:i:s", $first['crt_time']) : '';
|
|
|
|
|
$order['process_title'] = Process::where('id',$first['process_id'])->value("title");
|
|
$order['process_title'] = Process::where('id',$first['process_id'])->value("title");
|
|
|
$order['team_title'] = Team::where('id',$first['team_id'])->value("title");
|
|
$order['team_title'] = Team::where('id',$first['team_id'])->value("title");
|
|
|
$order['finished_title'] = Employee::where('id',$first['finished_id'])->value("emp_name");
|
|
$order['finished_title'] = Employee::where('id',$first['finished_id'])->value("emp_name");
|
|
@@ -203,6 +202,7 @@ class ScrappService extends Service
|
|
|
$dispatch = DispatchSub::where('id',$first['dispatch_sub_id'])->first();
|
|
$dispatch = DispatchSub::where('id',$first['dispatch_sub_id'])->first();
|
|
|
$dispatch = empty($dispatch) ? [] : $dispatch->toArray();
|
|
$dispatch = empty($dispatch) ? [] : $dispatch->toArray();
|
|
|
$order['dispatch_no'] = $dispatch['dispatch_no'] ?? "";
|
|
$order['dispatch_no'] = $dispatch['dispatch_no'] ?? "";
|
|
|
|
|
+ $order['crt_time'] = date("Y-m-d",strtotime(substr($order['dispatch_no'],0,8)));
|
|
|
|
|
|
|
|
$team_man = EmployeeTeamPermission::where('team_id',$first['team_id'])
|
|
$team_man = EmployeeTeamPermission::where('team_id',$first['team_id'])
|
|
|
->select('team_id','employee_id')
|
|
->select('team_id','employee_id')
|
|
@@ -321,7 +321,7 @@ class ScrappService extends Service
|
|
|
->pluck('dispatch_no','id')
|
|
->pluck('dispatch_no','id')
|
|
|
->toArray();
|
|
->toArray();
|
|
|
foreach ($data['data'] as $key => $value){
|
|
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]['finished_title'] = $emp_map[$value['finished_id']] ?? '';
|
|
|
$data['data'][$key]['team_title'] = $team_maps[$value['team_id']] ?? '';
|
|
$data['data'][$key]['team_title'] = $team_maps[$value['team_id']] ?? '';
|
|
|
$data['data'][$key]['team_man'] = $team_man_maps[$value['team_id']] ?? '';
|
|
$data['data'][$key]['team_man'] = $team_man_maps[$value['team_id']] ?? '';
|
|
@@ -329,7 +329,9 @@ class ScrappService extends Service
|
|
|
$data['data'][$key]['process_title'] = $process_map[$value['process_id']] ?? '';
|
|
$data['data'][$key]['process_title'] = $process_map[$value['process_id']] ?? '';
|
|
|
$data['data'][$key]['order_number'] = "BLP" . $value['order_number'];
|
|
$data['data'][$key]['order_number'] = "BLP" . $value['order_number'];
|
|
|
$data['data'][$key]['sale_order_number'] = $sales_number[$value['sale_orders_product_id']] ?? "";
|
|
$data['data'][$key]['sale_order_number'] = $sales_number[$value['sale_orders_product_id']] ?? "";
|
|
|
- $data['data'][$key]['dispatch_no'] = $dispatch_no[$value['dispatch_sub_id']] ?? "";
|
|
|
|
|
|
|
+ $dispatch_t = $dispatch_no[$value['dispatch_sub_id']] ?? "";
|
|
|
|
|
+ $data['data'][$key]['dispatch_no'] = $dispatch_t;
|
|
|
|
|
+ $data['data'][$key]['crt_time'] = date("Y-m-d",strtotime(substr($dispatch_t,0,8)));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return $data;
|
|
return $data;
|
|
@@ -345,7 +347,6 @@ class ScrappService extends Service
|
|
|
|
|
|
|
|
$first = $result[0] ?? [];
|
|
$first = $result[0] ?? [];
|
|
|
$order['order_number'] = "BLP" . $first['order_number'];
|
|
$order['order_number'] = "BLP" . $first['order_number'];
|
|
|
- $order['crt_time'] = $first['crt_time'] ? date("Y-m-d H:i:s", $first['crt_time']) : '';
|
|
|
|
|
$order['process_title'] = Process::where('id',$first['process_id'])->value("title");
|
|
$order['process_title'] = Process::where('id',$first['process_id'])->value("title");
|
|
|
$order['team_title'] = Team::where('id',$first['team_id'])->value("title");
|
|
$order['team_title'] = Team::where('id',$first['team_id'])->value("title");
|
|
|
$order['finished_title'] = Employee::where('id',$first['finished_id'])->value("emp_name");
|
|
$order['finished_title'] = Employee::where('id',$first['finished_id'])->value("emp_name");
|
|
@@ -353,6 +354,7 @@ class ScrappService extends Service
|
|
|
$dispatch = DispatchSub::where('id',$first['dispatch_sub_id'])->first();
|
|
$dispatch = DispatchSub::where('id',$first['dispatch_sub_id'])->first();
|
|
|
$dispatch = empty($dispatch) ? [] : $dispatch->toArray();
|
|
$dispatch = empty($dispatch) ? [] : $dispatch->toArray();
|
|
|
$order['dispatch_no'] = $dispatch['dispatch_no'] ?? "";
|
|
$order['dispatch_no'] = $dispatch['dispatch_no'] ?? "";
|
|
|
|
|
+ $order['crt_time'] = date("Y-m-d",strtotime(substr($order['dispatch_no'],0,8)));
|
|
|
|
|
|
|
|
$team_man = EmployeeTeamPermission::where('team_id',$first['team_id'])
|
|
$team_man = EmployeeTeamPermission::where('team_id',$first['team_id'])
|
|
|
->select('team_id','employee_id')
|
|
->select('team_id','employee_id')
|
cqp