|
|
@@ -112,7 +112,7 @@ class LargeWasteRewardPunish extends Api
|
|
|
->field('sczl_gdbh, LEFT(sczl_rq, 10) as sczl_rq, rtrim(sczl_numDesc) as sczl_numDesc, sczl_ls, sczl_yjno,
|
|
|
rtrim(责任部门) as 责任部门,sczl_cl,
|
|
|
rtrim(sczl_fplxA) as sczl_fplxA, sczl_fplxB, jl_jtbh as Jl_bzdh, JL_bh1,
|
|
|
- sczl_jtbh as sczl_bzdh, sczl_bh1, sczl_je1, sczl_bh2, sczl_je2, rtrim(sys_id) as sys_id, sys_rq, UniqId')
|
|
|
+ sczl_jtbh as sczl_bzdh, sczl_bh1, sczl_je1, sczl_bh2, sczl_je2, sczl_bh3,sczl_bh4, sczl_je3,sczl_je4,rtrim(sys_id) as sys_id, sys_rq, UniqId')
|
|
|
->where('sczl_gdbh',$req['date'])
|
|
|
->order('UniqId desc')
|
|
|
->page($page,$limit)
|
|
|
@@ -125,7 +125,7 @@ class LargeWasteRewardPunish extends Api
|
|
|
->field('sczl_gdbh, LEFT(sczl_rq, 10) as sczl_rq, rtrim(sczl_numDesc) as sczl_numDesc, sczl_ls, sczl_yjno,
|
|
|
rtrim(责任部门) as 责任部门, sczl_cl,
|
|
|
rtrim(sczl_fplxA) as sczl_fplxA, sczl_fplxB, jl_jtbh as Jl_bzdh, JL_bh1,
|
|
|
- sczl_jtbh as sczl_bzdh, sczl_bh1, sczl_je1, sczl_bh2, sczl_je2, rtrim(sys_id) as sys_id, sys_rq, UniqId')
|
|
|
+ sczl_jtbh as sczl_bzdh, sczl_bh1, sczl_je1, sczl_bh2, sczl_je2, sczl_bh3,sczl_bh4, sczl_je3,sczl_je4, rtrim(sys_id) as sys_id, sys_rq, UniqId')
|
|
|
->where($where)
|
|
|
->order('UniqId desc')
|
|
|
->page($page,$limit)
|
|
|
@@ -139,12 +139,36 @@ class LargeWasteRewardPunish extends Api
|
|
|
$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_bh3'] = array_key_exists($value['sczl_bh3'],$rs) ? trim($rs[$value['sczl_bh3']]) : '';
|
|
|
+ $rows[$key]['sczl_bh4'] = array_key_exists($value['sczl_bh4'],$rs) ? trim($rs[$value['sczl_bh4']]) : '';
|
|
|
$rows[$key]['sczl_fplxB'] = $value['sczl_fplxB'] == 1 ? '制程废' : '';
|
|
|
if ($rows[$key]['sczl_bh1'] != '' && $value['sczl_je1'] > 0){
|
|
|
- $rows[$key]['sczl_bh1'] = $rows[$key]['sczl_bh1'].'(-'.$value['sczl_je1'].')';
|
|
|
+ $number = $value['sczl_je1']*$value['sczl_cl'];
|
|
|
+ if ($number > 200){
|
|
|
+ $number = 200;
|
|
|
+ }
|
|
|
+ $rows[$key]['sczl_bh1'] = $rows[$key]['sczl_bh1'].'(-'.$number.')';
|
|
|
}
|
|
|
if ($rows[$key]['sczl_bh2'] != '' && $value['sczl_je2'] > 0){
|
|
|
- $rows[$key]['sczl_bh2'] = $rows[$key]['sczl_bh2'].'(-'.$value['sczl_je2'].')';
|
|
|
+ $number = $value['sczl_je1']*$value['sczl_cl'];
|
|
|
+ if ($number > 200){
|
|
|
+ $number = 200;
|
|
|
+ }
|
|
|
+ $rows[$key]['sczl_bh2'] = $rows[$key]['sczl_bh2'].'(-'.$number.')';
|
|
|
+ }
|
|
|
+ if ($rows[$key]['sczl_bh3'] != '' && $value['sczl_je3'] > 0){
|
|
|
+ $number = $value['sczl_je1']*$value['sczl_cl'];
|
|
|
+ if ($number > 200){
|
|
|
+ $number = 200;
|
|
|
+ }
|
|
|
+ $rows[$key]['sczl_bh3'] = $rows[$key]['sczl_bh3'].'(-'.$number.')';
|
|
|
+ }
|
|
|
+ if ($rows[$key]['sczl_bh4'] != '' && $value['sczl_je4'] > 0){
|
|
|
+ $number = $value['sczl_je1']*$value['sczl_cl'];
|
|
|
+ if ($number > 200){
|
|
|
+ $number = 200;
|
|
|
+ }
|
|
|
+ $rows[$key]['sczl_bh4'] = $rows[$key]['sczl_bh4'].'(-'.$number.')';
|
|
|
}
|
|
|
unset($rows[$key]['sczl_yjno']);
|
|
|
}
|