qiuenguang 1 год назад
Родитель
Сommit
45dbb526cf
1 измененных файлов с 41 добавлено и 8 удалено
  1. 41 8
      application/api/controller/WorkOrder.php

+ 41 - 8
application/api/controller/WorkOrder.php

@@ -1975,7 +1975,34 @@ class WorkOrder extends Api
         if (empty($param['search'])){
             $this->error('参数错误');
         }
-        $list = \db('工单_基本资料')
+//        $list = \db('工单_基本资料')
+//            ->alias('a')
+//            ->field([
+//                'rtrim(a.Gd_gdbh)' => '工单编号',
+//                'rtrim(b.客户编号)' => '客户编号',
+//                'rtrim(b.客户名称)' => '客户名称',
+//                'rtrim(b.产品编号)' => '产品编号',
+//                'rtrim(b.产品名称)' => '产品名称'
+//            ])
+//            ->join('产品_基本资料 b','a.成品代号 = b.产品编号')
+//            ->join('产品_工艺资料 c','a.成品代号 = c.Gy0_cpdh')
+//            ->join('产品_印件资料 d','a.成品代号 = d.yj_cpdh')
+//            ->where([
+//                'a.Gd_gdbh' => ['like','%'.$param['search'].'%']
+//            ])
+//            ->whereOr([
+//                'a.成品名称' => ['like','%'.$param['search'].'%'],
+//            ])
+//            ->where([
+//                'c.Gy0_cpdh' => ['<>',null],
+//                'd.yj_cpdh' => ['<>',null],
+//                'b.状态' => ['not like','%停用%'],
+//                'b.产品名称' => ['not like','%停用%']
+//            ])
+//            ->group('a.Gd_gdbh')
+//            ->order('a.Uniqid desc')
+//            ->select();
+        $list = \Db('工单_基本资料')
             ->alias('a')
             ->field([
                 'rtrim(a.Gd_gdbh)' => '工单编号',
@@ -1984,13 +2011,19 @@ class WorkOrder extends Api
                 'rtrim(b.产品编号)' => '产品编号',
                 'rtrim(b.产品名称)' => '产品名称'
             ])
-            ->join('产品_基本资料 b','a.成品代号 = b.产品编号')
-            ->join('工单_工艺资料 c','a.Gd_gdbh = c.Gy0_gdbh')
-            ->join('工单_印件资料 d','a.Gd_gdbh = d.Yj_Gdbh')
-            ->where('a.Gd_gdbh','like','%'.$param['search'].'%')
-            ->whereOr('a.成品名称','like','%'.$param['search'].'%')
-            ->where('c.Gy0_gdbh','<>',null)
-            ->where('d.Yj_Gdbh','<>',null)
+            ->join('产品_基本资料 b', 'a.成品代号 = b.产品编号')
+            ->join('产品_工艺资料 c', 'a.成品代号 = c.Gy0_cpdh')
+            ->join('产品_印件资料 d', 'a.成品代号 = d.yj_cpdh')
+            ->where(function($query) use ($param) {
+                $query->where('a.Gd_gdbh', 'like', '%'.$param['search'].'%')
+                    ->whereOr('a.成品名称', 'like', '%'.$param['search'].'%');
+            })
+            ->where(function($query) {
+                $query->where('c.Gy0_cpdh', '<>', '')
+                    ->where('d.yj_cpdh', '<>', '')
+                    ->where('b.状态', 'not like', '%停用%')
+                    ->where('b.产品名称', 'not like', '%停用%');
+            })
             ->group('a.Gd_gdbh')
             ->order('a.Uniqid desc')
             ->select();