工序合格率优化

application/api/controller/Decision.php

@@ -580,12 +580,14 @@ 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')
+                    ->join('成品入仓 d','a.Gy0_gdbh = d.jjcp_gdbh AND a.印件及工序 = d.jjcp_yjno')
                     ->field('a.sys_ny, ((SUM(a.班组制程废品)) + (SUM(a.班组质检废品))) / a.印件工序产量 as 废品率')
                     ->where(function($query) use ($process) {
                         foreach ($process['keys'] as $key) {
                             $query->whereOr('a.工序名称', 'like', "%{$key}%");
                         }
                     })
+                    ->where('d.jjcp_smb','like','末%')
                     ->where('a.sys_ny', $month)
                     ->group('a.Gy0_gdbh, b.Gy0_yjno, a.工序');
 
@@ -729,8 +731,10 @@ class Decision extends Api
                 DATE_FORMAT(a.入仓日期, \'%Y%m\') AS 完工年月
             ')
                 ->join('工单_工艺资料 b', 'a.Gy0_gdbh = b.Gy0_gdbh AND a.印件及工序 = b.Gy0_yjno AND a.工序 = b.Gy0_gxh')
+                ->join('成品入仓 c','a.Gy0_gdbh = c.jjcp_gdbh AND a.印件及工序 = c.jjcp_yjno')
                 ->where('a.sys_ny', 'like', $param['year'] . '%')
                 ->where('a.工序名称','not like','%机检%')
+                ->where('c.jjcp_smb','like','末%')
                 ->where('a.工序名称','not like','%拆片%');
         // 获取总数
         $total = clone $query;