|
@@ -72,7 +72,7 @@ class ReportFormsService extends Service
|
|
}
|
|
}
|
|
|
|
|
|
//返回统计数据
|
|
//返回统计数据
|
|
- date_default_timezone_set("PRC");
|
|
|
|
|
|
+
|
|
foreach ($list as $key => $value) {
|
|
foreach ($list as $key => $value) {
|
|
$list[$key]['production_time'] = $value['production_time'] ? date('Y-m-d',$value['production_time']) : '';
|
|
$list[$key]['production_time'] = $value['production_time'] ? date('Y-m-d',$value['production_time']) : '';
|
|
$list[$key]['out_order_no_time'] = $value['out_order_no_time'] ? date('Y-m-d',$value['out_order_no_time']) : '';
|
|
$list[$key]['out_order_no_time'] = $value['out_order_no_time'] ? date('Y-m-d',$value['out_order_no_time']) : '';
|
|
@@ -92,7 +92,7 @@ class ReportFormsService extends Service
|
|
}
|
|
}
|
|
|
|
|
|
private function checkSameQuarter($timestamps) {
|
|
private function checkSameQuarter($timestamps) {
|
|
- date_default_timezone_set("PRC");
|
|
|
|
|
|
+
|
|
$quarters = $out_time = [];
|
|
$quarters = $out_time = [];
|
|
foreach ($timestamps as $timestamp) {
|
|
foreach ($timestamps as $timestamp) {
|
|
$date = date('Ym', $timestamp);
|
|
$date = date('Ym', $timestamp);
|
|
@@ -141,7 +141,7 @@ class ReportFormsService extends Service
|
|
->pluck('title','id')
|
|
->pluck('title','id')
|
|
->toArray();
|
|
->toArray();
|
|
$return_team = $return_team_time_tmp = $return_team_time= [];
|
|
$return_team = $return_team_time_tmp = $return_team_time= [];
|
|
- date_default_timezone_set("PRC");
|
|
|
|
|
|
+
|
|
foreach ($result as $value){
|
|
foreach ($result as $value){
|
|
if(isset($return_team[$value['team_id']])){
|
|
if(isset($return_team[$value['team_id']])){
|
|
$return_team[$value['team_id']]['num'] += 1;
|
|
$return_team[$value['team_id']]['num'] += 1;
|
|
@@ -230,7 +230,7 @@ class ReportFormsService extends Service
|
|
->select('production_time','production_no','customer_no','customer_name','table_header_mark','product_no','product_title','product_size','product_unit','dispatch_complete_quantity','finished_num','technology_material','technology_name','wood_name','process_mark','table_body_mark')
|
|
->select('production_time','production_no','customer_no','customer_name','table_header_mark','product_no','product_title','product_size','product_unit','dispatch_complete_quantity','finished_num','technology_material','technology_name','wood_name','process_mark','table_body_mark')
|
|
->get()->toArray();
|
|
->get()->toArray();
|
|
|
|
|
|
- date_default_timezone_set("PRC");
|
|
|
|
|
|
+
|
|
foreach ($list as $key => $value) {
|
|
foreach ($list as $key => $value) {
|
|
$list[$key]['production_time'] = $value['production_time'] ? date('Y-m-d',$value['production_time']) : '';
|
|
$list[$key]['production_time'] = $value['production_time'] ? date('Y-m-d',$value['production_time']) : '';
|
|
}
|
|
}
|
|
@@ -293,7 +293,7 @@ class ReportFormsService extends Service
|
|
}
|
|
}
|
|
|
|
|
|
//返回统计数据
|
|
//返回统计数据
|
|
- date_default_timezone_set("PRC");
|
|
|
|
|
|
+
|
|
foreach ($list as $key => $value) {
|
|
foreach ($list as $key => $value) {
|
|
$list[$key]['production_time'] = $value['production_time'] ? date('Y-m-d',$value['production_time']) : '';
|
|
$list[$key]['production_time'] = $value['production_time'] ? date('Y-m-d',$value['production_time']) : '';
|
|
$list[$key]['out_order_no_time'] = $value['out_order_no_time'] ? date('Y-m-d',$value['out_order_no_time']) : '';
|
|
$list[$key]['out_order_no_time'] = $value['out_order_no_time'] ? date('Y-m-d',$value['out_order_no_time']) : '';
|
|
@@ -345,7 +345,7 @@ class ReportFormsService extends Service
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- date_default_timezone_set("PRC");
|
|
|
|
|
|
+
|
|
|
|
|
|
$scrapp_map = Scrapp::where('del_time',0)->pluck('title','id')->toArray();
|
|
$scrapp_map = Scrapp::where('del_time',0)->pluck('title','id')->toArray();
|
|
foreach ($list as $key => $value) {
|
|
foreach ($list as $key => $value) {
|
|
@@ -421,7 +421,7 @@ class ReportFormsService extends Service
|
|
}
|
|
}
|
|
|
|
|
|
//返回统计数据
|
|
//返回统计数据
|
|
- date_default_timezone_set("PRC");
|
|
|
|
|
|
+
|
|
foreach ($list as $key => $value) {
|
|
foreach ($list as $key => $value) {
|
|
$list[$key]['production_time'] = $value['production_time'] ? date('Y-m-d',$value['production_time']) : '';
|
|
$list[$key]['production_time'] = $value['production_time'] ? date('Y-m-d',$value['production_time']) : '';
|
|
$list[$key]['out_order_no_time'] = $value['out_order_no_time'] ? date('Y-m-d',$value['out_order_no_time']) : '';
|
|
$list[$key]['out_order_no_time'] = $value['out_order_no_time'] ? date('Y-m-d',$value['out_order_no_time']) : '';
|
|
@@ -476,7 +476,7 @@ class ReportFormsService extends Service
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- date_default_timezone_set("PRC");
|
|
|
|
|
|
+
|
|
//次品原因 班组 人员
|
|
//次品原因 班组 人员
|
|
$map = Scrapp::whereIn('id',$scrapp_id)
|
|
$map = Scrapp::whereIn('id',$scrapp_id)
|
|
->pluck('title','id')
|
|
->pluck('title','id')
|
|
@@ -602,7 +602,7 @@ class ReportFormsService extends Service
|
|
->select('device_name','time','data_point_name')
|
|
->select('device_name','time','data_point_name')
|
|
->get()->toArray();
|
|
->get()->toArray();
|
|
|
|
|
|
- date_default_timezone_set("PRC");
|
|
|
|
|
|
+
|
|
$return = [
|
|
$return = [
|
|
'run' => [],
|
|
'run' => [],
|
|
'work' => [],
|
|
'work' => [],
|
|
@@ -651,7 +651,7 @@ class ReportFormsService extends Service
|
|
->select('device_name','time','value')
|
|
->select('device_name','time','value')
|
|
->get()->toArray();
|
|
->get()->toArray();
|
|
|
|
|
|
- date_default_timezone_set("PRC");
|
|
|
|
|
|
+
|
|
|
|
|
|
//所有的时间
|
|
//所有的时间
|
|
$time_all = [];
|
|
$time_all = [];
|
|
@@ -711,7 +711,7 @@ class ReportFormsService extends Service
|
|
if(empty($result)) return [true,[]];
|
|
if(empty($result)) return [true,[]];
|
|
$device_name = array_values(array_unique(array_column($result,'device_name')));
|
|
$device_name = array_values(array_unique(array_column($result,'device_name')));
|
|
|
|
|
|
- date_default_timezone_set("PRC");
|
|
|
|
|
|
+
|
|
$run_time = $process_time = $fault = $time_all = [];
|
|
$run_time = $process_time = $fault = $time_all = [];
|
|
foreach ($result as $value){
|
|
foreach ($result as $value){
|
|
$time = date("Y-m-d",$value['time'] / 1000);
|
|
$time = date("Y-m-d",$value['time'] / 1000);
|