wugg 2 rokov pred
rodič
commit
f7ceee118a

+ 16 - 1
app/admin/controller/OrderInv.php

@@ -969,7 +969,10 @@ class OrderInv extends BaseController{
         if($invNo!==""){
            $condition[]=["a.invNo","like","%$invNo%"];
         }
-
+        $relaComNo= isset($post['relaComNo'])&&$post['relaComNo']!="" ? trim($post['relaComNo']) :"";
+         if($relaComNo!=""){
+            $condition[]=["a.inv_out","=",$relaComNo];
+        }
         $inv_number = isset($this->post['inv_number'])&&$this->post['inv_number']!=="" ? trim($this->post['inv_number']):"";
         if($inv_number!==""){
            $condition[]=["c.inv_number","like","%$inv_number%"];
@@ -1053,6 +1056,10 @@ class OrderInv extends BaseController{
         if($companyNo!=""){
             $condition[]=["b.inv_out","=",$companyNo];
         }
+        $relaComNo= isset($post['relaComNo'])&&$post['relaComNo']!="" ? trim($post['relaComNo']) :"";
+         if($relaComNo!=""){
+            $condition[]=["b.inv_out","=",$relaComNo];
+        }
         if($start!=""){
             $condition[]=["a.addtime",">=",$start." 00:00:00"];
         }
@@ -1506,6 +1513,10 @@ class OrderInv extends BaseController{
           $companyNo=isset($this->post["companyNo"])&&$this->post["companyNo"]!=''?trim($this->post["companyNo"]):"";
         if($companyNo!=''){
         	$condition[]=["inv_out","=",$companyNo];
+        }
+         $relaComNo= isset($post['relaComNo'])&&$post['relaComNo']!="" ? trim($post['relaComNo']) :"";
+         if($relaComNo!=""){
+            $condition[]=["inv_out","=",$relaComNo];
         }
          $apply_name=isset($this->post["apply_name"])&&$this->post["apply_name"]!=''?trim($this->post["apply_name"]):"";
         if($apply_name!=''){
@@ -1851,6 +1862,10 @@ class OrderInv extends BaseController{
          $companyNo = isset($this->post['companyNo'])&&$this->post['companyNo']!=="" ? trim($this->post['companyNo']):"";
         if($companyNo!==""){
            $condition[]=["c.inv_out","=",$companyNo];
+        }
+         $relaComNo= isset($post['relaComNo'])&&$post['relaComNo']!="" ? trim($post['relaComNo']) :"";
+         if($relaComNo!=""){
+            $condition[]=["c.inv_out","=",$relaComNo];
         }
          $apply_id = isset($this->post['apply_id'])&&$this->post['apply_id']!=="" ? intval($this->post['apply_id']):"";
         if($apply_id!==""){

+ 16 - 0
app/admin/controller/OrderPay.php

@@ -265,6 +265,10 @@ class OrderPay extends BaseController{
         $companyNo =isset($this->post['companyNo'])&&$this->post['companyNo']!=""? trim($this->post['companyNo']):"";
          if($companyNo!==""){
             $condition[]=["companyNo","=",$companyNo];
+        }
+          $relaComNo= isset($post['relaComNo'])&&$post['relaComNo']!="" ? trim($post['relaComNo']) :"";
+         if($relaComNo!=""){
+            $condition[]=["companyNo","=",$relaComNo];
         }
           if($tradNo!==""){
             $condition[]=["tradNo","like","%$tradNo%"];
@@ -318,6 +322,10 @@ class OrderPay extends BaseController{
         $companyNo =isset($this->post['companyNo'])&&$this->post['companyNo']!=""? trim($this->post['companyNo']):"";
          if($companyNo!==""){
             $condition[]=["a.companyNo","=",$companyNo];
+        }
+          $relaComNo= isset($post['relaComNo'])&&$post['relaComNo']!="" ? trim($post['relaComNo']) :"";
+         if($relaComNo!=""){
+            $condition[]=["companyNo","=",$relaComNo];
         }
          if($tradNo!==""){
             $condition[]=["a.tradNo","like","%$tradNo%"];
@@ -377,6 +385,10 @@ class OrderPay extends BaseController{
         $companyNo =isset($this->post['companyNo'])&&$this->post['companyNo']!=""? trim($this->post['companyNo']):"";
          if($companyNo!==""){
             $condition[]=["companyNo","=",$companyNo];
+        }
+          $relaComNo= isset($post['relaComNo'])&&$post['relaComNo']!="" ? trim($post['relaComNo']) :"";
+         if($relaComNo!=""){
+            $condition[]=["companyNo","=",$relaComNo];
         }
         $condition=[["is_del","=",0]];
           if($apply_id!==""){
@@ -499,6 +511,10 @@ class OrderPay extends BaseController{
         $companyNo =isset($this->post['companyNo'])&&$this->post['companyNo']!=""? trim($this->post['companyNo']):"";
          if($companyNo!==""){
             $condition[]=["a.companyNo","=",$companyNo];
+        }
+          $relaComNo= isset($post['relaComNo'])&&$post['relaComNo']!="" ? trim($post['relaComNo']) :"";
+         if($relaComNo!=""){
+            $condition[]=["a.companyNo","=",$relaComNo];
         }
         $condition=[["a.is_del","=",0]];
         if($tradNo!=''){

+ 13 - 1
app/admin/controller/Payment.php

@@ -69,7 +69,7 @@ class Payment extends BaseController
         }
         $relaComNo= isset($post['relaComNo'])&&$post['relaComNo']!="" ? trim($post['relaComNo']) :"";
          if($relaComNo!=""){
-            $condition.=" and `a`.`companyNo` = '$relaComNo'";
+            $condition.=" and (`a`.`companyNo` = '$relaComNo' or `a`.`supplierNo` = '$relaComNo')";
         }
 
         if($payNo!=""){
@@ -180,6 +180,10 @@ class Payment extends BaseController
         if($companyNo!==''){
             $condition[]=["companyNo","=",$companyNo];
         }
+        $relaComNo= isset($post['relaComNo'])&&$post['relaComNo']!="" ? trim($post['relaComNo']) :"";
+         if($relaComNo!=""){
+            $condition[]=["companyNo|supplierNo","=",$relaComNo];
+        }
         $companyName =  isset($post['companyName'])&&$post['companyName']!=''?trim($post['companyName']):'';
         if($companyName !=''){
             $condition[]=["companyName","like","%$companyName%"];
@@ -808,6 +812,10 @@ class Payment extends BaseController
         $companyNo = isset($post['companyNo']) && $post['companyNo']!='' ? trim($post['companyNo']) :"";
         if($companyNo!=""){
           $condition []=["companyNo","=",$companyNo];
+        }
+         $relaComNo= isset($post['relaComNo'])&&$post['relaComNo']!="" ? trim($post['relaComNo']) :"";
+         if($relaComNo!=""){
+            $condition[]=["companyNo|supplierNo","=",$relaComNo];
         }
         $companyName = isset($post['companyName']) && $post['companyName']!='' ? trim($post['companyName']) :"";
         if($companyName!=""){
@@ -1150,6 +1158,10 @@ class Payment extends BaseController
         $companyNo = isset($post['companyNo'])&&$post['companyNo']!='' ? trim($post['companyNo']):"";
         if($companyNo!=""){
         	 $condition[]=["b.companyNo","=",$companyNo];
+        }
+          $relaComNo= isset($post['relaComNo'])&&$post['relaComNo']!="" ? trim($post['relaComNo']) :"";
+         if($relaComNo!=""){
+            $condition[]=["b.companyNo|b.supplierNo","=",$relaComNo];
         }
         $supplierNo = isset($post['supplierNo'])&&$post['supplierNo']!='' ? trim($post['supplierNo']):"";
         if($supplierNo!=""){