大屏数据接口调整

application/api/controller/Index.php

@@ -22,6 +22,50 @@ class Index extends Api
         $this->success('请求成功');
     }
 
+    public function GetOrderNumber(){
+        if ($this->request->isGet() === false){
+            $this->error('请求错误');
+        }
+        $nowTime = date('Y-m-d H:i:s',time());
+        $oldTime = (date('Y')-1).'-'.date('m-d H:i:s');
+        $where =[
+            'Mod_rq' => ['between',[$oldTime,$nowTime]],
+            '行号' => '1'
+        ];
+
+        //按月份查询工单信息
+        $monthData = \db('工单_基本资料')
+            ->where('Mod_rq', 'between', [$oldTime, $nowTime])
+            ->field('DATE_FORMAT(Mod_rq, "%Y-%m") as month, COUNT(*) as count')
+            ->group('month')
+            ->order('month')
+            ->select();
+
+        // 转换为接口需要的格式
+        $result = [
+            "status" => 0,
+            "msg" => "",
+            "data" => [
+                "categories" => [],
+                "series" => [
+                    [
+                        "name" => "工单数量",
+                        "data" => []
+                    ]
+                ]
+            ]
+        ];
+
+        // 填充数据
+        foreach ($monthData as $item) {
+            $result['data']['categories'][] = $item['month'];
+            $result['data']['series'][0]['data'][] = (int)$item['count'];
+        }
+
+        // 返回JSON格式数据
+        return json($result);
+    }
+
     //计划/排程/制程工单数量同步Redis
     public function numDbToRedis()
     {
@@ -347,24 +391,25 @@ class Index extends Api
     public function getJtClDbByRedis()
     {
         $req = $this->request->param();
-        if (isset($req['jtbh']) && !empty($req['jtbh'])){
-            $jtbh = $req['jtbh'];
-        }else{
-            $this->error('参数错误');
-        }
-        $row = cache('jtClDbToRedis');
-        $result['categories']=[];
-        $result['series'][0]['name']=$jtbh;
-        $result['series'][0]['data']=[];
-        if($row && array_key_exists($jtbh,$row)){
-            $result['categories'] = array_map('strval', array_keys($row[$jtbh]));
-            $result['series'][0]['data'] = array_values($row[$jtbh]);
-        }
 
-        $res['status']=0;
-        $res['msg']='';
-        $res['data']=$result;
-        return json($res);
+//        if (isset($req['jtbh']) && !empty($req['jtbh'])){
+//            $jtbh = $req['jtbh'];
+//        }else{
+//            $this->error('参数错误');
+//        }
+        $row = cache('jtClDbToRedis');
+//        $result['categories']=[];
+//        $result['series'][0]['name']=$jtbh;
+//        $result['series'][0]['data']=[];
+//        if($row && array_key_exists($jtbh,$row)){
+//            $result['categories'] = array_map('strval', array_keys($row[$jtbh]));
+//            $result['series'][0]['data'] = array_values($row[$jtbh]);
+//        }
+//
+//        $res['status']=0;
+//        $res['msg']='';
+//        $res['data']=$result;
+        return json($row);
     }
 
     /**
@@ -431,47 +476,45 @@ class Index extends Api
         $this->success('同步成功');
     }
 
-    /**
-     * 获取班组工作负荷数据
-     */
+    //获取班组工作负荷数据
     public function getBzByRedis()
     {
         $row = cache('bzDbToRedis');
         $result['columns']=[
             ['name'=>'机台号','id'=>'jtbh','width'=>'14','autoWrap'=>"true",'textAlign'=>'left'],
-            ['name'=>'班组','id'=>'bzdh','width'=>'16','autoWrap'=>"true",'textAlign'=>'left'],
+//            ['name'=>'班组','id'=>'bzdh','width'=>'16','autoWrap'=>"true",'textAlign'=>'left'],
             ['name'=>'在产工单号','id'=>'gdbh','width'=>'16','textAlign'=>'left'],
-            ['name'=>'工单名称','id'=>'gdmc','width'=>'20','autoWrap'=>"true",'textAlign'=>'left'],
-            ['name'=>'印件号','id'=>'yjno','width'=>'16','autoWrap'=>"true",'textAlign'=>'left'],
-            ['name'=>'工序','id'=>'gx','width'=>'16','autoWrap'=>"true",'textAlign'=>'left'],
-            ['name'=>'计划产量','id'=>'jhcl','width'=>'14','autoWrap'=>"true",'textAlign'=>'left'],
-            ['name'=>'已完成产量','id'=>'wccl','width'=>'14','autoWrap'=>"true",'textAlign'=>'center'],
-            ['name'=>'小时产能','id'=>'xscn','width'=>'14','autoWrap'=>"true",'textAlign'=>'center'],
+//            ['name'=>'工单名称','id'=>'gdmc','width'=>'20','autoWrap'=>"true",'textAlign'=>'left'],
+//            ['name'=>'印件号','id'=>'yjno','width'=>'16','autoWrap'=>"true",'textAlign'=>'left'],
+//            ['name'=>'工序','id'=>'gx','width'=>'16','autoWrap'=>"true",'textAlign'=>'left'],
+//            ['name'=>'计划产量','id'=>'jhcl','width'=>'14','autoWrap'=>"true",'textAlign'=>'left'],
+//            ['name'=>'已完成产量','id'=>'wccl','width'=>'14','autoWrap'=>"true",'textAlign'=>'center'],
+//            ['name'=>'小时产能','id'=>'xscn','width'=>'14','autoWrap'=>"true",'textAlign'=>'center'],
             ['name'=>'机台状态','id'=>'status','width'=>'14','autoWrap'=>"true",'textAlign'=>'center'],
         ];
         if($row){
             foreach($row as $k=>$v){
                 $result['rows'][$k]['jtbh']=$v['机台号'];
-                $result['rows'][$k]['bzdh']=$v['班组代号'];
+//                $result['rows'][$k]['bzdh']=$v['班组代号'];
                 $result['rows'][$k]['gdbh']=$v['工单编号'];
-                $result['rows'][$k]['gdmc']=$v['产品名称'];
-                $result['rows'][$k]['yjno']=$v['机台号'];
-                $result['rows'][$k]['gx']=$v['工序名称'];
-                $result['rows'][$k]['jhcl'] = $v['计划产量'];
-                $result['rows'][$k]['wccl'] = $v['已完成产量'];
-                $result['rows'][$k]['xscn'] = $v['小时产能'];
+//                $result['rows'][$k]['gdmc']=$v['产品名称'];
+//                $result['rows'][$k]['yjno']=$v['机台号'];
+//                $result['rows'][$k]['gx']=$v['工序名称'];
+//                $result['rows'][$k]['jhcl'] = $v['计划产量'];
+//                $result['rows'][$k]['wccl'] = $v['已完成产量'];
+//                $result['rows'][$k]['xscn'] = $v['小时产能'];
                 $result['rows'][$k]['status'] = $v['机台状态'];
             }
         }else{
             $result['rows'][0]['jtbh']='';
-            $result['rows'][0]['bzdh']='';
+//            $result['rows'][0]['bzdh']='';
             $result['rows'][0]['gdbh']='';
-            $result['rows'][0]['gdmc']='';
-            $result['rows'][0]['yjno']='';
-            $result['rows'][0]['gx']='';
-            $result['rows'][0]['jhcl'] = '';
-            $result['rows'][0]['wccl'] = '';
-            $result['rows'][0]['xscn'] = '';
+//            $result['rows'][0]['gdmc']='';
+//            $result['rows'][0]['yjno']='';
+//            $result['rows'][0]['gx']='';
+//            $result['rows'][0]['jhcl'] = '';
+//            $result['rows'][0]['wccl'] = '';
+//            $result['rows'][0]['xscn'] = '';
             $result['rows'][0]['status'] = '';
         }
         $res['status']=0;