排程制程工单显示

application/api/controller/Manufacture.php

@@ -206,7 +206,7 @@ class Manufacture extends Api
 //                        ->where('b2.Gy0_gdbh = a.Gd_gdbh')
 //                        ->where('b2.Gy0_sj1 <> "1900-01-01 00:00:00"');
 //                })
-                ->group('a.Gd_gdbh,b.Gy0_yjno,b.Gy0_gxh')
+                ->group('a.Gd_gdbh')
                 ->select();
         }else{
             $list = db('工单_基本资料')->alias('a')
@@ -232,7 +232,7 @@ class Manufacture extends Api
                     'b.Gy0_sj1' => ['<>', '1900-01-01 00:00:00'],
                 ])
                 ->where($where)
-                ->group('a.Gd_gdbh,b.Gy0_yjno,b.Gy0_gxh')
+                ->group('a.Gd_gdbh')
                 ->select();
         }
         if (empty($list)){
@@ -273,7 +273,7 @@ class Manufacture extends Api
                         GROUP BY sczl_gdbh, sczl_gxh
                 ) AS b ON a.Gy0_gdbh = b.sczl_gdbh AND (a.Gy0_gxh = b.sczl_gxh OR b.sczl_gxh IS NULL)
                 WHERE a.Gy0_gdbh = '{$Gd_gdbh}' AND a.Gy0_sbbh != ''
-                GROUP BY a.Gy0_gxh";
+                GROUP BY a.Gy0_yjno,a.Gy0_gxh";
         $list = Db::query($sql);
         if (empty($list)){
             $this->success('未找到工序');