优化报工单其他信息接口

application/api/controller/ReportingWork.php

@@ -311,12 +311,14 @@ class ReportingWork extends Api
         }elseif ($machine == 'JP'){
             $where['st_dpt'] = '检验车间';
         }
-        $sql = "SELECT RTRIM(a.供方批次) as batch, rtrim(采购单号) as 采购单号,st_wlbh, MIN(a.Uniqid) AS Uniqid,rtrim(b.`BOM_物料名称`) as `BOM_物料名称`
-                FROM `物料_收发记录` a
-                LEFT JOIN `工单_bom资料` b ON a.st_gdbh = b.`BOM_工单编号` AND a.st_wlbh = b.`BOM_物料编码`
-                WHERE a.st_gdbh = '{$where['st_gdbh']}' AND a.st_dpt = '{$where['st_dpt']}'
-                GROUP BY batch ORDER BY a.st_wlbh";
-        $material = Db::query($sql);
+        $material = \db('物料_收发记录')
+            ->alias('a')
+            ->join('工单_bom资料 b', 'a.st_gdbh = b.BOM_工单编号 AND a.st_wlbh = b.BOM_物料编码','left')
+            ->where($where)
+            ->field('RTRIM(a.供方批次) as batch, rtrim(采购单号) as 采购单号, st_wlbh, MIN(a.Uniqid) AS Uniqid, rtrim(b.BOM_物料名称) as BOM_物料名称')
+            ->group('batch')
+            ->order('a.st_wlbh')
+            ->select();
         $data['bom'] = $material;
         $this->success('请求成功',$data);
     }