全局处理业务公司1/2

app/admin/controller/Activity.php

@@ -190,32 +190,53 @@ class Activity extends Base
         $page = $page >= $total ? $total : $page;
         $list = Db::name('good_zixun')
             ->alias("a")
-            ->join("supplier b","b.code=a.supplierNo","left")
+//            ->join("supplier b","b.code=a.supplierNo","left")
             ->where($where)
             ->page($page,$size)
             ->order("a.addtime desc")
-            ->field("a.*,b.name")
             ->select()
             ->toArray();
+
+        $all_platform_id = array_column($list,'platform_id');
+        $all_platform = Db::name('platform')
+            ->where(['is_del'=>0,'id'=>$all_platform_id])
+            ->column('platform_name','id');
+
+        $all_brand_id = array_column($list,'brand_id');
+        $all_brand = Db::name('brand')
+            ->where(['is_del'=>0,'id'=>$all_brand_id])
+            ->column('brand_name','id');
+
+        $all_good_unit = array_column($list,'good_unit');
+        $all_unit = Db::name('unit')
+            ->where(['is_del'=>0,'id'=>$all_good_unit])
+            ->column('unit','id');
+
+        $all_code = array_merge(array_column($list,'supplierNo'),array_column($list,'companyNo'));
+        $userCommon = new \app\admin\common\User();
+        $tmp = $userCommon->handle('getCodeAndName',['code'=>$all_code]);
+
 //halt($list);
         $data=[];
         //分类/规格/品牌 等字段取出对应文字
         foreach ($list as $value){
             $value['cat_info']= made($value['cat_id'],[]);
-            $platform = Db::name("platform")->where(["id"=>$value['platform_id']])->find();
-            $value['platform_name'] = isset($platform['platform_name']) ? $platform['platform_name']:"";
-            $value['platform_code_en'] = isset($platform['platform_code_en']) ? $platform['platform_code_en']:"";
-            $supplier = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
-            $value['supplier_name'] = isset($supplier['name']) ? $supplier['name']:"";
-            $brand=Db::name("brand")->where(["id"=>$value['brand_id']])->find();
-            $value["brand_name"]=isset($brand['brand_name'])?$brand['brand_name']:"";
-            $unit = Db::name("unit")->where(["id"=>$value['good_unit']])->find();
-            $value['unit'] =isset($unit['unit'])?$unit['unit']:"";
-            $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
-            $value['company'] = isset($company['company'])?$company['company']:"";
+//            $platform = Db::name("platform")->where(["id"=>$value['platform_id']])->find();
+            $value['platform_name'] = $all_platform[$value['platform_id']]??'';//isset($platform['platform_name']) ? $platform['platform_name']:"";
+            $value['platform_code_en'] = '';//isset($platform['platform_code_en']) ? $platform['platform_code_en']:"";
+//            $supplier = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
+            $value['supplier_name'] = $tmp[$value['supplierNo']] ?? '';//isset($supplier['name']) ? $supplier['name']:"";
+//            $brand=Db::name("brand")->where(["id"=>$value['brand_id']])->find();
+            $value["brand_name"]=$all_brand[$value['brand_id']]??'';//isset($brand['brand_name'])?$brand['brand_name']:"";
+//            $unit = Db::name("unit")->where(["id"=>$value['good_unit']])->find();
+            $value['unit'] =$all_unit[$value['good_unit']]??'';//isset($unit['unit'])?$unit['unit']:"";
+//            $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
+            $value['company'] = $tmp[$value['companyNo']]??'';//isset($company['company'])?$company['company']:"";
 //            $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
 //            $value['company'] = isset($company['company'])?$company['company']:"";
-            $value['stock_total'] = Db::name("good_stock")->where(['spuCode'=>$value['spuCode'],"is_del"=>0])->sum("usable_stock");
+            $value['stock_total'] = Db::name("good_stock")
+                ->where(['spuCode'=>$value['spuCode'],"is_del"=>0])
+                ->sum("usable_stock");
 //            $value['status']=$value['exam_status'];
 //            $value['exclusive']=makeExcluse($value['is_exclusive']);
             $value['good_info_img']=$value['good_info_img'];

app/admin/controller/Business.php

@@ -11,6 +11,7 @@ use think\facade\Validate;
 class Business extends Base
 {
 
+    //业务企业只能从供应商升级而来
     public function create()
     {
         $companyNo = makeNo("GS");
@@ -18,10 +19,10 @@ class Business extends Base
         if ($company == "") {
             return error_show(1002, "参数company不能为空");
         }
-        $companyinfo = Db::name('business')->where(['is_del' => 0, 'company' => $company])->find();
-        if (!empty($companyinfo)) {
-            return error_show(1002, "企业公司名称已存在");
-        }
+//        $companyinfo = Db::name('business')->where(['is_del' => 0, 'company' => $company])->find();
+//        if (!empty($companyinfo)) {
+//            return error_show(1002, "企业公司名称已存在");
+//        }
         $type = isset($this->post['type']) && $this->post['type'] !== "" ? trim($this->post['type']) : "";
         if ($type == "") {
             return error_show(1002, "参数type不能为空");

app/admin/controller/Consult.php

@@ -379,8 +379,12 @@ class Consult extends Base
             $zxinfo['brand']= isset($unit['brand_name'])?$unit['brand_name']:"";
         }
         if($zxorder['companyNo']!==""){
-            $kh=Db::name("business")->where(['companyNo'=>$zxorder['companyNo']])->find();
-            $zxinfo['company']= isset($kh['company'])?$kh['company']:"";
+//            $kh=Db::name("business")->where(['companyNo'=>$zxorder['companyNo']])->find();
+//            $zxinfo['company']= isset($kh['company'])?$kh['company']:"";
+
+            $userCommon = new \app\admin\common\User();
+            $tmp = $userCommon->handle('getCodeAndName', ['code' => $zxorder['companyNo']]);
+            $zxinfo['company'] = $tmp['data'][$zxorder['companyNo']] ?? '';
         }
         if($zxorder['is_project']==1 && $zxorder['projectNo']!==""){
             $project = Db::name("project")->where(["projectNo"=>$zxorder['projectNo'],"is_del"=>0])->find();

app/admin/controller/Orderback.php

@@ -145,7 +145,16 @@ class Orderback extends Base
       $info['order_source']=$orderinfo['order_source'];
       $info['total_price']=$orderinfo['total_price'];
       $info['companyNo']=$orderinfo['supplierNo'];
-      $info['company'] = Db::name('business')->where(['companyNo' => $orderinfo['supplierNo'], 'is_del' => 0])->value('company','');
+
+      $userCommon = new \app\admin\common\User();
+      $tmp = $userCommon->handle('getCodeAndName', ['code' => $orderinfo['supplierNo']]);
+      if (!isset($tmp['code']) || $tmp['code'] != 0) return json_show($tmp['code'], $tmp['message'], $tmp['data']);
+
+      $info['company'] = $tmp['data'][$orderinfo['supplierNo']] ?? '';
+
+//      $info['company'] = Db::name('business')
+//          ->where(['companyNo' => $orderinfo['supplierNo'], 'is_del' => 0])
+//          ->value('company','');
       $info['addr_cn']=GetAddr($info['addr_code']);
       if($orderinfo['order_type']==3){
           $goon = Db::name("good_zixun")->where(["spuCode"=>$orderinfo['good_code'],"is_del"=>0])->find();

app/admin/controller/Purch.php

@@ -322,10 +322,17 @@ class Purch extends Base
             $goon['supplier_cgder'] = $supplier['person'] ??'';
             $goon['supplierName'] = isset($supplier['name'])?$supplier['name']:"";
             $goon['noble_name']=isset($goon['noble_metal'])&&$goon['noble_metal']!=0?$this->noble[$goon['noble_metal']] :"";
+
+            $userCommon = new \app\admin\common\User();
+
             if(isset($goon['companyNo'])&&$goon['companyNo']!=""){
-                $company = Db::name("business")->where(["companyNo"=>$goon['companyNo']])->find();
+
+                $tmp = $userCommon->handle('getCodeAndName', ['code' => $goon['companyNo']]);
+                if (!isset($tmp['code']) || $tmp['code'] != 0) return json_show($tmp['code'], $tmp['message'], $tmp['data']);
+
+//                $company = Db::name("business")->where(["companyNo"=>$goon['companyNo']])->find();
             }
-            $goon['company'] = isset($company['company'])?$company['company']:"";
+            $goon['company'] = $tmp['data'][$goon['companyNo']] ?? '';
         }
         $int= isset($goon['cat_id']) && $goon['cat_id'] !=0 ? made($goon['cat_id']):[];
         $data['wsm_name']="";
@@ -351,10 +358,16 @@ class Purch extends Base
         $data['purcheasediff'] = $dom;
         $data['send_num'] -=$data['th_num'];
         $data['total_fee'] =round($data['total_fee']-$data['th_fee'],2);
-        if(isset($data['companyNo'])&&$data['companyNo']!=""){
-            $company = Db::name("business")->where(["companyNo"=>$data['companyNo']])->find();
+
+        $data['company'] = '';
+        if (isset($data['companyNo']) && $data['companyNo'] != "") {
+            $tmp = $userCommon->handle('getCodeAndName', ['code' => $data['companyNo']]);
+            if (!isset($tmp['code']) || $tmp['code'] != 0) return json_show($tmp['code'], $tmp['message'], $tmp['data']);
+
+//            $company = Db::name("business")->where(["companyNo"=>$data['companyNo']])->find();
+            $data['company'] = $tmp['data'][$data['companyNo']] ?? '';
         }
-        $data['company'] = isset($company['company'])?$company['company']:"";
+        //$data['company'] = isset($company['company'])?$company['company']:"";
         //$data['info'] = $var;
         $data['purcheaseback'] = $var;
 
@@ -1139,16 +1152,12 @@ class Purch extends Base
         $status = [0 => '待与供应商确认', 1 => '待入库', 2 => '部分入库', 3 => '入库完成', 4 => '已取消订单'];
         $list = Db::name("purchease_order")
             ->alias('po')
-            ->field('"" as 序号,po.addtime as 创建时间,po.cgdNo as 采购单编号,po.status as 采购单状态,
-            po.cgder as 采购员,s.orderCode as 确认单号,s.addtime as 确认单时间,po.spuCode as 产品编号,po.good_name as 产品名称,"" as 规格,
-            "" as 单位,po.supplier_name as 供应商名称,po.supplierNo as 供应商编号,po.nake_fee as 裸价,po.delivery_fee as 物流费,
-            s.send_type as 发货方式,po.good_price as 采购单价,s.remark as 确认单备注,po.good_num as 采购数量,po.total_fee as 采购货款,
-            b.company as 购买方公司,s.arrive_time as 到货时间,"" 税率,oa.addr 收货地址,oa.mobile 电话,oa.contactor 联系人,s.platform_order 平台订单编号,oa.receipt_quantity 地址发货数量, oa.addr_code,po.order_type')
+            ->field('"" as 序号,po.addtime as 创建时间,po.cgdNo as 采购单编号,po.status as 采购单状态,po.cgder as 采购员,s.orderCode as 确认单号,s.addtime as 确认单时间,po.spuCode as 产品编号,po.good_name as 产品名称,"" as 规格,"" as 单位,po.supplier_name as 供应商名称,po.supplierNo as 供应商编号,po.nake_fee as 裸价,po.delivery_fee as 物流费,s.send_type as 发货方式,po.good_price as 采购单价,s.remark as 确认单备注,po.good_num as 采购数量,po.total_fee as 采购货款,"" as 购买方公司,s.arrive_time as 到货时间,"" 税率,oa.addr 收货地址,oa.mobile 电话,oa.contactor 联系人,s.platform_order 平台订单编号,oa.receipt_quantity 地址发货数量, oa.addr_code,po.order_type,s.supplierNo')
             ->whereIn('po.cgdNo', $cgdNos)
             ->leftJoin('order_num on', 'on.cgdNo=po.cgdNo')
             ->leftJoin('sale s', 's.orderCode=on.orderCode  AND s.is_del=0')
             ->leftJoin('order_addr oa', 'oa.orderCode=on.orderCode AND oa.is_del=0')
-            ->leftJoin('business b', 'b.companyNo=s.supplierNo AND b.is_del=0')
+//            ->leftJoin('business b', 'b.companyNo=s.supplierNo AND b.is_del=0')
             ->order("po.addtime desc")
             ->withAttr('序号', function () use (&$i) {
                 return $i++;
@@ -1162,6 +1171,10 @@ class Purch extends Base
             ->select()
             ->toArray();
 
+        $all_supplierNo = array_column($list, 'supplierNo');
+        $userCommon = new \app\admin\common\User();
+        $tmp = $userCommon->handle('getCodeAndName', ['code' => $all_supplierNo]);
+
         foreach ($list as &$value) {
 
             if ($value['order_type'] == 3) {
@@ -1206,8 +1219,11 @@ class Purch extends Base
                 $value['收货地址'] = $temp_ . $value['收货地址'];
             }
 
+            $value['购买方公司'] = $tmp['data'][$value['supplierNo']] ?? '';
+
             unset($value['addr_code']);
             unset($value['order_type']);
+            unset($value['supplierNo']);
 
         }
 

app/admin/controller/Reorder.php

@@ -571,8 +571,13 @@ class Reorder extends Base
         $info['supplierNo'] = isset($orderinfo['supplierNo'])?$orderinfo['supplierNo']:'';
         $info['supplier_name']='';
         if(isset($orderinfo['supplierNo'])&&$orderinfo['supplierNo']!=''){
-            $customerinfo = Db::name("business")->where(['companyNo'=>$orderinfo['supplierNo']])->find();
-            $info['supplier_name'] = isset($customerinfo['company']) ? $customerinfo['company']:"";
+//            $customerinfo = Db::name("business")->where(['companyNo'=>$orderinfo['supplierNo']])->find();
+//            $info['supplier_name'] = isset($customerinfo['company']) ? $customerinfo['company']:"";
+
+            $userCommon = new \app\admin\common\User();
+            $tmp = $userCommon->handle('bInfo', ['companyNo' => $orderinfo['supplierNo']]);
+            $info['supplier_name'] = $tmp['data']['company'] ?? '';
+
         }
         $info['platform_name']='';
         $info['platform_id']=$orderinfo['platform_id'];

app/admin/controller/Salezx.php

@@ -5,6 +5,7 @@ namespace app\admin\controller;
 use app\admin\model\GoodLog;
 use app\admin\model\ProcessOrder;
 use think\App;
+use think\Exception;
 use think\facade\Cache;
 use think\facade\Config;
 use think\facade\Db;
@@ -38,10 +39,10 @@ class Salezx extends \app\BaseController
         if($supplierNo==""){
             return error_show(1002,"参数supplierNo不能为空");
         }
-        $supplier=Db::name("business")->where(["companyNo"=>$supplierNo])->find();
-        if($supplier==false){
-            return error_show(1004,"未找到平台供应商数据");
-        }
+//        $supplier=Db::name("business")->where(["companyNo"=>$supplierNo])->find();
+//        if($supplier==false){
+//            return error_show(1004,"未找到平台供应商数据");
+//        }
 
         $sendtype =isset($this->post['sendtype']) && $this->post['sendtype'] !=="" ?trim($this->post['sendtype']):"";
         if($sendtype==''){
@@ -99,10 +100,16 @@ class Salezx extends \app\BaseController
         $ri= isset($apply_id["data"]['nickname']) ?  $apply_id["data"]['nickname'] : "";
         Db::startTrans();
       try {
-          $supplier_temp_info=Db::name("supplier")
-              ->field('id,person,personid')
-              ->where(["code"=>$good['supplierNo']])
-              ->findOrEmpty();
+
+          $userCommon = new \app\admin\common\User();
+          $tmp = $userCommon->handle('sInfo',['code'=>$good['supplierNo']]);
+          if(!isset($tmp['code']) || $tmp['code']!=0) throw new Exception($tmp['message']);
+          $supplier_temp_info = $tmp['data'];
+
+//          $supplier_temp_info=Db::name("supplier")
+//              ->field('id,person,personid')
+//              ->where(["code"=>$good['supplierNo']])
+//              ->findOrEmpty();
 
             $data=[
                 "orderCode"=>$orderCode,

app/admin/controller/User.php

@@ -916,9 +916,11 @@ class User extends Base
         if (!empty($st)) {
             foreach ($st as $itom) {
                 $tep = [];
-                $business = Db::name('business')->where(['id' => $itom['businessid'], "is_del" => 0])->field("company,companyNo")->find();
-                $tep['company'] = isset($business['company']) ? $business['company'] : "";
-                $tep['companyNo'] = isset($business['companyNo']) ? $business['companyNo'] : "";
+//                $business = Db::name('business')->where(['id' => $itom['businessid'], "is_del" => 0])->field("company,companyNo")->find();
+
+                //这个地方是根据业务企业id来匹配的，无法去sys_user查找
+                $tep['company'] = '';//isset($business['company']) ? $business['company'] : "";
+                $tep['companyNo'] = '';//isset($business['companyNo']) ? $business['companyNo'] : "";
                 $tep['businessid'] = $itom['businessid'];
                 $tep['is_main'] = $itom['is_main'];
                 $val[] = $tep;

app/admin/controller/Version.php

@@ -72,10 +72,16 @@ class Version extends BaseController
         $info['platform_name']=isset($plat['platform_name'])?$plat['platform_name']:"";
         $info['platform_code']=isset($plat['platform_code'])?$plat['platform_code']:"";
 
-        $khinfo = Db::name("customer_info")->where(["companyNo"=>$info['khNo']])->find();
-        $info['khName'] = isset($khinfo['companyName'])?$khinfo['companyName']:"";
-        $company = Db::name("business")->where(["companyNo"=>$info['companyNo']])->find();
-        $info['company'] = isset($company['company'])?$company['company']:"";
+        $userCommon = new \app\admin\common\User();
+        $tmp = $userCommon->handle('getCodeAndName', ['code' => [$info['companyNo'], $info['khNo']]]);
+        $info['khName'] = $tmp['data'][$info['khNo']] ?? '';
+        $info['company'] = $tmp['data'][$info['companyNo']] ?? '';
+
+//        $khinfo = Db::name("customer_info")->where(["companyNo"=>$info['khNo']])->find();
+//        $info['khName'] = isset($khinfo['companyName'])?$khinfo['companyName']:"";
+//        $company = Db::name("business")->where(["companyNo"=>$info['companyNo']])->find();
+//        $info['company'] = isset($company['company'])?$company['company']:"";
+
 
         $ladder = Db::name("project_info")->where(['projectNo'=>$projectNo,"is_del"=>0])->select()->toArray();
         $info['ladder']=[];

app/admin/controller/WareHouse.php

@@ -206,6 +206,10 @@ class WareHouse extends Base
         $all_createrid = array_column($list,'contactor');
         $item = get_company_name_by_uid($all_createrid);
 
+        $all_companyNo = array_column($list,'companyNo');
+        $userCommon = new \app\admin\common\User();
+        $tmp = $userCommon->handle('getCodeAndName',['code'=>$all_companyNo]);
+
         foreach ($list as $key=>$value){
 //            if($value['supplierNo']!=""){
 //                $supplierinfo = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
@@ -214,11 +218,11 @@ class WareHouse extends Base
 //                $value['supplier_name']="";
 //            }
             if($value['companyNo']!=""){
-                $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
-                $value['company_name'] = isset($company['company']) ? $company['company'] :"";
-            }else{
-                $value['company_name']="";
-            }
+//                $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
+//                $value['company_name'] = isset($company['company']) ? $company['company'] :"";
+                $value['company_name'] = $tmp['data'][$value['companyNo']]??'';
+            }else  $value['company_name']="";
+
             if($value['wsm_type']!=""){
                 $type = Db::name("warehouse_type")->where(["id"=>$value['wsm_type']])->find();
                 $value['type_name'] = isset($type['name']) ? $type['name'] :"";
@@ -243,27 +247,32 @@ class WareHouse extends Base
         if($id===""){
           return  error_show(1004,"参数id不能为空");
         };
-        $warse = Db::name("warehouse_info")->alias("a")->join("warehouse_addr b ","a.wsm_code=b.wsm_code","left")
-            ->where(["a.id"=>$id,"a.is_del"=>0,"a.status"=>1])->field("a.id,a.wsm_code,a.name,a.wsm_type,a.supplierNo,a.addr,a
-        .contactor,a.contactor_name,a.mobile,a.position,a.status,a.addtime,a.companyNo,
-            a.updatetime,a.wsm_type,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code")->find();
-        if(empty($warse)){
-            return error_show(1004,"未找到数据");
-        }
+        $warse = Db::name("warehouse_info")
+            ->alias("a")
+            ->join("warehouse_addr b ","a.wsm_code=b.wsm_code","left")
+            ->where(["a.id"=>$id,"a.is_del"=>0,"a.status"=>1])
+            ->field("a.id,a.wsm_code,a.name,a.wsm_type,a.supplierNo,a.addr,a.contactor,a.contactor_name,a.mobile,a.position,a.status,a.addtime,a.companyNo,a.updatetime,a.wsm_type,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code")
+            ->findOrEmpty();
+        if(empty($warse))  return error_show(1004,"未找到数据");
+
+        $userCommon = new \app\admin\common\User();
+        $tmp = $userCommon->handle('getCodeAndName',['code'=>[$warse['supplierNo'],$warse['companyNo']]]);
 //        if($warse['supplierNo']!=""){
 //            $supplierinfo = Db::name("supplier")->where(["code"=>$warse['supplierNo']])->find();
 //            $warse['supplier_name'] = isset($supplierinfo['name']) ? $supplierinfo['name'] :"";
 //        }else{
 //            $warse['supplier_name']="";
 //        }
-        if($warse['companyNo']!=""){
-            $company = Db::name("business")->where(["companyNo"=>$warse['companyNo']])->find();
-            $warse['company_name'] = isset($company['company']) ? $company['company'] :"";
-        }else{
-            $warse['company_name']="";
-        }
+        $warse['supplier_name'] = $tmp['data'][$warse['supplierNo']]??'';
+//        if($warse['companyNo']!=""){
+//            $company = Db::name("business")->where(["companyNo"=>$warse['companyNo']])->find();
+//            $warse['company_name'] = isset($company['company']) ? $company['company'] :"";
+//        }else{
+//            $warse['company_name']="";
+//        }
+        $warse['company_name'] = $tmp['data'][$warse['companyNo']]??'';
+
         $warse['addrs_code'] = isset($warse['addrs_code'])&&$warse['addrs_code']!="" ? json_decode($warse['addrs_code'],true):"";
-        $warse['addr_code'] = isset($warse['addr_code'])&&$warse['addr_code']!="" ? json_decode($warse['addr_code'],true):"";
         if($warse['wsm_type']!=""){
             $type = Db::name("warehouse_type")->where(["id"=>$warse['wsm_type']])->find();
             $warse['type_name'] = isset($type['name']) ? $type['name'] :"";
@@ -307,10 +316,17 @@ class WareHouse extends Base
         if($companyNo==""){
             return error_show(1004,"参数companyNo不能为空");
         }
-        $company = Db::name("business")->where(["companyNo"=>$companyNo,"is_del"=>0])->find();
-        if($company==false){
-            return error_show(1004,"业务企业未找到");
-        }
+//        $company = Db::name("business")->where(["companyNo"=>$companyNo,"is_del"=>0])->find();
+//        if($company==false){
+//            return error_show(1004,"业务企业未找到");
+//        }
+
+        $userCommon = new \app\admin\common\User();
+        $tmp = $userCommon->handle('bInfo',['companyNo'=>$companyNo]);
+        if(!isset($tmp['code']) || $tmp['code']!=0) return json_show($tmp['code'],$tmp['message'],$tmp['data']);
+        if(empty($tmp['data'])) return json_show(1004,'业务企业未找到');
+
+
 //        $contactorinfo = GetInfoById($post['token'],['id'=>$contactor]);
 //        if(!empty($contactorinfo) && $contactorinfo['code']!=0){
 //            return error_show($contactorinfo['code'],$contactorinfo['message']);
@@ -430,10 +446,19 @@ class WareHouse extends Base
         }
         $wsm_type = isset($post['wsm_type'])&&$post['wsm_type']!="" ? intval($post['wsm_type']) :"1";
          $condition[]=["a.wsm_type","=",$wsm_type];
-        $list = Db::name("warehouse_info")->alias("a")->join("warehouse_addr b ","a.wsm_code=b.wsm_code","left")
-            ->where($condition)->field("a.id,a.wsm_code,a.name,a.wsm_type,a.supplierNo,a.addr,a.contactor,a.contactor_name,a.mobile,a.position,a.status,a.addtime,
-            a.updatetime,a.wsm_type,a.companyNo,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code")->order("a.addtime desc")
-            ->select();
+        $list = Db::name("warehouse_info")
+            ->alias("a")
+            ->join("warehouse_addr b ","a.wsm_code=b.wsm_code","left")
+            ->where($condition)
+            ->field("a.id,a.wsm_code,a.name,a.wsm_type,a.supplierNo,a.addr,a.contactor,a.contactor_name,a.mobile,a.position,a.status,a.addtime,a.updatetime,a.wsm_type,a.companyNo,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code")
+            ->order("a.addtime desc")
+            ->select()
+            ->toArray();
+
+        $all_companyNo = array_column($list, 'companyNo');
+        $userCommon = new \app\admin\common\User();
+        $tmp = $userCommon->handle('getCodeAndName', ['code' => $all_companyNo]);
+
         $data=[];
         foreach ($list as $value){
             $temp=[];
@@ -453,12 +478,14 @@ class WareHouse extends Base
 //            $supplierinfo = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
 //            $temp['supplier_name'] = isset($supplierinfo['name']) ? $supplierinfo['name'] :"";
             $temp['companyNo'] = $value['companyNo'];
-            if($value['companyNo']!=""){
-                $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
-                $temp['company_name'] = isset($company['company']) ? $company['company'] :"";
-            }else{
-                $temp['company_name']="";
-            }
+
+            $value['company_name'] = $tmp[$value['companyNo']] ?? '';
+//            if($value['companyNo']!=""){
+//                $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
+//                $temp['company_name'] = isset($company['company']) ? $company['company'] :"";
+//            }else{
+//                $temp['company_name']="";
+//            }
             $type = Db::name("warehouse_type")->where(["id"=>$value['wsm_type']])->find();
             $temp['type_name'] = isset($type['name']) ? $type['name'] :"";
             $data[]=$temp;

app/admin/route/app.php

@@ -383,7 +383,7 @@ Route::rule('customarinfo', 'admin/Customar/info');
 Route::rule('customardelete', 'admin/Customar/del');
 Route::rule('customarstatus', 'admin/Customar/status');
 
-Route::rule('businesscreate', 'admin/Business/create');
+//Route::rule('businesscreate', 'admin/Business/create');//业务企业只能从供应商升级而来
 Route::rule('businesslist', 'admin/Business/list');
 Route::rule('businessedit', 'admin/Business/edit');
 Route::rule('businessdel', 'admin/Business/del');

app/common.php

@@ -754,26 +754,27 @@ if (!function_exists('read_big_file')){
 /**
  * @param string $AddrJson
  */
-function GetAddr($AddrJson=""){
-    if($AddrJson==""){
+function GetAddr($AddrJson = "")
+{
+    if ($AddrJson == "") {
         return '';
     }
-    $adr = json_decode($AddrJson,true);
-    if(!is_array($adr)){
+    $adr = json_decode($AddrJson, true);
+    if (!is_array($adr)) {
         return '';
     }
-    $addr='';
-    if(isset($adr['provice_code'])&&$adr['provice_code']!=''){
-        $provice = Db::name("province")->where(["province_code"=>$adr['provice_code']])->find();
-        $addr.=isset($provice['name']) ? $provice['name']:"";
+    $addr = '';
+    if (isset($adr['provice_code']) && $adr['provice_code'] != '') {
+        $provice = Db::name("province")->where(["province_code" => $adr['provice_code']])->find();
+        $addr .= isset($provice['name']) ? $provice['name'] : "";
     }
-    if(isset($adr['city_code'])&&$adr['city_code']!=''){
-        $city = Db::name("city")->where(["city_code"=>$adr['city_code']])->find();
-        $addr.=isset($city['name']) ? $city['name']:"";
+    if (isset($adr['city_code']) && $adr['city_code'] != '') {
+        $city = Db::name("city")->where(["city_code" => $adr['city_code']])->find();
+        $addr .= isset($city['name']) ? $city['name'] : "";
     }
-    if(isset($adr['area_code'])&&$adr['area_code']!=''){
-        $area = Db::name("area")->where(["area_code"=>$adr['area_code']])->find();
-        $addr.=isset($area['name']) ? $area['name']:"";
+    if (isset($adr['area_code']) && $adr['area_code'] != '') {
+        $area = Db::name("area")->where(["area_code" => $adr['area_code']])->find();
+        $addr .= isset($area['name']) ? $area['name'] : "";
     }
     return $addr;
 }