|
|
@@ -186,7 +186,7 @@ class WorkOrder extends Api
|
|
|
$data = [];
|
|
|
//印件资料
|
|
|
$printList = \db('工单_印件资料')
|
|
|
- ->where('Yj_Gdbh',$Gd_gdbh)
|
|
|
+ ->where('Yj_Gdbh',$Gd_gdbh)
|
|
|
->select();
|
|
|
if (!empty($printList)){
|
|
|
foreach ($printList as $key=>$value){
|
|
|
@@ -242,7 +242,11 @@ class WorkOrder extends Api
|
|
|
}else{
|
|
|
$scrap = ceil(($value['Gy0_Rate0']+((int)($value['Gy0_计划接货数']/$value['Gy0_ls']))*$value['Gy0_Rate1'])*$value['损耗系数']*$value['Gy0_ms']);
|
|
|
}
|
|
|
- $number = round(($scrap/((int)($value['Gy0_计划接货数']/$value['Gy0_ls'])))*100,2).'%';
|
|
|
+ if (rtrim($value['Gy0_sbbh']) == ''){
|
|
|
+ $number = 0;
|
|
|
+ }else{
|
|
|
+ $number = round(($scrap/((int)($value['Gy0_计划接货数']/$value['Gy0_ls'])))*100,2).'%';
|
|
|
+ }
|
|
|
if ($value['PD_WG'] !== '1900-01-01 00:00:00'){
|
|
|
$status = '已完工';
|
|
|
}else{
|
