wugg 1 year ago
parent
commit
95bb3f4b06

+ 2 - 2
app/admin/controller/SaleReport.php

@@ -2684,7 +2684,7 @@ class SaleReport extends Base
 	        'start_day' => date('Y-m-01'),
 	        'end_day' => date('Y-m-t')], 'post', 'trim');
 
-        $where = [['a.is_del', '=', 0]];
+        $where = [['a.is_del', '=', 0],['a.status',"<>",4]];
         if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
         if ($param['companyNo'] != '') $where[] = ['a.companyNo', 'like', '%' . $param['companyNo'] . '%'];
         if ($param['supplier_name'] != '') $where[] = ['a.supplier_name', 'like', '%' . $param['supplier_name'] . '%'];
@@ -2821,7 +2821,7 @@ class SaleReport extends Base
         $param = $this->request->only(['token', 'supplierNo' => '', 'companyNo' => '', 'supplier_name' => '','status' => '',
 	        'person_id' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
-        $where = [['a.is_del', '=', 0]];
+        $where = [['a.is_del', '=', 0],['a.status','<>',4]];
 
         if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
         if ($param['companyNo'] != '') $where[] = ['a.companyNo', 'like', '%' . $param['companyNo'] . '%'];

+ 2 - 2
app/admin/controller/SaleReportByRelaComNo.php

@@ -2820,7 +2820,7 @@ class SaleReportByRelaComNo extends Base
     {
         $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
-        $where = [['a.is_del', '=', 0], ['a.companyNo', '=', $this->relaComNo]];
+        $where = [['a.is_del', '=', 0], ['a.companyNo', '=', $this->relaComNo],['a.status','<>',4]];
         if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
         if ($param['supplier_name'] != '') $where[] = ['a.supplier_name', 'like', '%' . $param['supplier_name'] . '%'];
         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
@@ -2909,7 +2909,7 @@ class SaleReportByRelaComNo extends Base
     {
         $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
-        $where = [['a.is_del', '=', 0], ['a.companyNo', '=', $this->relaComNo]];
+        $where = [['a.is_del', '=', 0], ['a.companyNo', '=', $this->relaComNo],['a.status','<>',4]];
 
         if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
         if ($param['supplier_name'] != '') $where[] = ['a.supplier_name', 'like', '%' . $param['supplier_name'] . '%'];