列表成品名称优化

application/api/controller/MachineProductionReport.php

@@ -243,7 +243,7 @@ class MachineProductionReport extends Api
             $rows = cache('ReportGetList-'.$req['date'].'-'.$req['sys_id'].'-'.$req['page'].'-'.$req['limit']);
         }
 
-        $gd = db('工单_基本资料')->column('Gd_gdbh, Gd_cpmc');
+        $gd = db('工单_基本资料')->column('Gd_gdbh, 成品名称 as Gd_cpmc');
         $rs = db('人事_基本资料')->column('员工编号, 员工姓名');
         foreach ($rows as $key=>$value){
             $rows[$key]['mod_rq'] = $value['mod_rq']=='1900-01-01 00:00:00' ? '' :$value['mod_rq'];
@@ -388,7 +388,7 @@ class MachineProductionReport extends Api
             }
         }
 
-        $gd = db('工单_基本资料')->column('Gd_gdbh, Gd_cpmc');
+        $gd = db('工单_基本资料')->column('Gd_gdbh, 成品名称 as Gd_cpmc');
         $rs = db('人事_基本资料')->column('员工编号, 员工姓名');
         foreach ($rows as $key=>$value){
             $rows[$key]['mod_rq'] = $value['mod_rq']=='1900-01-01 00:00:00' ? '' :$value['mod_rq'];
@@ -453,7 +453,7 @@ class MachineProductionReport extends Api
         }
 
         $rows = db('db_sczl')->alias('a')
-            ->field('a.sczl_gdbh, rtrim(j.Gd_cpmc) as Gd_cpmc, 
+            ->field('a.sczl_gdbh, rtrim(j.成品名称) as Gd_cpmc, 
             a.sczl_yjno, rtrim(y.yj_yjmc) as yj_yjmc, 
             rtrim(a.sczl_gxmc) as sczl_gxmc, a.sczl_gxh, rtrim(a.sczl_type) as sczl_type, 
             LEFT(a.sczl_rq, 10) as sczl_rq, a.sczl_jtbh, a.sczl_bzdh, 
@@ -878,7 +878,7 @@ class MachineProductionReport extends Api
             ->order('a.sys_id asc, a.sczl_num asc')
             ->select();
 
-        $gd = db('工单_基本资料')->column('Gd_gdbh, Gd_cpmc');
+        $gd = db('工单_基本资料')->column('Gd_gdbh, 成品名称 as Gd_cpmc');
         $rs = db('人事_基本资料')->column('员工编号, 员工姓名');
         foreach ($rows2 as $key=>$value){
             $subArray = [];