Merge branch 'master-new-dev-wf' of wugg/phpstock into master-new

app/admin/controller/SupplierClient.php

@@ -790,15 +790,15 @@ class SupplierClient extends Base {
         if ($param['orderCode'] != "") $where[] = ['a.orderCode', "like", "%{$param['orderCode']}%"];
         if ($param['good_code'] != "") $where[] = ['a.good_code', "like", "%{$param['good_code']}%"];
         if ($param['good_name'] != "") $where[] = ['a.good_name', "like", "%{$param['good_name']}%"];
-        if ($param['customer_code'] != "") $where[] = ['c.customer_code', "like", "%{$param['customer_code']}%"];
+        if ($param['customer_code'] != "") $where[] = ['a.customer_code', "like", "%{$param['customer_code']}%"];
         if ($param['except_code'] != "") $where[] = ['a.except_code', "=", $param['except_code']];
         if ($param['apply_name'] != "") $where[] = ['a.apply_name', "like", "%{$param['apply_name']}%"];
         if ($param['start'] !== "") $where[] = ['a.addtime', ">=", $param['start']];
         if ($param['end'] !== "") $where[] = ['a.addtime', "<=", $param['end']];
         if ($param['order_source'] !== "") $where[] = ['c.order_source', "=", $param['order_source']];
-        if ($param['supplierNo'] !== "") $where[] = ['c.supNo', "like", '%' . $param['supplierNo'] . '%'];
-        if ($param['companyNo'] !== "") $where[] = ['c.supplierNo', "like", '%' . $param['companyNo'] . '%'];
-
+        if ($param['supplierNo'] !== "") $where[] = ['a.supplierNo', "like", '%' . $param['supplierNo'] . '%'];
+        if ($param['companyNo'] !== "") $where[] = ['a.companyNo', "like", '%' . $param['companyNo'] . '%'];
+        if ($param['relaComNo'] !== "") $where[] = ['a.companyNo', "like", '%' . $param['companyNo'] . '%'];
 
         $condition = [];
 
@@ -812,12 +812,12 @@ class SupplierClient extends Base {
                 $condition[] = ["a.apply_id", "in", $arr];
                 $condition[] = ["a.cgderid", "in", $hand];
             }
-            if ($param['relaComNo'] !== '') $where[] = ['c.supplierNo', "=", $param['relaComNo']];
+//            if ($param['relaComNo'] !== '') $where[] = ['c.supplierNo', "=", $param['relaComNo']];
         }
 
-        //level3账号不允许看到库存品订单
+        //level3账号不允许看到库存品订单,暂时该过滤条件废弃
         if ($this->level == 3){
-        	 $where[] = ['c.supNo', '=', $param['relaComNo']];
+//        	 $where[] = ['c.supNo', '=', $param['relaComNo']];
         }
 //        $condition .="a.cgderid in {$hand} or a.person_id in {$hand} or a.apply_id in ("
 //        .implode(',',$role[DataGroupModel::$type_全部]).")";
@@ -885,11 +885,9 @@ class SupplierClient extends Base {
         }
         $customer_code = isset($this->post['customer_code']) && $this->post['customer_code'] != "" ? trim($this->post['customer_code']) : "";
         if ($customer_code != "") {
-            $where[] = ['b.customer_code', "like", "%{$customer_code}%"];
+            $where[] = ['a.customer_code', "like", "%{$customer_code}%"];
         }
 
-
-
         $order_code = isset($this->post['order_code']) && $this->post['order_code'] != "" ? trim($this->post['order_code']) : "";
         if ($order_code != "") {
             $where[] = ['a.orderCode', "like", "%{$order_code}%"];
@@ -917,11 +915,14 @@ class SupplierClient extends Base {
         }
 
         $supplierNo = trim($this->post['supplierNo'] ?? '');
-        if ($supplierNo !== '') $where[] = ['b.supNo', 'like', '%'.$supplierNo.'%'];
+        if ($supplierNo !== '') $where[] = ['a.supplierNo', 'like', '%'.$supplierNo.'%'];
 
         $companyNo = trim($this->post['companyNo'] ?? '');
-        if ($companyNo !== '') $where[] = ['b.supplierNo', 'like', '%'.$companyNo.'%'];
-        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] != "" ? trim($this->post['relaComNo']) : "";
+        if ($companyNo !== '') $where[] = ['a.companyNo', 'like', '%'.$companyNo.'%'];
+
+        $relaComNo = trim($this->post['relaComNo'] ?? '');
+        if ($relaComNo !== '') $where[] = ['a.companyNo', 'like', '%'.$relaComNo.'%'];
+
         $condition = [];
         //只有level2的账号过滤数据权限
         if ($this->level == 2) {
@@ -932,13 +933,13 @@ class SupplierClient extends Base {
                 $condition[] = ['a.apply_id', 'in', $arr];
                 $condition[] = ['a.cgderid', 'in', $hand];
             }
-            if ($relaComNo != "") $where[] = ['b.supplierNo', '=', $relaComNo];
+//            if ($relaComNo != "") $where[] = ['b.supplierNo', '=', $relaComNo];
         }
 
         //供应商账号不允许看到库存品数据
-        if ($this->level == 3) {
-        	 $where[] = ['b.supNo', '=', $relaComNo];
-        }
+//        if ($this->level == 3) {
+//        	 $where[] = ['b.supNo', '=', $relaComNo];
+//        }
         $count = Db::name("order_back")
             ->alias('a')
             ->leftJoin('sale b', 'b.orderCode=a.orderCode AND b.is_del=0')
@@ -1032,18 +1033,19 @@ class SupplierClient extends Base {
         if ($supplierNo !== "") $where[] = ['b.supNo', "like", '%' . $supplierNo . '%'];
 
         $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] != "" ? trim($this->post['companyNo']) : "";
-        if ($companyNo !== "") $where[] = ['b.supplierNo', "like", '%' . $companyNo . '%'];
+        if ($companyNo !== "") $where[] = ['sr.companyNo', "like", '%' . $companyNo . '%'];
 
         $customer_code = isset($this->post['customer_code']) && $this->post['customer_code'] != "" ? trim($this->post['customer_code']) : "";
-        if ($customer_code !== "") $where[] = ['b.customer_code', "like", '%' . $customer_code . '%'];
+        if ($customer_code !== "") $where[] = ['sr.customer_code', "like", '%' . $customer_code . '%'];
 
         $order_source = $order_source = isset($this->post['order_source']) && $this->post['order_source'] != "" ? trim($this->post['order_source']) : "";
         if ($order_source !== "") $where[] = ['b.order_source', "=", $order_source];
 
+	    $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] != "" ? trim($this->post['relaComNo']) : "";
+        if ($relaComNo != "") $where[] = ['sr.companyNo', '=', $relaComNo];
 
         $condition=[];
 
-	    $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] != "" ? trim($this->post['relaComNo']) : "";
         //只有level2的账号过滤数据权限
         if ($this->level == 2) {
             $role = $this->checkDataShare();
@@ -1057,13 +1059,13 @@ class SupplierClient extends Base {
                 $condition[] = ["sr.cgderid", "in", $hand];
                 $condition[] = ["sr.person_id", "in", $hand];
             }
-             if ($relaComNo != "") $where[] = ['sr.companyNo', '=', $relaComNo];
+//             if ($relaComNo != "") $where[] = ['sr.companyNo', '=', $relaComNo];
         }
 
         //供应商账号不允许看到库存品数据
-        if ($this->level == 3){
-        	 $where[] = ['b.supNo', '=', $relaComNo];
-        }
+//        if ($this->level == 3){
+//        	 $where[] = ['b.supNo', '=', $relaComNo];
+//        }
 		if(in_array($this->roleid,config('app.wsm_cgder_role'))){
 			$where[]=["b.order_type","=",1];
 		}