Merge branch 'order_delivering_change' into zengjun

app/Http/Controllers/OrderController.php

@@ -11,6 +11,7 @@ use App\Services\LogisticService;
 use App\Services\LogService;
 use App\Services\OrderPackageService;
 use App\Services\OrderService;
+use App\Services\OwnerService;
 use App\Services\RejectedBillItemService;
 use App\Services\RejectedBillService;
 use GuzzleHttp\Exception\GuzzleException;
@@ -38,7 +39,7 @@ class OrderController extends Controller
         $orderService->tagOrderByOrderIssue($orders);
         app('WorkOrderService')->tagWorkOrder($orders);
         $commodities = $result['commodities'];
-        $customers =  app('OracleBasCustomerService')->getCustomers($codes ?? null);
+        $customers = app(OwnerService::class)->getIntersectPermitting(['code','name']);
         $page = $request["page"] ?? 1;
         $codes = DB::connection('oracle')->table('BAS_CODES')->select('code', 'codename_c')->where('codeid', 'SO_STS')->orderBy('code', 'asc')->get();
         $orderIssueType = OrderIssueType::all();

resources/views/order/index/delivering.blade.php

@@ -348,7 +348,7 @@
                 owners: [
                         @foreach($customers as $customer)
                     {
-                        name: '{{$customer->customerid}}', value: '{{$customer->descr_c}}'
+                        name: '{{$customer->code}}', value: '{{$customer->name}}'
                     },
                     @endforeach
                 ],