工序合格率优化

application/api/controller/Decision.php

@@ -580,10 +580,10 @@ class Decision extends Api
                     ->alias('a')
                     ->join('工单_工艺资料 b', 'a.Gy0_gdbh = b.Gy0_gdbh AND a.印件及工序 = b.Gy0_yjno AND a.工序 = b.Gy0_gxh')
                     ->join('工单_印件资料 c', 'a.Gy0_gdbh = c.Yj_Gdbh AND a.印件及工序 = c.yj_Yjno')
-                    ->field('a.sys_ny, ((SUM(a.班组制程废品)/a.联数) + (SUM(a.班组质检废品)/a.联数)) / a.印件工序产量 as 废品率')
+                    ->field('a.sys_ny, ((SUM(a.班组制程废品/a.联数)) + (SUM(a.班组质检废品/a.联数))) / (a.印件工序产量/a.联数) as 废品率')
                     ->where(function($query) use ($process) {
                         foreach ($process['keys'] as $key) {
-                            $query->whereOr('b.Gy0_gxmc', 'like', "%{$key}%");
+                            $query->whereOr('a.工序名称', 'like', "%{$key}%");
                         }
                     })
                     ->where('a.sys_ny', $month)
@@ -592,7 +592,6 @@ class Decision extends Api
                 $data[$month][$processId] = $query->select();
             }
         }
-
         // 构建月份模板
         $months = [
             $param['year'].'01' => '01月',
@@ -721,9 +720,9 @@ class Decision extends Api
                 a.工序 AS 工序,
                 a.工序名称,
                 a.联数,
-                a.班组产量,
-                a.班组制程废品,
-                a.班组质检废品,
+                (a.班组产量/a.联数) as 班组产量,
+                (a.班组制程废品/a.联数) as 班组制程废品,
+                (a.班组质检废品/a.联数) as 班组质检废品,
                 a.sczl_bzdh AS 班组编号,
                 b.印刷方式,
                 b.版距,
@@ -741,7 +740,6 @@ class Decision extends Api
         $rawList = isset($param['page'], $param['limit'])
             ? $query->page($param['page'])->limit($param['limit'])->select()
             : $query->select();
-
         // 处理分类标记
         $processedList = [];
         foreach ($rawList as $item) {