工序大废品

application/api/controller/LargeWasteRewardPunish.php

@@ -133,17 +133,17 @@ class LargeWasteRewardPunish extends Api
            $total = db()->table('db_大废品')->where($where)->count();
         }
         $gd = db()->table('工单_印件资料')->column('Yj_Gdbh, yj_yjmc');
-        $rs = db()->table('人事_基本资料')->column('员工编号, 员工姓名');
+        $rs = db()->table('人事_基本资料')->where('员工姓名','<>','通用编号')->column('员工编号, 员工姓名');
         foreach ($rows as $key=>$value) {
             $rows[$key]['yj_yjmc'] = array_key_exists($value['sczl_gdbh'],$gd) ? sprintf("%02d", $value['sczl_yjno']).'-'.trim($gd[$value['sczl_gdbh']]) : '';
             $rows[$key]['JL_bh1'] = array_key_exists($value['JL_bh1'],$rs) ? trim($rs[$value['JL_bh1']]) : '';
             $rows[$key]['sczl_bh1'] = array_key_exists($value['sczl_bh1'],$rs) ? trim($rs[$value['sczl_bh1']]) : '';
             $rows[$key]['sczl_bh2'] = array_key_exists($value['sczl_bh2'],$rs) ? trim($rs[$value['sczl_bh2']]) : '';
             $rows[$key]['sczl_fplxB'] = $value['sczl_fplxB'] == 1 ? '制程废' : '';
-            if ($rows[$key]['sczl_bh1'] != '通用编号' && $value['sczl_je1'] > 0){
+            if ($rows[$key]['sczl_bh1'] != '' && $value['sczl_je1'] > 0){
                 $rows[$key]['sczl_bh1'] = $rows[$key]['sczl_bh1'].'(-'.$value['sczl_je1'].')';
             }
-            if ($rows[$key]['sczl_bh2'] != '通用编号' && $value['sczl_je2'] > 0){
+            if ($rows[$key]['sczl_bh2'] != '' && $value['sczl_je2'] > 0){
                 $rows[$key]['sczl_bh2'] = $rows[$key]['sczl_bh2'].'(-'.$value['sczl_je2'].')';
             }
             unset($rows[$key]['sczl_yjno']);