Эх сурвалжийг харах

当班产量明细数据修改

qiuenguang 1 жил өмнө
parent
commit
fde1361e10

+ 4 - 1
application/api/controller/Facility.php

@@ -524,7 +524,7 @@ class Facility extends Api
             $this->success('');
         }
         foreach ($list as $k=>$v){
-            $name = \db('工单_基本资料')->where('Gd_gdbh',$v['工单编号'])->where('行号',$v['yjno'])->field('rtrim(Gd_cpmc) as productName')->find();
+            $name = \db('工单_基本资料')->where('Gd_gdbh',$v['工单编号'])->where('行号',$v['yjno'])->field('rtrim(Gd_cpmc) as productName,rtrim(成品名称) as 成品名称')->find();
             if ($v['yjno']<10){
                 $list[$k]['yjno'] = '0'.$v['yjno'];
             }
@@ -537,6 +537,9 @@ class Facility extends Api
             $list[$k]['印件及工序'] = $list[$k]['yjno'].'-'.$v['gxmc'];
             $list[$k]['生产时间段'] = substr($v['sj1'],5,5).' '.substr($v['sj1'],11,5).'<-->'.substr($v['sj2'],5,5).' '.substr($v['sj2'],11,5);
             $list[$k]['产品名称'] = $name['productName'];
+            if (empty($name['productName'])){
+                $list[$k]['产品名称'] = $name['成品名称'];
+            }
         }
         $field1 = 'SUM(sczl_cl) as 产量,SUM(sczl_zcfp) as 制程废品,SUM(sczl_zccp) as 制程次品,SUM(sczl_前工序废) as 前工序废,
         SUM(sczl_来料少数) as 来料异常,SUM(sczl_装版工时) as 装版工时,SUM(sczl_保养工时) as 保养工时,SUM(sczl_打样工时) as 打样工时,