|
@@ -280,7 +280,7 @@ class FyyOrderService extends Service
|
|
|
$list = [];
|
|
$list = [];
|
|
|
if($data['type'] == 1){
|
|
if($data['type'] == 1){
|
|
|
$list = SaleOrdersProduct::where('del_time',0)
|
|
$list = SaleOrdersProduct::where('del_time',0)
|
|
|
- ->select('order_no','out_order_no')
|
|
|
|
|
|
|
+ ->select('order_no','out_order_no','customer_name')
|
|
|
->where('box_num', '>', 0)
|
|
->where('box_num', '>', 0)
|
|
|
->whereColumn('order_quantity', '>', 'shipment_num')
|
|
->whereColumn('order_quantity', '>', 'shipment_num')
|
|
|
->groupBy('order_no')
|
|
->groupBy('order_no')
|
|
@@ -288,7 +288,7 @@ class FyyOrderService extends Service
|
|
|
->get()->toArray();
|
|
->get()->toArray();
|
|
|
}elseif($data['type'] == 2){
|
|
}elseif($data['type'] == 2){
|
|
|
$list = SaleOrdersProduct::where('del_time',0)
|
|
$list = SaleOrdersProduct::where('del_time',0)
|
|
|
- ->select('order_no','out_order_no')
|
|
|
|
|
|
|
+ ->select('order_no','out_order_no','customer_name')
|
|
|
->whereColumn('order_quantity', '>', 'box_num')
|
|
->whereColumn('order_quantity', '>', 'box_num')
|
|
|
->groupBy('order_no')
|
|
->groupBy('order_no')
|
|
|
->orderBy('id','desc')
|
|
->orderBy('id','desc')
|
cqpCow