|
|
@@ -1989,6 +1989,8 @@ class WorkOrder extends Api
|
|
|
->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)
|
|
|
->group('a.Gd_gdbh')
|
|
|
->order('a.Uniqid desc')
|
|
|
->select();
|