wugg 1 year ago
parent
commit
47d0bebc42
2 changed files with 4 additions and 1 deletions
  1. 2 0
      app/admin/controller/Reorder.php
  2. 2 1
      app/admin/controller/SupplierClient.php

+ 2 - 0
app/admin/controller/Reorder.php

@@ -508,6 +508,8 @@ class Reorder extends Base
 
         $use_type = $this->post['use_type']??'';
         if($use_type!=='') $where[]=['p.use_type','=',$use_type];
+        $order_type = $this->post['order_type']??'';
+          if($order_type!=='') $where[]=['sr.order_type','=',$order_type];
 //        $customer_code = trim($this->post['customer_code']??'');
 //        $where[]=['b.customer_code', "like", "%{$customer_code}%"];
 

+ 2 - 1
app/admin/controller/SupplierClient.php

@@ -1117,7 +1117,8 @@ class SupplierClient extends Base {
 
         $use_type = $this->post['use_type']??'';
         if($use_type!=='') $where[]=['p.use_type','=',$use_type];
-
+        $order_type = $this->post['order_type']??'';
+          if($order_type!=='') $where[]=['sr.order_type','=',$order_type];
         $count=Db::name("sale_return")
             ->alias('sr')
             ->leftJoin("sale b", "b.orderCode=sr.orderCode AND b.is_del=0")