流程单查询优化

application/api/controller/Facility.php

@@ -43,7 +43,7 @@ class Facility extends Api
             ->where('使用部门','<>','研发中心')
             ->where('设备编组','<>','')
             ->where($where)
-            ->order('设备编组,设备编号')
+            ->order('设备编组')
             ->column('rtrim(使用部门) as 使用部门');
         if (empty($department)){
             $this->success('为获取到机台数据');
@@ -60,7 +60,7 @@ class Facility extends Api
             $this->success('未找到机台生产记录');
         }
         foreach ($department as $value){
-            $machine = \db('设备_基本资料')->where('使用部门',$value)->where('sys_sbID','<>','')->where('使用部门',$value)->field('rtrim(设备编号) as 设备编号,rtrim(设备名称) as 设备名称')->select();
+            $machine = \db('设备_基本资料')->where('使用部门',$value)->where('sys_sbID','<>','')->where('使用部门',$value)->field('rtrim(设备编号) as 设备编号,rtrim(设备名称) as 设备名称')->order('设备编号')->select();
             foreach ($machine as $k=>$v){
                 $data[rtrim($value)][$v['设备编号'].'-->'.$v['设备名称']] = [];
                 foreach ($list as $kk=>$vv){

application/api/controller/ProcessDocument.php

@@ -46,7 +46,21 @@ class ProcessDocument extends Api
             ->where('b.BOM_产出单位',['eq','张'],['eq','吨'],'or')
             ->select();
         if(empty($info)){
-            $this->success('请求成功');
+            $data = db('工单_基本资料')->alias('a')
+                ->join('工单_印件资料 b ',' a.Gd_gdbh=b.Yj_Gdbh AND a.行号 = b.yj_Yjno','left')
+                ->field('b.yj_zzmc as yj_zzmc0,b.yj_zzmc1,b.yj_zzmc2,b.yj_zzmc3,b.yj_zzmc4,a.成品代号,a.产品版本号,b.yj_平张投料')
+                ->where($map)
+                ->select();
+            $info = [];
+            for ($i=0 ; $i < 5; $i++){
+                if ($data[0]['yj_zzmc'.$i] !== ''){
+                    $list['BOM_物料名称'] = $data[0]['yj_zzmc'.$i];
+                    $list['成品代号'] = $data[0]['成品代号'];
+                    $list['产品版本号'] = $data[0]['产品版本号'];
+                    $list['BOM_计划用量'] = $data[0]['yj_平张投料'];
+                    array_push($info,$list);
+                }
+            }
         }
         $res =array();
 

application/api/controller/WorkOrder.php

@@ -1170,6 +1170,7 @@ class WorkOrder extends Api
         }
         $list = \db('设备_基本资料')
             ->where('使用部门',$param['address'])
+            ->where('sys_sbID','<>','')
             ->field('rtrim(设备编号) as 设备编号,rtrim(设备名称) as 设备名称')
             ->order('设备编组,设备编号')
             ->select();