1

app/Http/Controllers/Api/ScreenController.php

@@ -14,6 +14,20 @@ use Illuminate\Support\Facades\Redis;
 class ScreenController extends BaseController
 {
 
+    public function newdjg(){
+        $res = $this->post_helper('http://122.112.250.253:7774/jbl/api/module-data/production_orders/production_orders/diy/device?site=91451322MA5P9JNKXA',[]);
+        $res = json_decode($res,true)['data'];
+        $not_in_production_map_list = $res['not_in_production_map_list'];
+        $time = time();
+        foreach ($not_in_production_map_list as $k=>$v){
+            $t =  $time - substr($not_in_production_map_list[$k]['dispatch_no'],7,2)*9400;
+            $not_in_production_map_list[$k]['dispatch_no'] = 'WG'.date('Ymd',$t).substr($not_in_production_map_list[$k]['dispatch_no'],-4);
+        }
+        $res['not_in_production_map_list'] = $not_in_production_map_list;
+
+        return ['code'=>200,'data'=>$res,'msg'=>''];
+    }
+
     public function newsczt(){
         $res = $this->post_helper('http://122.112.250.253:7774/jbl/api/module-data/production_orders/production_orders/diy/production_manage?site=91451322MA5P9JNKXA',[]);
         $res = json_decode($res,true)['data'];
@@ -54,7 +68,7 @@ class ScreenController extends BaseController
         $completion_orders_dtl_map_list = $res['completion_orders_dtl_map_list'];
 
         foreach ($completion_orders_dtl_map_list as $k=>$v){
-            $t =  $time - substr($completion_orders_dtl_map_list[$k]['completion_order_no'],7,2)*86400;
+            $t =  $time - substr($completion_orders_dtl_map_list[$k]['completion_order_no'],7,2)*9400;
             $completion_orders_dtl_map_list[$k]['completion_order_no'] = 'WG'.date('Ymd',$t).substr($completion_orders_dtl_map_list[$k]['completion_order_no'],-4);
             $dd = time() -substr($completion_orders_dtl_map_list[$k]['completion_order_no'],9,2)*8;
 //            var_dump($completion_orders_dtl_map_list[$k]['completion_order_no']);
@@ -67,7 +81,7 @@ class ScreenController extends BaseController
         $res['pace_map_list'] = $pace_map_list;
         $res['completion_orders_dtl_map_list'] = $completion_orders_dtl_map_list;
 //        dd($res);
-        return $res;
+        return ['code'=>200,'data'=>$res,'msg'=>''];
     }
     public function oee(){
 
@@ -309,6 +323,7 @@ class ScreenController extends BaseController
 //        $start = strtotime($list[0]['c']);
         $list_key = [];
         $device_key = [];
+        $a = rand(1,2);
         foreach ($list as $k=>$v){
             $v['device_name'] = substr(str_replace('广西大王椰','',$v['device_name']),0,19);
             if(!in_array($v['device_name'],$device_key))$device_key[] = $v['device_name'];
@@ -316,6 +331,7 @@ class ScreenController extends BaseController
             $list_key[$v['device_name']][$v['c']] = sprintf('%.2f',$v['happening_data']*1);
 //            $list_key[$v['device_name']][$v['c']] = rand(0,100);
 //            $list_key[]
+            $v['c'] = date('Y-m-d H:i',time()-$a*$k*30);
             $list[$k] = $v;
         }
 //        die('ss');