|
|
@ -220,7 +220,7 @@ class Order extends Api |
|
|
|
->where('order.warehouse_id', $warehouse_id) |
|
|
|
->where('order.warehouse_id', $warehouse_id) |
|
|
|
->where('order.order_type',1) |
|
|
|
->where('order.order_type',1) |
|
|
|
->where('order.status', 3) |
|
|
|
->where('order.status', 3) |
|
|
|
->where('goods.status', 'normal') |
|
|
|
// ->where('goods.status', 'normal') |
|
|
|
->where('order.user_id', "<>", $user['id']) |
|
|
|
->where('order.user_id', "<>", $user['id']) |
|
|
|
->group('order.id') |
|
|
|
->group('order.id') |
|
|
|
->order('goods.status', 'desc') |
|
|
|
->order('goods.status', 'desc') |
|
|
|