Browse Source

供应商是否有启用账号

wufeng 2 years ago
parent
commit
9465742a5e
2 changed files with 15 additions and 7 deletions
  1. 11 7
      app/admin/controller/Purch.php
  2. 4 0
      app/admin/controller/Sale.php

+ 11 - 7
app/admin/controller/Purch.php

@@ -65,20 +65,17 @@ class Purch extends Base
             //$where['good_name'] = Db::raw(" like %{$good_name}%");
             $where[]=['po.good_name',"like", "%{$good_name}%"];
         }
-        $good_code = isset($this->post['good_code']) && $this->post['good_code']!="" ? trim($this->post['good_code'])
-            :"";
+        $good_code = isset($this->post['good_code']) && $this->post['good_code']!="" ? trim($this->post['good_code']) :"";
         if($good_code!=""){
             // $where['good_code'] = Db::raw(" like %{$good_code}%");
             $where[]=['po.spuCode',"like", "%{$good_code}%"];
         }
-        $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo']!="" ? trim($this->post['supplierNo'])
-            :"";
+        $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo']!="" ? trim($this->post['supplierNo']) :"";
         if($supplierNo!=""){
             // $where['good_code'] = Db::raw(" like %{$good_code}%");
             $where[]=['po.supplierNo',"like", "%{$supplierNo}%"];
         }
-        $wsm_supplierNo = isset($this->post['wsm_supplierNo']) && $this->post['wsm_supplierNo']!="" ? trim($this->post['wsm_supplierNo'])
-            :"";
+        $wsm_supplierNo = isset($this->post['wsm_supplierNo']) && $this->post['wsm_supplierNo']!="" ? trim($this->post['wsm_supplierNo']) :"";
         if($wsm_supplierNo!=""){
             $supplier = Db::name("supplier")->where(["code"=>$wsm_supplierNo])->find();
             if(empty($supplier)){
@@ -135,7 +132,10 @@ class Purch extends Base
             ->where(function($query) use ($where){$query->whereOr([['po.order_type', '<>', 1],['po.order_source', '=', 0]]);})
             ->page($page,$size)
             ->order("po.addtime desc")
-            ->cursor();
+            ->select()
+            ->toArray();
+
+        $account = checkHasAccountBySupplierNos(array_column($list,'supplierNo'));
         $data=[];
         foreach ($list as $value){
             $value['wsm_name']="";
@@ -181,6 +181,8 @@ class Purch extends Base
             //补充orderCode
 //            $value['orderCode']=isset($all_orderCodes[$value['cgdNo']])?$all_orderCodes[$value['cgdNo']]:'';
             $value['company_name'] = implode('/', array_column(GetPart($value['itemid']), 'name'));
+
+            $value['has_account'] = (int)isset($account[$value['supplierNo']]);
             $data[]=$value;
         }
         return app_show(0,"获取成功",["list"=>$data ,"count"=>$count]);
@@ -335,6 +337,8 @@ class Purch extends Base
                 ->find();
         }
 
+        $data['has_account'] = (int)isset(checkHasAccountBySupplierNos([$data['supplierNo']])[$data['supplierNo']]);
+
         return app_show(0, "获取成功", $data);
     }
 

+ 4 - 0
app/admin/controller/Sale.php

@@ -3382,6 +3382,10 @@ class Sale extends Base
         $codeinfo['order_source'] = $item['order_source'];
         $orderReturn = Db::name("order_return")->where(["outCode" => $outCode, "is_del" => 0])->order("id desc")->find();
         $codeinfo['order_return'] = $orderReturn;
+
+        //获取销售订单对应的供应商是否有启用账号
+        $has_account = checkHasAccountBySupplierNos([$item['supplierNo']]);
+        $codeinfo['has_account'] = (int)isset($has_account[$item['supplierNo']]);
         return app_show(0, "获取成功", $codeinfo);
     }