|
@@ -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'] . '%'];
|