库存概况接口优化，增加仓库的业务公司编码、名称

app/admin/controller/Good.php

@@ -622,14 +622,21 @@ class Good extends Base
         $list = Db::name("good_log")->alias('a')
             ->join("good_stock b","b.id=a.stock_id","left")
             ->where($where)->page($page,$size)->order("a.addtime desc")
-            ->field("a.action_name,a.type,a.stock_name,a.stock,a.action_type,b.spuCode,
-            a.addtime,a.action_uid,b.wsm_code")->select();
+            ->field("a.action_name,a.type,a.stock_name,a.stock,a.action_type,b.spuCode,a.addtime,a.action_uid,b.wsm_code")
+            ->select()
+            ->toArray();
        $data=[];
         foreach ($list as $value){
             $db = Db::name("depart_user")->where(['uid'=>$value['action_uid']])->column("itemid");
             $item = Db::name("company_item")->where(['id'=>$db])->column("id,name");
-            $wsm = Db::name("warehouse_info")->alias("a")->Join("supplier b","a.supplierNo=b.code","left")->where
-            (['a.wsm_code'=>$value['wsm_code'],"a.is_del"=>0])->field("a.name as wsm_name,wsm_code,b.code,b.name")->find();
+            $wsm = Db::name("warehouse_info")
+                ->alias("a")
+                ->Join("supplier b","a.supplierNo=b.code","left")
+                ->Join("business bus","bus.companyNo=a.companyNo","left")
+                ->where(['a.wsm_code'=>$value['wsm_code'],"a.is_del"=>0])
+                ->field("a.name as wsm_name,wsm_code,b.code,b.name,bus.company,bus.companyNo")
+                ->find();
+
             $godd =Db::name("good")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
             $value['good_name']=isset($godd['good_name'])? $godd['good_name']:"";
             $value['cat_id']=isset($godd['cat_id'])? $godd['cat_id']:"";
@@ -641,6 +648,8 @@ class Good extends Base
             $value['action_type_cn'] =$this->acton[$value['action_type']];
             $value['item'] =$item;
             $value['can'] =$int;
+            $value['company'] =$wsm['company']??'';
+            $value['companyNo'] =$wsm['companyNo']??'';
             $data[]=$value;
         }
         return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);