|
@@ -303,6 +303,9 @@ class FyyOrderService extends Service
|
|
$list = SaleOrdersProduct::where('del_time',0)
|
|
$list = SaleOrdersProduct::where('del_time',0)
|
|
->select('order_no','out_order_no','customer_name')
|
|
->select('order_no','out_order_no','customer_name')
|
|
// ->whereColumn('order_quantity', '>', 'box_num')
|
|
// ->whereColumn('order_quantity', '>', 'box_num')
|
|
|
|
+ ->where(function ($query){
|
|
|
|
+ $query->whereColumn('order_quantity', '>', 'box_num')->orwhereColumn('box_num','=','order_quantity');
|
|
|
|
+ })
|
|
->groupBy('order_no')
|
|
->groupBy('order_no')
|
|
->orderBy('id','desc')
|
|
->orderBy('id','desc')
|
|
->get()->toArray();
|
|
->get()->toArray();
|