糊盒机台菜单显示

application/api/controller/GluingReport.php

@@ -22,16 +22,25 @@ class GluingReport extends Api
         if ($this->request->isGet() === false){
             $this->error('请求错误');
         }
+        $data = [];
         $sist = ['印后糊盒车间','精品自动化车间','数字化车间'];
-        $list = db('设备_基本资料')
+        $department = \db('设备_基本资料')
+            ->distinct(true)
             ->where('使用部门','in',$sist)
-            ->whereNotNull('sys_sbID')
-            ->column('CONCAT(设备编号,"->",设备名称)');
-        if (empty($list)){
-            $this->error('未找到设备数据');
-        }else{
-            $this->success('成功',$list);
+            ->where('设备编组','<>','')
+            ->where('sys_sbID','<>','')
+            ->order('设备编组')
+            ->column('rtrim(使用部门) as 使用部门');
+        if (empty($department)){
+            $this->success('为获取到机台数据');
         }
+        foreach ($department as $value){
+            $machine = \db('设备_基本资料')->where('使用部门',$value)->where('sys_sbID','<>','')->where('使用部门',$value)->field('rtrim(设备编号) as 设备编号,rtrim(设备名称) as 设备名称')->order('设备编号')->select();
+            foreach ($machine as $k=>$v){
+                $data[rtrim($value)][] = $v['设备编号'].'-->'.$v['设备名称'];
+            }
+        }
+        $this->success('成功',$data);
     }
 
 
@@ -555,7 +564,7 @@ class GluingReport extends Api
             }
             unset($list[$key]['role']);
         }
-        
+
         $this->success('成功',$list);
     }