日产量上报数据显示

application/api/controller/Facility.php

@@ -108,31 +108,47 @@ class Facility extends Api
         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['成品名称'];
+            if (!empty($productName)){
+                if (!empty($productName['成品名称'])){
+                    $list[$key]['产品名称'] = $value['工单编号'].'---'.$productName['成品名称'];
+                    $list[$key]['cpmc'] = $productName['成品名称'];
+                }else{
+                    $list[$key]['产品名称'] = $value['工单编号'];
+                    $list[$key]['cpmc'] = '';
+                }
             }else{
-                $list[$key]['产品名称'] = $value['工单编号'];
+                $list[$key]['产品名称'] = '';
                 $list[$key]['cpmc'] = '';
             }
+
             $process = \db('工单_工艺资料')
                 ->where('Gy0_gdbh',$value['工单编号'])
                 ->where('Gy0_gxh',$value['gxh'])
                 ->field('rtrim(工价系数) as 工价系数,rtrim(印刷方式) as 印刷方式,rtrim(版距) as 版距')
                 ->find();
-            if ($value['难度系数'] == 0){
-                $list[$key]['难度系数'] = $process['工价系数'];
+            if (!empty($process)){
+                if ($value['难度系数'] == 0){
+                    $list[$key]['难度系数'] = $process['工价系数'];
+                }else{
+                    $list[$key]['难度系数'] = $process['工价系数'].'x'.$value['难度系数'];
+                }
+                $list[$key]['印刷方式'] = $process['印刷方式'].' '.$process['版距'];
             }else{
-                $list[$key]['难度系数'] = $process['工价系数'].'x'.$value['难度系数'];
+                $list[$key]['难度系数'] = '';
+                $list[$key]['印刷方式'] = '';
             }
-            $list[$key]['印刷方式'] = $process['印刷方式'].' '.$process['版距'];
             if ($value['yjno']<10){
                 $list[$key]['yjno'] = '0'.$value['yjno'];
             }
+            if (!empty($machineDetail)){
+                $list[$key]['千件工价'] = $machineDetail['千件工价'];
+                $list[$key]['日定额'] = $machineDetail['日定额'];
+            }else{
+                $list[$key]['千件工价'] = '';
+                $list[$key]['日定额'] = '';
+            }
             $list[$key]['工序'] = $list[$key]['yjno'].'-'.$list[$key]['gxmc'];
             $list[$key]['备注'] = $value['bzdh'].'('.$value['num'].')'.date('H:i',strtotime($value['sj1'])).'<-->'.date('H:i',strtotime($value['sj2']));
-            $list[$key]['千件工价'] = $machineDetail['千件工价'];
-            $list[$key]['日定额'] = $machineDetail['日定额'];
             for ($i=1;$i<11;$i++){
                 if (isset($value['sczl_bh'.$i])){
                     $name = \db('人事_基本资料')->where('员工编号',$value['sczl_bh'.$i])->field('rtrim(员工姓名) as name')->find();