|
|
@@ -1077,10 +1077,11 @@ class OrderSuperLoss extends Api
|
|
|
}
|
|
|
$date = $params['date'];
|
|
|
$workOrderData = \db('成品入仓')
|
|
|
- ->alias('a')
|
|
|
- ->where('a.jjcp_sj','like',$date.'%')
|
|
|
- ->group('a.jjcp_gdbh,a.jjcp_yjno')
|
|
|
- ->order('a.UniqId desc')
|
|
|
+// ->where('jjcp_gdbh','Y2406020')
|
|
|
+// ->where('jjcp_yjno','4')
|
|
|
+ ->where('jjcp_sj','like',$date.'%')
|
|
|
+ ->group('jjcp_gdbh,jjcp_yjno')
|
|
|
+ ->order('UniqId desc')
|
|
|
->select();
|
|
|
$datanumber = [
|
|
|
'印刷车间' => [
|
|
|
@@ -1379,19 +1380,17 @@ class OrderSuperLoss extends Api
|
|
|
$res[$key][$n][$name_key] = 0;
|
|
|
|
|
|
}
|
|
|
- $res[$key][$n][$name_key] = $res[$key][$n][$name_key] + floatval($v['节损奖'])*floatval($rate);
|
|
|
+ $res[$key][$n][$name_key] = floatval($res[$key][$n][$name_key]) + floatval($v['节损奖'])*floatval($rate);
|
|
|
$res[$key][$n][$name_key] = number_format($res[$key][$n][$name_key],2);
|
|
|
}
|
|
|
}
|
|
|
}else{
|
|
|
- if ($bh !== ''){
|
|
|
- $name_key = $v['sczl_bh1'].'('.$v['member'].')';
|
|
|
- if (!array_key_exists($name_key,$res[$key][$n]) && $bh !== ''){
|
|
|
- $res[$key][$n][$name_key] = 0;
|
|
|
- }
|
|
|
- $res[$key][$n][$name_key] = $res[$key][$n][$name_key] + $v['节损奖'];
|
|
|
- $res[$key][$n][$name_key] = number_format($res[$key][$n][$name_key],2);
|
|
|
+ $name_key = $v['sczl_bh1'].'('.$v['member'].')';
|
|
|
+ if (!array_key_exists($name_key,$res[$key][$n])){
|
|
|
+ $res[$key][$n][$name_key] = 0;
|
|
|
}
|
|
|
+ $res[$key][$n][$name_key] = $res[$key][$n][$name_key] + $v['节损奖'];
|
|
|
+ $res[$key][$n][$name_key] = number_format($res[$key][$n][$name_key],2);
|
|
|
}
|
|
|
}
|
|
|
}
|