first commit

application/api/controller/Manufacture.php

@@ -1219,10 +1219,29 @@ class Manufacture extends Api
             ->join('工单_印件资料 b', 'b.订单编号 = a.订单编号 AND a.子订单编号 = a.子订单编号')
             ->join('工单_基本资料 j', 'b.订单编号 = j.订单编号', 'LEFT')
             ->field('
-            a.工序名称, b.订单编号, b.子订单编号, b.款号, b.颜色, b.船样, a.尺码, b.zdtotal as 制单数, b.颜色备注,
-            a.数量, MIN(a.sys_rq) as 上报时间, a.UniqId,
-            j.客户编号, j.生产款号, j.款式
-        ')
+                a.工序名称,a.sczl_bh,b.订单编号, b.子订单编号, b.款号, b.颜色, b.船样, a.尺码, b.zdtotal as 制单数, b.颜色备注,
+                a.数量, MIN(a.sys_rq) as 上报时间, a.UniqId,
+                j.客户编号, j.生产款号, j.款式
+            ')
+            ->where($where)
+            ->where('a.mod_rq', null)
+            ->order('a.sys_rq desc, a.UniqId desc')
+            ->limit($param['page'],$param['limit'])
+            ->group('a.UniqId')
+            ->select();
+
+        $count = \db('设备_产量计酬')->alias('a')
+            ->join('工单_印件资料 b', 'b.订单编号 = a.订单编号 AND a.子订单编号 = a.子订单编号')
+            ->join('工单_基本资料 j', 'b.订单编号 = j.订单编号', 'LEFT')
+            ->field('
+                a.工序名称,a.sczl_bh,b.订单编号, b.子订单编号, b.款号, b.颜色, b.船样, a.尺码, b.zdtotal as 制单数, b.颜色备注,
+                CASE 
+                    WHEN a.工序名称 IN ("裁剪", "车缝") THEN a.数量
+                    ELSE a.s_num 
+                END as 数量,
+                 MIN(a.sys_rq) as 上报时间, a.UniqId,
+                j.客户编号, j.生产款号, j.款式
+            ')
             ->where($where)
             ->where('a.mod_rq', null)
             ->order('a.sys_rq desc, a.UniqId desc')
@@ -1257,7 +1276,7 @@ class Manufacture extends Api
         // 返回结果
         $this->success('请求成功', [
             'table' => $list,
-            'length' => count($list),
+            'length' => count($count),
             'headers' => $sizeList  // 返回所有的尺码作为表头
         ]);
     }
@@ -1428,14 +1447,22 @@ class Manufacture extends Api
         if (isset($param)){
             $where['订单编号|生产款号'] = ['like','%'.$param['search'].'%'];
         }
-//        $where['审核'] = null;
-//        $where['审核日期'] = null;
+        $page = $param['page'];
+        $limit = $param['limit'];
         $where['Mod_rq'] = null;
         $list = \db('工单_基本资料')
+            ->where($where)
+            ->orderRaw("FIELD(gd_statu, '1-计划中', '2-生产中')")
+            ->order('订单编号 desc')
+            ->limit(($page-1)*$limit,$limit)
+            ->select();
+
+        $count = \db('工单_基本资料')
             ->where($where)
             ->orderRaw("FIELD(gd_statu, '1-计划中', '2-生产中')")
             ->order('订单编号 desc')
             ->select();
+
         // 提取所有订单编号
         $orderIds = array_column($list, '订单编号');
         // 查询相关附件中是否存在这些订单编号
@@ -1466,7 +1493,7 @@ class Manufacture extends Api
                 unset($value['工单入仓数量']);
             }
         }
-        $data['total'] = count($list);
+        $data['total'] = count($count);
         $data['table'] = $list;
         $this->success('成功',$data);
     }
@@ -1613,7 +1640,6 @@ class Manufacture extends Api
 
             }
         }
-        // 返回最终结果
         $this->success('成功', $data);
     }
 

application/api/controller/WorkOrder.php

@@ -1093,8 +1093,27 @@ class WorkOrder extends Api
         if ($this->request->isGet() === false){
             $this->error('请求错误');
         }
+        $param = $this->request->param();
+        if (empty($param)) {
+            $this->error('参数错误');
+        }
+
         $where['a.mod_rq'] = ['neq', ''];
         $list = \db('设备_产量计酬')->alias('a')
+            ->join('工单_印件资料 b', 'b.订单编号 = a.订单编号 AND a.子订单编号 = a.子订单编号')
+            ->join('工单_基本资料 j', 'b.订单编号 = j.订单编号', 'LEFT')
+            ->field('
+                b.订单编号, b.子订单编号, b.款号, b.颜色, b.船样, a.尺码, b.zdtotal as 制单数,b.颜色备注,
+                a.数量, a.sys_rq as 上报时间,a.UniqId,a.mod_rq,a.delsys_id,a.sczl_bh,
+                j.客户编号,j.生产款号,j.款式
+                ')
+            ->where($where)
+            ->order('a.mod_rq desc')
+            ->limit($param['page'],$param['limit'])
+            ->group('a.UniqId')
+            ->select();
+
+        $count = \db('设备_产量计酬')->alias('a')
             ->join('工单_印件资料 b', 'b.订单编号 = a.订单编号 AND a.子订单编号 = a.子订单编号')
             ->join('工单_基本资料 j', 'b.订单编号 = j.订单编号', 'LEFT')
             ->field('
@@ -1115,7 +1134,7 @@ class WorkOrder extends Api
             $item[$size] = $item['数量']; // 动态添加尺码字段，值为数量
 //            unset($item['数量']); // 移除原来的已完成字段
         }
-        $data['total'] = count($list);
+        $data['total'] = count($count);
         $data['table'] = $list;
         $this->success('成功',$data);
     }