cqpCow преди 1 година
родител
ревизия
74db50cb21
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 2 2
      app/Service/InvoiceOrderService.php
  2. 1 1
      app/Service/SalesOrderService.php

+ 2 - 2
app/Service/InvoiceOrderService.php

@@ -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)

+ 1 - 1
app/Service/SalesOrderService.php

@@ -519,7 +519,7 @@ class SalesOrderService extends Service
             $sales_o_info = SalesOrderOtherFee::where('del_time',0)
                 ->where('sales_order_id',array_column($data['data'],'id'))
                 ->get()->toArray();
-            foreach ($sales_p_info as $value){
+            foreach ($sales_o_info as $value){
                 $fee[$value['sales_order_id']][] = $value;
             }
         }