first commit

application/api/controller/WorkOrder.php

@@ -118,6 +118,11 @@ class WorkOrder extends Api
             ->limit(($page - 1) * $limit, $limit)
             ->select();
 
+        $count = \db('工单_基本资料')
+            ->where($where)
+            ->order('订单编号 desc, Gd_statu desc, Sys_rq desc')
+            ->select();
+
         // 提取所有订单编号
         $orderIds = array_column($list, '订单编号');
 
@@ -136,7 +141,7 @@ class WorkOrder extends Api
             }
         }
 
-        $this->success('成功', ['data' => $list, 'total' => count($list)]);
+        $this->success('成功', ['data' => $list, 'total' => count($count)]);
     }
 
 
@@ -2502,6 +2507,7 @@ class WorkOrder extends Api
             a.BOM_实际用量 as 裁床实际用料, a.BOM_领用数量 as 裁床领用面料, a.BOM_退还数量 as 裁床退回仓库面料,
             a.BOM_desc as 备注, a.UNIQID, a.BOM_库存总量 as 入库总量, a.BOM_门封 as 门封, a.BOM_面料结余 as 面料结余, a.Sys_ID as ID, a.Sys_rq as 日期')
             ->where($where)
+            ->order("a.BOM_工单编号 desc")
             ->limit(($page - 1) * $limit, $limit)
             ->select();
 
@@ -2614,16 +2620,34 @@ class WorkOrder extends Api
         if (empty($param)){
             $this->error('参数错误');
         }
+        $where= [];
+        if (isset($param['search'])) {
+            $where['物料名称|款号|order_id|receipt_number'] = ['like', $param['search'] . '%'];
+        }
+        if (isset($param['mouth'])) {
+            $where['rq'] = ['like', $param['mouth'] . '%'];
+        }
+        $page = $param['page'];
+        $limit = $param['limit'];
         $list = \db('设备_报工日志')
-            ->where('rq','like','%'.$param['mouth'].'%')
+            ->where($where)
             ->field('receipt_number as 出库单,order_id as 订单编号,款号,物料名称,rq as 日期,sys_id as 操作机台,recipient as 领料人员,name as 单号类型')
             ->group('出库单')
             ->order('rq desc')
+            ->limit(($page-1)*$limit,$limit)
+            ->select();
+        $count = \db('设备_报工日志')
+            ->where($where)
+            ->field('receipt_number as 出库单')
+            ->group('出库单')
+            ->order('rq desc')
             ->select();
         if (empty($list)){
             $this->success('未找到数据');
         }else{
-            $this->success('成功',$list);
+            $data['total'] = count($count);
+            $data['table'] = $list;
+            $this->success('成功',$data);
         }
 
     }