|
|
@@ -1397,7 +1397,7 @@ class SaleReport extends Base
|
|
|
$where = [['b.is_del', '=', 0], ['b.send_type', '=', 2]];//send_type==2 延迟发货
|
|
|
if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['a.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
|
|
|
if ($param['start_sendtime'] != '' && $param['end_sendtime'] != '') $where[] = ['a.sendtime', 'between', [$param['start_sendtime'] . ' 00:00:00', $param['end_sendtime'] . ' 23:59:59']];
|
|
|
- if ($param['status'] != '') $where[] = ['a.status', '=', $param['status']];
|
|
|
+ if ($param['status'] != '') $where[] = ['b.status', '=', $param['status']];
|
|
|
if ($param['apply_company'] != '') $where[] = ['ci.name', 'like', '%' . $param['apply_company'] . '%'];
|
|
|
if ($param['order_type'] != '') $where[] = ['b.order_type', '=', $param['order_type']];
|
|
|
|
|
|
@@ -1470,7 +1470,7 @@ class SaleReport extends Base
|
|
|
$where = [['b.is_del', '=', 0], ['b.send_type', '=', 2]];//send_type==2 延迟发货
|
|
|
if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['a.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
|
|
|
if ($param['start_sendtime'] != '' && $param['end_sendtime'] != '') $where[] = ['a.sendtime', 'between', [$param['start_sendtime'] . ' 00:00:00', $param['end_sendtime'] . ' 23:59:59']];
|
|
|
- if ($param['status'] != '') $where[] = ['a.status', '=', $param['status']];
|
|
|
+ if ($param['status'] != '') $where[] = ['b.status', '=', $param['status']];
|
|
|
if ($param['apply_company'] != '') $where[] = ['ci.name', 'like', '%' . $param['apply_company'] . '%'];
|
|
|
if ($param['order_type'] != '') $where[] = ['b.order_type', '=', $param['order_type']];
|
|
|
|
|
|
@@ -1537,7 +1537,7 @@ class SaleReport extends Base
|
|
|
$where = [['b.send_type', '=', 1]];//send_type==1 直接发货
|
|
|
if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['a.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
|
|
|
if ($param['start_sendtime'] != '' && $param['end_sendtime'] != '') $where[] = ['a.sendtime', 'between', [$param['start_sendtime'] . ' 00:00:00', $param['end_sendtime'] . ' 23:59:59']];
|
|
|
- if ($param['status'] != '') $where[] = ['a.status', '=', $param['status']];
|
|
|
+ if ($param['status'] != '') $where[] = ['b.status', '=', $param['status']];
|
|
|
if ($param['apply_company'] != '') $where[] = ['ci.name', 'like', '%' . $param['apply_company'] . '%'];
|
|
|
if ($param['order_type'] != '') $where[] = ['b.order_type', '=', $param['order_type']];
|
|
|
|
|
|
@@ -1599,7 +1599,7 @@ class SaleReport extends Base
|
|
|
$where = [['b.send_type', '=', 1]];//send_type==1 直接发货
|
|
|
if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['a.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
|
|
|
if ($param['start_sendtime'] != '' && $param['end_sendtime'] != '') $where[] = ['a.sendtime', 'between', [$param['start_sendtime'] . ' 00:00:00', $param['end_sendtime'] . ' 23:59:59']];
|
|
|
- if ($param['status'] != '') $where[] = ['a.status', '=', $param['status']];
|
|
|
+ if ($param['status'] != '') $where[] = ['b.status', '=', $param['status']];
|
|
|
if ($param['apply_company'] != '') $where[] = ['ci.name', 'like', '%' . $param['apply_company'] . '%'];
|
|
|
if ($param['order_type'] != '') $where[] = ['b.order_type', '=', $param['order_type']];
|
|
|
|
|
|
@@ -1668,7 +1668,8 @@ class SaleReport extends Base
|
|
|
$cgd_sql = Db::name('sale')
|
|
|
->alias('a')
|
|
|
->field('a.orderCode')
|
|
|
- ->leftJoin("order_addr b", "b.orderCode=a.orderCode AND b.is_del=0")->leftJoin("depart_user u", "u.uid=a.apply_id AND u.is_del=0 AND u.status=1")
|
|
|
+ ->leftJoin("order_addr b", "b.orderCode=a.orderCode AND b.is_del=0")
|
|
|
+ ->leftJoin("depart_user u", "u.uid=a.apply_id AND u.is_del=0 AND u.status=1")
|
|
|
->leftJoin("company_item ci", "ci.id=u.itemid")
|
|
|
->where($where)
|
|
|
->order("a.addtime desc")
|
