6个列表接口增加字段，has_account

app/admin/controller/After.php

@@ -322,6 +322,9 @@ class After extends Base
 
 //        $userCommon = \app\admin\common\User::getIns();
 //        $customer_ = $userCommon->handle('getCodeAndName', ['code' => array_unique(array_merge(array_column($list, 'customer_code'), array_column($list, 'supplierNo')))]);
+        //校验是否开通了供应商账号
+        $supp_account = checkHasAccountBySupplierNos(array_unique(array_column($list,'supplierNo')));
+
 
         $data = [];
         foreach ($list as $value) {
@@ -329,6 +332,7 @@ class After extends Base
 //            $value['customer_name'] = $customer_['data'][$value['customer_code']] ?? '';
 //            $value['supplierName'] = $customer_['data'][$value['supplierNo']] ?? '';
             $value['company_name'] = $item[$value['apply_id']] ?? '';
+            $value['has_account'] = (int)isset($supp_account[$value['supplierNo']]);
 
             //是否具有编辑权限
 //            $value['is_allow_update'] = 0;

app/admin/controller/OrderOutChild.php

@@ -100,11 +100,15 @@ class OrderOutChild extends Base
         $all_apply_id = array_column($list, 'apply_id');
         $company_name = get_company_name_by_uid($all_apply_id);
 
+        //校验是否开通了供应商账号
+        $supp_account = checkHasAccountBySupplierNos(array_unique(array_column($list,'supplierNo')));
+
         $data = [];
         foreach ($list as $value) {
 
             $value['company_name'] = $company_name[$value['apply_id']] ?? '';
 
+            $value['has_account'] = (int)isset($supp_account[$value['supplierNo']]);
             $data[] = $value;
         }
 

app/admin/controller/Purchin.php

@@ -142,7 +142,7 @@ class Purchin extends Base
             ->where($where)
              ->where(function ($query)use ($condition){$query->whereOr($condition);})
             ->page($page,$size)
-            ->field("a.apply_name,a.sendtime,b.order_type,b.order_source,a.status,a.cgdNo,a.wsm_in_code,a.send_num,a.wsm_code,b.good_name,b.spuCode,a.post_company,a.post_code,a.post_fee,a.apply_id,a.wsm_num,a.error_num,a.wait_num,a.status,a.check_name,a.checkid,b.bkcode,b.supplierNo,'' cgder_id,'' cgder,b.good_createrid,b.good_creater,c.name wsm_name,b.supplierNo,b.supplier_name,c.supplierNo wsm_supplierNo,b.companyNo")
+            ->field("a.apply_name,a.sendtime,b.order_type,b.order_source,a.status,a.cgdNo,a.wsm_in_code,a.send_num,a.wsm_code,b.good_name,b.spuCode,a.post_company,a.post_code,a.post_fee,a.apply_id,a.wsm_num,a.error_num,a.wait_num,a.status,a.check_name,a.checkid,b.bkcode,'' cgder_id,'' cgder,b.good_createrid,b.good_creater,c.name wsm_name,b.supplierNo,b.supplier_name,c.supplierNo wsm_supplierNo,c.supplierName wsm_supplier,b.companyNo,b.companyName")
             ->order("a.addtime desc")
             ->select()
             ->toArray();
@@ -152,11 +152,15 @@ class Purchin extends Base
 
         //获取采购单供应商和仓库供应商的名称
         $userCommon = \app\admin\common\User::getIns();
-        $names = $userCommon->handle('getCodeAndName',['code'=>array_unique(array_merge(array_column($list,'companyNo'),array_column($list,'wsm_supplierNo')))]);
+//        $names = $userCommon->handle('getCodeAndName',['code'=>array_unique(array_column($list,'wsm_supplierNo'))]);
+        $all_supplierNos = array_unique(array_column($list,'supplierNo'));
 
-        $all_supplier = $userCommon->handle('sGetList',['more_code'=>array_column($list,'supplierNo'),'page'=>1,'size'=>$size]);
+        $all_supplier = $userCommon->handle('sGetList',['more_code'=>$all_supplierNos,'page'=>1,'size'=>$size]);
         $all_supplier_list = array_column($all_supplier['data']['list'],null,'code');
 
+        //校验是否开通了供应商账号
+        $supp_account = checkHasAccountBySupplierNos($all_supplierNos);
+
         $data=[];
         foreach ($list as $value){
 
@@ -211,8 +215,8 @@ class Purchin extends Base
 //                ->field("k.name as wsm_name,c.name,c.code")
 //                ->find();
 //            $value['wsm_name'] = $wsmcode['wsm_name'];
-            $value['wsm_supplier'] = $names['data'][$value['wsm_supplierNo']]??'';
-            $value['companyName'] = $names['data'][$value['companyNo']]??'';
+//            $value['wsm_supplier'] = $names['data'][$value['wsm_supplierNo']]??'';
+//            $value['companyName'] = $names['data'][$value['companyNo']]??'';
 //            $value['wsm_supplierNo'] = $wsmcode['code'];
 
             $value['company_name'] = $item[$value['apply_id']]??'';
@@ -221,6 +225,8 @@ class Purchin extends Base
 //            $value['is_allow_update'] = 0;
 //            if (in_array($this->roleid, [1, 33]) || in_array($value['apply_id'], $role[DataGroupModel::$type_可编辑])) $value['is_allow_update'] = 1;
 
+            $value['has_account'] = (int)isset($supp_account[$value['supplierNo']]);
+
             $data[]=$value;
         }
 
@@ -1959,28 +1965,32 @@ class Purchin extends Base
             ->leftJoin("good_basic c","c.spuCode=b.spuCode")
             ->where($where)
             ->page($page,$size)
-            ->field("a.*,b.spuCode,b.good_price,b.order_type,b.good_price,b.total_fee,b.good_name,b.order_source,c.is_stock,b.supplierNo,b.supplier_name,b.companyNo")
+            ->field("a.*,b.spuCode,b.good_price,b.order_type,b.good_price,b.total_fee,b.good_name,b.order_source,c.is_stock,b.supplierNo,b.supplier_name,b.companyNo,b.companyName")
             ->order("a.addtime desc")
             ->select()
             ->toArray();
         $data=[];
 
-        $userCommon = \app\admin\common\User::getIns();
-        $names = $userCommon->handle('getCodeAndName',['code'=>array_unique(array_column($list,'companyNo'))]);
+//        $userCommon = \app\admin\common\User::getIns();
+//        $names = $userCommon->handle('getCodeAndName',['code'=>array_unique(array_column($list,'companyNo'))]);
 
+        //校验是否开通了供应商账号
+        $supp_account = checkHasAccountBySupplierNos(array_unique(array_column($list,'supplierNo')));
+        
         foreach ($list as $value){
             if (in_array($value['order_type'], [3, 4])) {
-                $goon = Db::name("good_zixun")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
+                $goon = Db::name("good_zixun")->field('cat_id')->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
             }else {
-                $goon =Db::name('good_basic')->where(['spuCode'=>$value['spuCode']])->find();
+                $goon =Db::name('good_basic')->field('cat_id')->where(['spuCode'=>$value['spuCode']])->find();
             }
             $value['can']= isset($goon['cat_id']) && $goon['cat_id'] !=0 ? made($goon['cat_id']):[];
             $value['return_fee']= round($value['good_price']*$value['return_num'],2);
 
+            $value['has_account'] = (int)isset($supp_account[$value['supplierNo']]);
             //是否具有编辑权限
 //            $value['is_allow_update'] = 0;
 //            if (in_array($this->roleid, [1, 33]) || in_array($value['apply_id'], $role[DataGroupModel::$type_可编辑])) $value['is_allow_update'] = 1;
-            $value['companyName'] = $names['data'][$value['companyNo']]??'';
+//            $value['companyName'] = $names['data'][$value['companyNo']]??'';
 
             $data[]=$value;
         }

app/admin/controller/Reorder.php

@@ -514,6 +514,9 @@ class Reorder extends Base
 //		 $userCommon = \app\admin\common\User::getIns();
 //        $names = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'supplierNo'),array_column($list,'customer_code'))]);
 
+        //校验是否开通了供应商账号
+        $supp_account = checkHasAccountBySupplierNos(array_unique(array_column($list,'supplierNo')));
+
         $data = [];
         foreach ($list as $value) {
 //            $value['error_msg']='';
@@ -531,6 +534,7 @@ class Reorder extends Base
             //是否具有编辑权限
 //            $value['is_allow_update'] = 0;
 //            if (in_array($this->roleid, [1, 33]) || in_array($value['apply_id'], $role[DataGroupModel::$type_可编辑])) $value['is_allow_update'] = 1;
+            $value['has_account'] = (int)isset($supp_account[$value['supplierNo']]);
 
             $data[] = $value;
         }