优化设备产量显示

application/api/controller/Facility.php

@@ -188,6 +188,18 @@ class Facility extends Api
                 }
                 unset($list[$key]['sczl_bh'.$i],$list[$key]['sczl_rate'.$i]);
             }
+            $list[$key]['换版类型'] = $list[$key]['换版联拼数'] = '';
+            if (!empty($value['装版总工时']) && $value['装版总工时'] !== 0){
+                $pridata = \db('设备_装版工时')
+                    ->field('换版联拼数,换版类型')
+                    ->where('yieldUid',$value['UniqId'])
+                    ->order('Uniqid desc')
+                    ->find();
+                if (!empty($pridata)){
+                    $list[$key]['换版类型'] = $pridata['换版类型'];
+                    $list[$key]['换版联拼数'] = $pridata['换版联拼数'];
+                }
+            }
         }
         $list['totalA'] = $totalA[0]['产量'];
         $list['totalB'] = $totalB[0]['产量'];
@@ -2213,6 +2225,13 @@ class Facility extends Api
         sczl_rate2,sczl_rate3,sczl_rate4,sczl_rate5,sczl_rate6,sczl_rate7,
         sczl_rate8,sczl_rate9,sczl_rate10,sczl_bh98,rtrim(UniqId) as UniqId';
         $list = \db('设备_产量计酬')->where('UniqId',$param['UniqId'])->field($field)->find();
+        $pridata = \db('设备_装版工时')
+            ->field('换版联拼数,换版类型')
+            ->where('yieldUid',$param['UniqId'])
+            ->order('Uniqid desc')
+            ->find();
+        $list['换版联拼数'] = $pridata['换版联拼数'];
+        $list['换版类型'] = $pridata['换版类型'];
         if (empty($list)){
             $this->success('未找到产量详情信息');
         }