|
|
@@ -255,6 +255,7 @@ class MachineProductionReport extends Api
|
|
|
|
|
|
$gd = db('工单_基本资料')->cache(true,86400)->column('Gd_gdbh, 成品名称 as Gd_cpmc');
|
|
|
$rs = db('人事_基本资料')->cache(true,86400)->column('员工编号, 员工姓名');
|
|
|
+
|
|
|
foreach ($rows as $key=>$value){
|
|
|
$rows[$key]['mod_rq'] = $value['mod_rq']=='1900-01-01 00:00:00' ? '' :$value['mod_rq'];
|
|
|
$rows[$key]['Gd_cpmc'] = array_key_exists($value['sczl_gdbh'],$gd) ? trim($gd[$value['sczl_gdbh']]) : '';
|
|
|
@@ -264,7 +265,7 @@ class MachineProductionReport extends Api
|
|
|
if ($value['sczl_bh'.$i]==$value['sczl_bh1']){
|
|
|
$rows[$key]['name'.$i] = $rows[$key]['name1'];
|
|
|
}else{
|
|
|
- $rows[$key]['name1'] = array_key_exists($value['sczl_bh1'],$rs) ? trim($rs[$value['sczl_bh1']]) : '';
|
|
|
+ $rows[$key]['name'.$i] = array_key_exists($value['sczl_bh'.$i],$rs) ? trim($rs[$value['sczl_bh'.$i]]) : '';
|
|
|
}
|
|
|
}else{
|
|
|
$rows[$key]['name'.$i] = '';
|
|
|
@@ -478,7 +479,7 @@ class MachineProductionReport extends Api
|
|
|
if ($value['sczl_bh'.$i]==$value['sczl_bh1']){
|
|
|
$rows[$key]['name'.$i] = $rows[$key]['name1'];
|
|
|
}else{
|
|
|
- $rows[$key]['name1'] = array_key_exists($value['sczl_bh1'],$rs) ? trim($rs[$value['sczl_bh1']]) : '';
|
|
|
+ $rows[$key]['name'.$i] = array_key_exists($value['sczl_bh'.$i],$rs) ? trim($rs[$value['sczl_bh'.$i]]) : '';
|
|
|
}
|
|
|
}else{
|
|
|
$rows[$key]['name'.$i] = '';
|