机台生产日报表菜单排序

application/api/controller/MachineProductionReport.php

@@ -65,7 +65,8 @@ class MachineProductionReport extends Api
                 SELECT LEFT(sys_rq, 10) as date, rtrim(sys_id) as sys_id 
                 FROM 设备_产量计酬 WHERE sys_rq >= "'.$rows[count($rows)-1]['date'].'"
             ) AS t1
-            GROUP BY date, sys_id';
+            GROUP BY date, sys_id
+            ORDER BY date, sys_id';
         $data = db()->query($sql);
         
         $result = [];
@@ -739,10 +740,19 @@ class MachineProductionReport extends Api
         }
         if(!empty($req['sczl_jtbh'])){
             $row = db('dic_lzde')
-            ->field('sys_bh')
+            ->field('sys_bh,Key_')
             ->where('适用机型',$req['sczl_jtbh'])
             ->find();
-            $this->success('成功',$row);
+            $list = db('dic_lzde')
+                ->field('sys_bh')
+                ->where('Parent',$row['Key_'])
+                ->select();
+            if (empty($list)){
+                $this->success('成功',$row);
+            }else{
+                $this->success('成功',$list);
+            }
+
         }
 
         $row = db('dic_lzde')