|
@@ -112,7 +112,6 @@ class WorkOrder extends Api
|
|
|
}else{
|
|
}else{
|
|
|
$where['成品代号'] = ['like',$clientNumber.'%'];
|
|
$where['成品代号'] = ['like',$clientNumber.'%'];
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
if (!empty($workOrder)){
|
|
if (!empty($workOrder)){
|
|
|
$where['Gd_gdbh'] = $workOrder;
|
|
$where['Gd_gdbh'] = $workOrder;
|
|
@@ -132,6 +131,7 @@ class WorkOrder extends Api
|
|
|
->where($where)
|
|
->where($where)
|
|
|
->order('Gd_statu desc')
|
|
->order('Gd_statu desc')
|
|
|
->limit(($page-1)*$limit,$limit)
|
|
->limit(($page-1)*$limit,$limit)
|
|
|
|
|
+ ->group('Gd_gdbh')
|
|
|
->select();
|
|
->select();
|
|
|
//工单基本资料数据整理
|
|
//工单基本资料数据整理
|
|
|
$data = [];
|
|
$data = [];
|
