unknown 6 месяцев назад
Родитель
Сommit
80c6888827
1 измененных файлов с 6 добавлено и 3 удалено
  1. 6 3
      application/api/controller/Achievementatestatistics.php

+ 6 - 3
application/api/controller/Achievementatestatistics.php

@@ -471,7 +471,7 @@ class  Achievementatestatistics extends Api
                 'a.sczl_gxh as 工序号',
                 'a.sczl_gxmc as 工序名称',
                 'a.sczl_ls',
-                'SUM(a.sczl_cl * a.sczl_ls ) as 实际产量',
+                'SUM(a.sczl_cl) as 实际产量',
                 'SUM(a.sczl_装版总工时) as 装版实际工时',
                 'SUM(a.sczl_装版工时) as 装版补产工时',
                 'SUM(a.sczl_保养工时) as 保养工时',
@@ -537,14 +537,17 @@ class  Achievementatestatistics extends Api
             // 计算目标产量
             foreach ($Operating_hours as $k => $v) {
                 if ($v['日期'] === $row['日期'] && $v['班组'] === $row['班组']) {
+                    //重新赋值运行工时
+                    $records[$key]['运行工时'] = $v['设备运行工时'];
+                    //计算目标产量
                     $records[$key]['目标产量'] = round(
-                        max(0, $row['运行工时'] - $row['保养工时'] - $row['装版补产工时'] - $row['异常补时'] - $row['打样补产工时']) * $row['小时产能'],
+                        max(0, $v['设备运行工时'] - $row['保养工时'] - $row['装版补产工时'] - $row['异常补时'] - $row['打样补产工时']) * $row['小时产能'],
                         2
                     );
 
                     // 计算负荷产量
                     $records[$key]['负荷产量'] = round(
-                        max(0, $row['运行工时'] - $row['保养工时'] - $row['异常补时'] - $row['打样补产工时'] ) * $row['平均车速'],
+                        max(0, $v['设备运行工时'] - $row['保养工时'] - $row['异常补时'] - $row['打样补产工时'] ) * $row['平均车速'],
                         2
                     );