子订单列表排序

application/api/controller/WorkOrder.php

@@ -1418,12 +1418,13 @@ class WorkOrder extends Api
         $arr = [];
         foreach ($xhdata as $key => $value){
             for($i=1;$i<=10;$i++){
-                if ($value['cm'.$i] !== ''){
+                if ($value['cm'.$i] !== '' && $value['cm'.$i] !== null){
                     array_push($arr,$value['cm'.$i]);
                 }
             }
         }
         $arr = array_unique($arr);
+        sort($arr);
         $list = \db('工单_印件资料')
             ->where('订单编号',$param['order'])
             ->where($where)
@@ -2175,13 +2176,47 @@ class WorkOrder extends Api
         if (empty($param['order'])){
             $this->error('参数错误');
         }
+        $where['Mod_rq'] = null;
         $list = \db('工单_基本资料')
             ->where('订单编号',$param['order'])
+            ->where($where)
             ->field('订单编号,生产款号,客户编号,款式,落货日期,箱唛要求,面料,船样描述,船样合计,粘衬,订单数量,审核,审核日期')
             ->find();
-        $processList = \db('工单_印件资料')
+        $xhdata = \db('工单_印件资料')
             ->where('订单编号',$param['order'])
+            ->where($where)
+            ->field('cm1,cm2,cm3,cm4,cm5,cm6,cm7,cm8,cm9,cm10')
             ->select();
+        $arr = [];
+        foreach ($xhdata as $key => $value){
+            for($i=1;$i<=10;$i++){
+                if ($value['cm'.$i] !== '' && $value['cm'.$i] !== null){
+                    array_push($arr,$value['cm'.$i]);
+                }
+            }
+        }
+        $arr = array_unique($arr);
+        $processlist = \db('工单_印件资料')
+            ->where('订单编号',$param['order'])
+            ->where($where)
+            ->field('zdtotal,cm1,cm2,cm3,cm4,cm5,cm6,
+            cm7,cm8,cm9,cm10,cmsl1,cmsl2,cmsl3,cmsl4,cmsl5,cmsl6,cmsl7,cmsl8,cmsl9,cmsl10,Uniqid')
+            ->select();
+        foreach ($processlist as $key=>$value){
+            for($i=1;$i<=10;$i++){
+                if ($value['cm'.$i] !== '' && $value['cm'.$i] !== null){
+                    $processlist[$key][$value['cm'.$i]] = $value['cmsl'.$i];
+                }
+                unset($processlist[$key]['cm'.$i],$processlist[$key]['cmsl'.$i]);
+            }
+        }
+
+        $data['order'] = $list;
+        sort($arr);
+        $data['xhdata'] = $arr;
+        $data['process'] = $processlist;
+        $this->success('成功',$data);
+
     }
 
 }