优化流程单接口

application/api/controller/ProcessDocument.php

@@ -40,7 +40,7 @@ class ProcessDocument extends Api
         $map['a.Gd_gdbh'] = $order;
         //胶印车间计量单位为”张“，凹印车间计量单位一般为”吨“
         $info = db('工单_基本资料')->alias('a')
-            ->join('工单_bom资料 b ',' a.Gd_gdbh=b.BOM_工单编号','left')
+            ->join('工单_bom资料 b ',' a.Gd_gdbh=b.BOM_工单编号 AND a.行号 = b.BOM_工单行号','left')
             ->field('DISTINCT(b.BOM_物料名称),a.成品代号,a.产品版本号,b.BOM_计划用量')
             ->where($map)
             ->where('b.BOM_产出单位',['eq','张'],['eq','吨'],'or')
@@ -49,20 +49,15 @@ class ProcessDocument extends Api
             $this->success('请求成功');
         }
         $res =array();
-        $product_number = '';
+
+        $res['yjData'] = \db('工单_印件资料')->where('Yj_gdbh',$order)->field('yj_Yjno,yj_Yjdh,yj_yjmc')->select();
         if (count($info) > 1){
             foreach ($info as $k=>$v){
-                $product_number = rtrim($v['成品代号']);
                 $str = rtrim($v['BOM_物料名称']);
                 $res['paper'][$k] ['bom_物料名称'] =  $str;
                 $res['paper'][$k] ['产品版本号'] =  rtrim($v['产品版本号']);
                 $res['paper'][$k] ['bom_计划用量'] = intval($v['BOM_计划用量']);
             }
-            $list = Db::connect('db2')->name('qr_history_peijian')
-                ->where('FIND_IN_SET(:product_number, product_number)')
-                ->bind(['product_number' => $product_number])
-                ->field('id,peijian_name')->select();
-            $res['peijian'] = $list;
         }else{
             $res['paper'][0]['bom_物料名称'] = rtrim($info[0]['BOM_物料名称']);
             $res['paper'][0]['产品版本号'] = rtrim($info[0]['产品版本号']);