调拨列表allotlist接口补充字段

app/admin/controller/Allot.php

@@ -49,15 +49,13 @@ class Allot extends BaseController
             $where[]=['addtime',"<=",$end];
         }
 
-        $out_supplierNo =isset($this->post['wsm_out_supplierNo']) &&$this->post['wsm_out_supplierNo'] !=="" ? trim
-        ($this->post['wsm_out_supplierNo']):"";
+        $out_supplierNo =isset($this->post['wsm_out_supplierNo']) &&$this->post['wsm_out_supplierNo'] !=="" ? trim($this->post['wsm_out_supplierNo']):"";
         if($out_supplierNo!=""){
             $supplier = Db::name("supplier")->where(["code"=>$out_supplierNo])->find();
             if(empty($supplier)){
                 return error_show(1004,"未找到出库供应商信息");
             }
-            $wsmcode = Db::name("warehouse_info")->where([
-                "is_del"=>0,"wsm_type"=>1,"supplierNo"=>$out_supplierNo])->column("wsm_code");
+            $wsmcode = Db::name("warehouse_info")->where(["is_del"=>0,"wsm_type"=>1,"supplierNo"=>$out_supplierNo])->column("wsm_code");
             //$condtion["c.wsm_code"] = $wsmcode;
             $where[]=['wsm_out',"in",$wsmcode];
         }
@@ -66,22 +64,19 @@ class Allot extends BaseController
 
             $where[]=["out_companyNo","=",$out_companyNo];
         }
-        $in_companyNo = isset($this->post['in_companyNo']) && $this->post['in_companyNo'] !== "" ? trim
-        ($this->post['in_companyNo']) : "";
+        $in_companyNo = isset($this->post['in_companyNo']) && $this->post['in_companyNo'] !== "" ? trim($this->post['in_companyNo']) : "";
         if ($in_companyNo !== "") {
 
             $where[]=["in_companyNo","=",$in_companyNo];
         }
 
-        $in_supplierNo =isset($this->post['wsm_in_supplierNo']) &&$this->post['wsm_in_supplierNo'] !=="" ? trim
-        ($this->post['wsm_in_supplierNo']):"";
+        $in_supplierNo =isset($this->post['wsm_in_supplierNo']) &&$this->post['wsm_in_supplierNo'] !=="" ? trim($this->post['wsm_in_supplierNo']):"";
         if($in_supplierNo!=""){
             $supplier = Db::name("supplier")->where(["code"=>$in_supplierNo])->find();
             if(empty($supplier)){
                 return error_show(1004,"未找到入库供应商信息");
             }
-            $wsmcode = Db::name("warehouse_info")->where([
-                "is_del"=>0,"wsm_type"=>1,"supplierNo"=>$in_supplierNo])->column("wsm_code");
+            $wsmcode = Db::name("warehouse_info")->where(["is_del"=>0,"wsm_type"=>1,"supplierNo"=>$in_supplierNo])->column("wsm_code");
             //$condtion["c.wsm_code"] = $wsmcode;
             $where[]=['wsm_in',"in",$wsmcode];
         }
@@ -93,23 +88,34 @@ class Allot extends BaseController
         $count = Db::name('allot_stock')->where($where)->count();
         $total = ceil($count/$size);
         $page = $page >= $total ? $total : $page;
-        $list = Db::name('allot_stock')->where($where)->order("addtime desc")->page($page,$size)->select();
+        $list = Db::name('allot_stock')->where($where)->order("addtime desc")->page($page,$size)->select()->toArray();
       // var_dump(Db::name('allot_stock')->getLastSql());
         $data=[];
         foreach ($list as $value){
-            $db = Db::name('warehouse_info')->alias('a')->join("supplier b","b.code=a.supplierNo","left")
-                ->field("a.name,a.wsm_code,b.name rname,b.code")->where(['a.wsm_code'=>$value['wsm_out'],"
-                a.wsm_type"=>1,'a.is_del'=>0])->find();
+            $db = Db::name('warehouse_info')
+                ->alias('a')
+                ->join("supplier b","b.code=a.supplierNo","left")
+                ->join("business bus","bus.companyNo=a.companyNo","left")
+                ->field("a.name,a.wsm_code,b.name rname,b.code,bus.company")
+                ->where(['a.wsm_code'=>$value['wsm_out'],"a.wsm_type"=>1,'a.is_del'=>0])
+                ->find();
             $value['name'] =isset($db['name']) ? $db['name']:"";
             $value['wsm_code'] =isset($db['wsm_code']) ? $db['wsm_code']:"";
-            $value['rname'] =isset($db['rname']) ? $db['rname']:"";
-           $value['code'] =isset($db['code']) ? $db['code']:"";
-            $dc = Db::name('warehouse_info')->alias('a')->join("supplier b","b.code=a.supplierNo","left")
-                ->field("a.name,a.wsm_code,b.name tname,b.code")->where(['a.wsm_code'=>$value['wsm_in'],"a.wsm_type"=>1,'a.is_del'=>0])->find();
+            $value['rname'] = isset($db['rname']) ? $db['rname'] : "";
+            $value['code'] = isset($db['code']) ? $db['code'] : "";
+            $value['out_company_name'] = isset($db['company']) ? $db['company'] : "";
+            $dc = Db::name('warehouse_info')
+                ->alias('a')
+                ->join("business bus","bus.companyNo=a.companyNo","left")
+                ->join("supplier b","b.code=a.supplierNo","left")
+                ->field("a.name,a.wsm_code,b.name tname,b.code,bus.company")
+                ->where(['a.wsm_code'=>$value['wsm_in'],"a.wsm_type"=>1,'a.is_del'=>0])
+                ->find();
             $value['wsm_in_name'] =isset($dc['name']) ? $dc['name']:"";
             $value['wsm_in_code'] =isset($dc['wsm_code']) ? $dc['wsm_code']:"";
             $value['tname'] =isset($dc['tname']) ? $dc['tname']:"";
             $value['rcode'] =isset($dc['code']) ? $dc['code']:"";
+            $value['in_company_name'] =isset($dc['company']) ? $dc['company']:"";
             $data []=$value;
         }
         return app_show(0,"获取成功",['count'=>$count,'list'=>$data]);