设备工作清单优化

application/api/controller/Facility.php

@@ -98,10 +98,6 @@ class Facility extends Api
         sczl_rate8,sczl_rate9,sczl_rate10,sczl_bh98,rtrim(UniqId) as UniqId,rtrim(sczl_工价系数) as 难度系数';
         //机台信息
         $machineDetail = \db('设备_基本资料')->where('设备编号',$machine)->field('rtrim(千件工价) as 千件工价,rtrim(日定额) as 日定额')->find();
-        //工单编号
-        $Gd_gdbh = \db('设备_产量计酬')->where($where)->distinct(true)->column('sczl_gdbh');
-        //产品名称
-        $productName = \db('工单_基本资料')->whereIn('Gd_gdbh',$Gd_gdbh)->field('rtrim(成品名称) as 成品名称,rtrim(Gd_cpmc) as cpmc')->find();
         //组员信息
         $list = \db('设备_产量计酬')->where($where)->field($field)->select();
         $totalA = \db('设备_产量计酬')->where($where)->where('sczl_bzdh','A班')->field('SUM(sczl_cl) as 产量')->select();
@@ -110,12 +106,11 @@ class Facility extends Api
             $this->success('',[]);
         }
         foreach ($list as $key=>$value){
+            //产品名称
+            $productName = \db('工单_基本资料')->whereIn('Gd_gdbh',$value['工单编号'])->field('rtrim(成品名称) as 成品名称,rtrim(Gd_cpmc) as cpmc')->find();
             if (!empty($productName['成品名称'])){
                 $list[$key]['产品名称'] = $value['工单编号'].'---'.$productName['成品名称'];
                 $list[$key]['cpmc'] = $productName['成品名称'];
-            }elseif (empty($productName['成品名称']) && !empty($productName['cpmc'])){
-                $list[$key]['产品名称'] = $value['工单编号'].'---'.$productName['cpmc'];
-                $list[$key]['cpmc'] = $productName['cpmc'];
             }else{
                 $list[$key]['产品名称'] = $value['工单编号'];
                 $list[$key]['cpmc'] = '';