|
|
@@ -140,7 +140,8 @@ class WorkOrderVerification extends Api
|
|
|
$rows = db()->table('db_qczl')
|
|
|
->field('qczl_gdbh, qczl_yjno, LEFT(qczl_rq, 10) as qczl_rq, qczl_num, rtrim(qczl_NumDesc) as qczl_NumDesc, qczl_fp,
|
|
|
fp_lb1, fp_lb2, fp_lb3, fp_lb4, fp_lb5, fp_lb6, fp_lb7, fp_lb8, fp_lb9, fp_lb10, fp_lb11, fp_lb12, fp_lb13, fp_lb14, fp_lb15, fp_lb16, fp_lb17,
|
|
|
- fp_sl1, fp_sl2, fp_sl3, fp_sl4, fp_sl5, fp_sl6, fp_sl7, fp_sl8, fp_sl9, fp_sl10, fp_sl11, fp_sl12, fp_sl13, fp_sl14, fp_sl15, fp_sl16, fp_sl17,
|
|
|
+ fp_sl1, fp_sl2, fp_sl3, fp_sl4, fp_sl5, fp_sl6, fp_sl7, fp_sl8, fp_sl9, fp_sl10, fp_sl11, fp_sl12, fp_sl13, fp_sl14, fp_sl15, fp_sl16, fp_sl17,
|
|
|
+ fp_bh1, fp_bh2, fp_bh3, fp_bh4, fp_bh5, fp_bh6, fp_bh7, fp_bh8, fp_bh9, fp_bh10, fp_bh11, fp_bh12, fp_bh13,
|
|
|
rtrim(sys_id) as sys_id,UniqId')
|
|
|
->where($where)
|
|
|
->order('qczl_gdbh,qczl_yjno,qczl_num')
|
|
|
@@ -157,7 +158,7 @@ class WorkOrderVerification extends Api
|
|
|
if ($value['fp_sl'.$i]==0){
|
|
|
$rows[$key]['sl_lb'.$i] = '';
|
|
|
}else{
|
|
|
- $rows[$key]['sl_lb'.$i] = trim($value['fp_sl'.$i].'-->'.$value['fp_lb'.$i]);
|
|
|
+ $rows[$key]['sl_lb'.$i] = trim($value['fp_sl'.$i].'-->'.$value['fp_lb'.$i].'('.$value['fp_bh'.$i].')');
|
|
|
}
|
|
|
unset($rows[$key]['fp_sl'.$i]);
|
|
|
unset($rows[$key]['fp_lb'.$i]);
|
