|
@@ -123,7 +123,7 @@ class InvoiceOrderService extends Service
|
|
|
|
|
|
$order = InvoiceOrder::where('order_number',$data['order_number'])
|
|
|
->where('del_time',0)
|
|
|
- ->select('id','order_number','sales_order_id','send','send_time','take','take_address','take_phone','logistics_company','logistics_number','crt_id','mark','state')
|
|
|
+ ->select('id','order_number','sales_order_id','send','send_time','take','take_address','take_phone','logistics_company','logistics_number','crt_id','mark','state','crt_time')
|
|
|
->first();
|
|
|
if(empty($order)) return [false, '发货订单不存在或已被删除'];
|
|
|
$order = $order->toArray();
|
|
@@ -131,7 +131,7 @@ class InvoiceOrderService extends Service
|
|
|
$sales = SalesOrder::where('id',$order['sales_order_id'])->value('order_number');
|
|
|
$order['sales_order_number'] = $sales;
|
|
|
|
|
|
- $emp_map = Employee::whereIn('id',array_unique(array_merge_recursive([$order['crt_id'],[$order['send']]])))
|
|
|
+ $emp_map = Employee::whereIn('id',array_unique(array_merge_recursive([$order['crt_id']],[$order['send']])))
|
|
|
->pluck('emp_name','id')
|
|
|
->toArray();
|
|
|
$info = InvoiceOrderInfo::where('del_time',0)
|