cqpCow 11 månader sedan
förälder
incheckning
1c6a4c6e3b
1 ändrade filer med 16 tillägg och 1 borttagningar
  1. 16 1
      app/Service/SalesOrderService.php

+ 16 - 1
app/Service/SalesOrderService.php

@@ -14,6 +14,7 @@ use App\Model\OrderOperation;
 use App\Model\PaymentReceipt;
 use App\Model\PaymentReceiptInfo;
 use App\Model\Product;
+use App\Model\PurchaseOrder;
 use App\Model\ReturnExchangeOrder;
 use App\Model\SalesOrder;
 use App\Model\SalesOrderInfo;
@@ -947,7 +948,7 @@ class SalesOrderService extends Service
             ->pluck('title','id')
             ->toArray();
 
-        $product = $employee_two = [];
+        $product = $employee_two = $purchase = [];
         if(! empty($ergs['product'])){
             $sales_p_info = SalesOrderProductInfo::where('del_time',0)
                 ->whereIn('sales_order_id',array_column($data['data'],'id'))
@@ -987,6 +988,19 @@ class SalesOrderService extends Service
                 }
             }
         }
+        if(! empty($ergs['purchase'])){
+            $order = PurchaseOrder::where('del_time',0)
+                ->whereIn('sales_order_id',array_column($data['data'],'id'))
+                ->select('sales_order_id','order_number')
+                ->get()->toArray();
+            foreach ($order as $value){
+                if(isset($purchase[$value['sales_order_id']])){
+                    $purchase[$value['sales_order_id']] .= ',' . $value['order_number'];
+                }else{
+                    $purchase[$value['sales_order_id']] = $value['order_number'];
+                }
+            }
+        }
 
         $for_amount_list = (new PaymentReceiptService())->getPaymentReceiptDataCountList($data['data']);
         $getDifferentAmountALL = (new ReturnExchangeOrderService())->getDifferentAmountALL(array_column($data['data'],'id'));
@@ -1023,6 +1037,7 @@ class SalesOrderService extends Service
             $data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
             $data['data'][$key]['product'] = $product[$value['id']] ?? [];
             $data['data'][$key]['employee_two_title'] = $employee_two[$value['id']] ?? "";
+            $data['data'][$key]['purchase'] = $purchase[$value['id']] ?? "";
             $data['data'][$key]['fee'] = $fee[$value['id']] ?? "";
             if($value['sales_order_type'] == SalesOrder::Order_type_one){
                 if($value['model_type'] == SalesOrder::Model_type_four){