工序查询优化

application/api/controller/Inspect.php

@@ -560,12 +560,11 @@ class Inspect extends Api
         }
         array_push($gxmcs,'OR');
 
-        $rows = db('工单_基本资料')->alias('g')
-            ->field('rtrim(g.Gd_cpmc) as Gd_cpmc, c.Gy0_yjno, c.Gy0_gxh, rtrim(c.Gy0_gxmc) as Gy0_gxmc')
-            ->where(['g.Gd_gdbh'=>$gdbh])
+        $rows = db()->table('工单_印件资料')->alias('g')
+            ->field('rtrim(g.yj_yjmc) as Gd_cpmc, g.yj_Yjno as Gy0_yjno, c.Gy0_gxh, rtrim(c.Gy0_gxmc) as Gy0_gxmc')
+            ->where(['g.Yj_Gdbh'=>$gdbh])
             ->where(['c.Gy0_gxmc'=>$gxmcs])
-            ->join(['产品_印件资料'=>'j'],'g.Gd_cpdh=j.yj_yjdh and g.成品代号=j.yj_cpdh')
-            ->join(['工单_工艺资料'=>'c'],'c.Gy0_gdbh=g.Gd_gdbh and c.Gy0_yjno=j.yj_Yjno')
+            ->join(['工单_工艺资料'=>'c'],'c.Gy0_gdbh=g.Yj_Gdbh and g.yj_Yjno=c.Gy0_yjno')
             ->select();
 
         foreach ($rows as $key=>$value){
@@ -601,12 +600,11 @@ class Inspect extends Api
         }
         array_push($gxmcs,'OR');
 
-        $rows = db('工单_基本资料')->alias('g')
-            ->field('rtrim(g.Gd_cpmc) as Gd_cpmc, c.Gy0_yjno, c.Gy0_gxh, rtrim(c.Gy0_gxmc) as Gy0_gxmc')
-            ->where(['g.Gd_gdbh'=>$gdbh])
+        $rows = db()->table('工单_印件资料')->alias('g')
+            ->field('rtrim(g.yj_yjmc) as Gd_cpmc, g.yj_Yjno as Gy0_yjno, c.Gy0_gxh, rtrim(c.Gy0_gxmc) as Gy0_gxmc')
+            ->where(['g.Yj_Gdbh'=>$gdbh])
             ->where(['c.Gy0_gxmc'=>$gxmcs])
-            ->join(['产品_印件资料'=>'j'],'g.Gd_cpdh=j.yj_yjdh and g.成品代号=j.yj_cpdh')
-            ->join(['工单_工艺资料'=>'c'],'c.Gy0_gdbh=g.Gd_gdbh and c.Gy0_yjno=j.yj_Yjno')
+            ->join(['工单_工艺资料'=>'c'],'c.Gy0_gdbh=g.Yj_Gdbh and g.yj_Yjno=c.Gy0_yjno')
             ->select();
 
         foreach ($rows as $key=>$value){

application/api/controller/OtherCountDocument.php

@@ -184,10 +184,9 @@ class OtherCountDocument extends Api
         }else{
             $keyword = '';
         }
-
-        $rows = db()->table('工单_基本资料')->alias('g')
-            ->field('rtrim(g.Gd_cpmc) as Gd_cpmc, c.Gy0_yjno, c.Gy0_gxh, rtrim(c.Gy0_gxmc) as Gy0_gxmc, rtrim(c.Add_gxmc) as Add_gxmc')
-            ->where(['g.Gd_gdbh' => $gdbh])
+        $rows = db()->table('工单_印件资料')->alias('g')
+            ->field('rtrim(g.yj_yjmc) as Gd_cpmc, g.yj_Yjno as Gy0_yjno, c.Gy0_gxh, rtrim(c.Gy0_gxmc) as Gy0_gxmc, rtrim(c.Add_gxmc) as Add_gxmc')
+            ->where(['g.Yj_Gdbh' => $gdbh])
             ->where(function ($query) use ($keyword) {
                 $query->where(function ($query) use ($keyword) {
                     $query->where('c.Gy0_yjno', 'like', '%' . $keyword . '%')
@@ -203,8 +202,7 @@ class OtherCountDocument extends Api
                         });
                 });
             })
-            ->join(['产品_印件资料' => 'j'], 'g.Gd_cpdh=j.yj_yjdh and g.成品代号=j.yj_cpdh')
-            ->join(['工单_工艺资料' => 'c'], 'c.Gy0_gdbh=g.Gd_gdbh and c.Gy0_yjno=j.yj_yjno')
+            ->join(['工单_工艺资料'=>'c'],'c.Gy0_gdbh=g.Yj_Gdbh and g.yj_Yjno=c.Gy0_yjno')
             ->select();
 
 

application/api/controller/PackagingCountDocument.php

@@ -261,12 +261,11 @@ class PackagingCountDocument extends Api
         }
         array_push($gxmcs,'OR');
 
-        $rows = db()->table('工单_基本资料')->alias('g')
-            ->field('rtrim(g.Gd_cpmc) as Gd_cpmc, c.Gy0_yjno, c.Gy0_gxh, rtrim(c.Gy0_gxmc) as Gy0_gxmc')
-            ->where(['g.Gd_gdbh'=>$gdbh])
+        $rows = db()->table('工单_印件资料')->alias('g')
+            ->field('rtrim(g.yj_yjmc) as Gd_cpmc, g.yj_Yjno as Gy0_yjno, c.Gy0_gxh, rtrim(c.Gy0_gxmc) as Gy0_gxmc')
+            ->where(['g.Yj_Gdbh'=>$gdbh])
             ->where(['c.Gy0_gxmc'=>$gxmcs])
-            ->join(['产品_印件资料'=>'j'],'g.Gd_cpdh=j.yj_yjdh and g.成品代号=j.yj_cpdh')
-            ->join(['工单_工艺资料'=>'c'],'c.Gy0_gdbh=g.Gd_gdbh and c.Gy0_yjno=j.yj_yjno')
+            ->join(['工单_工艺资料'=>'c'],'c.Gy0_gdbh=g.Yj_Gdbh and g.yj_Yjno=c.Gy0_yjno')
             ->select();
 
         foreach ($rows as $key=>$value){

application/api/controller/PackagingProcessOutput.php

@@ -245,12 +245,11 @@ class PackagingProcessOutput extends Api
         }
         array_push($gxmcs,'OR');
 
-        $rows = db()->table('工单_基本资料')->alias('g')
-            ->field('rtrim(g.Gd_cpmc) as Gd_cpmc, c.Gy0_yjno, c.Gy0_gxh, rtrim(c.Gy0_gxmc) as Gy0_gxmc')
-            ->where(['g.Gd_gdbh'=>$gdbh])
+        $rows = db()->table('工单_印件资料')->alias('g')
+            ->field('rtrim(g.yj_yjmc) as Gd_cpmc, g.yj_Yjno as Gy0_yjno, c.Gy0_gxh, rtrim(c.Gy0_gxmc) as Gy0_gxmc')
+            ->where(['g.Yj_Gdbh'=>$gdbh])
             ->where(['c.Gy0_gxmc'=>$gxmcs])
-            ->join(['产品_印件资料'=>'j'],'g.Gd_cpdh=j.yj_yjdh and g.成品代号=j.yj_cpdh')
-            ->join(['工单_工艺资料'=>'c'],'c.Gy0_gdbh=g.Gd_gdbh and c.Gy0_yjno=j.yj_yjno')
+            ->join(['工单_工艺资料'=>'c'],'c.Gy0_gdbh=g.Yj_Gdbh and g.yj_Yjno=c.Gy0_yjno')
             ->select();
         foreach ($rows as $key=>$value){
             $rows[$key]['jyGx'] =  sprintf("%02d", $value['Gy0_yjno']).'-'.$value['Gy0_gxh'];