|
|
@@ -229,6 +229,9 @@ class ReportingWork extends Api
|
|
|
// if (!isset($item['money']) || $item['money'] === '') {
|
|
|
// $this->error('第' . $rowNo . '条金额不能为空');
|
|
|
// }
|
|
|
+ // if (empty($item['standard_minutes'])) {
|
|
|
+ // $this->error('第' . $rowNo . '条标准分钟不能为空');
|
|
|
+ // }
|
|
|
if (!isset($item['standard_score']) || $item['standard_score'] === '') {
|
|
|
$this->error('第' . $rowNo . '条标准工分不能为空');
|
|
|
}
|
|
|
@@ -241,7 +244,7 @@ class ReportingWork extends Api
|
|
|
$money = floatval($item['money']);
|
|
|
$coefficient = isset($item['coefficient']) && $item['coefficient'] !== '' ? floatval($item['coefficient']) : 'C';
|
|
|
$number = floatval($item['number']);
|
|
|
-
|
|
|
+ $standardMinutes = floatval($item['standard_minutes']);
|
|
|
$productionHour = $standardHour * $number;
|
|
|
$productionScore = $standardScore * $number;
|
|
|
$productionMoney = $money * $number;
|
|
|
@@ -261,6 +264,7 @@ class ReportingWork extends Api
|
|
|
'process_name' => $item['process_name'],
|
|
|
'standard_hour' => $standardHour,
|
|
|
'standard_score' => $standardScore,
|
|
|
+ 'standard_minutes' => $standardMinutes,
|
|
|
'money' => $money,
|
|
|
'coefficient' => $coefficient,
|
|
|
'number' => $number,
|
