切换分支的无意义提交，忽略

app/Http/Controllers/OrderIssueController.php

@@ -76,15 +76,7 @@ class OrderIssueController extends Controller
         } else {
             $orderIssue = $orderIssueService->create($request->all());
         }
-        $msg = '';
-        if ($orderIssue == null) {
-            $msg = '创建订单问题件失败';
-        } else {
-            $msg = '创建订单问题件成功';
-        }
-        $owners = Owner::all();
-        $orderIssues = $orderIssueService->paginate($request->all());
-        OrderIssueProcessLog::create(['order_issue_id' => $orderIssue['id'], 'user_id' => Auth::user()['id'], 'content' => '创建订单问题件', 'type' => '创建']);
+        OrderIssueProcessLog::query()->create(['order_issue_id' => $orderIssue['id'], 'user_id' => Auth::user()['id'], 'content' => '创建订单问题件', 'type' => '创建']);
         return redirect('order/issue/index');
     }
 
@@ -180,6 +172,7 @@ class OrderIssueController extends Controller
         if (!$request->input('orderNos')) {
             return ['success' => false, 'fail_info' => '没有传入的订单编号'];
         }
+        /** @var OrderIssueService $orderIssueService */
         $orderIssueService = app('orderIssueService');
         return $orderIssueService->orderIssueTag($request->all());
     }

app/OrderPackage.php

@@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Model;
 
 class OrderPackage extends Model
 {
-    //
     use ModelTimeFormat;
 
     protected $fillable = ['order_id','logistic_number','batch_number',

app/Package.php

@@ -88,8 +88,8 @@ class Package extends Model
             $now = Carbon::now();
             array_push($packages,[
                 'batch_number'=>$batchCode??'',
+                'order_id' => app('orderIssueService')->createOrFindByOrderNo($resultOracleObj['orderno']),
                 'logistic_number'=>$resultOracleObj['SOReference5']??'',
-                'delivery_number'=>$resultOracleObj['SOReference5']??'',
                 'weight'=>$weight,
                 'weighed_at'=> $now,
                 'status'=>"已上传",

app/Providers/AppServiceProvider.php

@@ -8,6 +8,7 @@ use App\Services\AllInventoryService;
 use App\Services\InventoryDailyLogService;
 use App\Services\LogisticService;
 use App\Services\OracleActAllocationDetailService;
+use App\Services\OrderIssueService;
 use App\Services\OwnerService;
 use App\Services\PackageStatisticsService;
 use App\Services\ProcessMethodService;
@@ -77,5 +78,6 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('logisticService',LogisticService::class);
         app()->singleton('packageStatisticsService',PackageStatisticsService::class);
         app()->singleton('oracleActAllocationDetailService',OracleActAllocationDetailService::class);
+        app()->singleton('orderIssueService',OrderIssueService::class);
     }
 }

app/Services/OrderIssueService.php

@@ -188,33 +188,14 @@ class OrderIssueService
                 ->selectRaw('order_issue_types.`name` order_issue_type_name')
             ->leftJoin('orders','order_issues.order_id','orders.id')
                 ->selectRaw('orders.id order_id,orders.address,orders.district,orders.city,orders.province,orders.consignee_phone,orders.consignee_name,orders.client_code,orders.created_at order_created_at')
-          /*  ->leftJoin('order_packages','order_packages.order_id','orders.id')
-                ->selectRaw('order_packages.id order_package_id,order_packages.logistic_number order_package_logistic_name')
-            ->leftJoin('order_package_commodities','order_packages.id','order_package_commodities.order_package_id')
-                ->selectRaw('order_package_commodities.id order_package_commodity_id,order_package_commodities.amount commodity_amount')
-            ->leftJoin('commodities','order_package_commodities.commodity_id','commodities.id')
-                ->selectRaw('commodities.name commodity_name,commodities.sku commodity_sku')*/
             ->leftJoin('logistics','logistics.id','orders.logistic_id')
                 ->selectRaw('logistics.name logistic_name')
             ->leftJoin('owners','owners.id','orders.owner_id')
                 ->selectRaw('owners.name owner_name')
             ->leftJoin('shops','orders.shop_id','shops.id')
                 ->selectRaw('shops.name shop_name')
-/*            ->leftJoin('rejected_bills','order_issues.rejected_bill_id','rejected_bills.id')*/
-            /*->leftJoin('rejected_bill_items','rejected_bills.id','rejected_bill_items.id_rejected_bill')
-                ->selectRaw('rejected_bill_items.id rejected_bill_item_id,rejected_bill_items.remark,rejected_bill_items.amount rejected_bill_amount,rejected_bill_items.name_goods,rejected_bill_items.barcode_goods')*/
-            /*->leftJoin('order_issue_process_logs','order_issues.id','order_issue_process_logs.order_issue_id')
-                ->selectRaw('order_issue_process_logs.content log_content,order_issue_process_logs.type log_type')
-            ->leftJoin('users','order_issue_process_logs.user_id','users.id')
-                ->selectRaw('users.name user_name')*/
             ->leftJoin('orders as s_o','s_o.id','order_issues.second_order_id')
                 ->selectRaw('s_o.id s_o_id,s_o.client_code s_o_client_code')
-            /*->leftJoin('order_packages as s_o_p','s_o_p.order_id','s_o.id')
-                ->selectRaw('s_o_p.id s_o_p_id,s_o_p.logistic_number')
-            ->leftJoin('order_package_commodities as s_o_p_c','s_o_p_c.order_package_id','s_o_p.id')
-                ->selectRaw('s_o_p_c.id s_o_p_c_id,s_o_p_c.amount s_o_p_c_amount')
-            ->leftJoin('commodities as s_c','s_o_p_c.commodity_id','s_c.id')
-                ->selectRaw('s_c.sku s_c_sku,s_c.name s_c_name')*/
             ->leftJoin('logistics as s_logistics','s_o.logistic_id','s_logistics.id')
                 ->selectRaw('s_logistics.name s_logistics_name')
             ->leftJoin('user_workgroups','user_workgroups.id','order_issues.user_workgroup_id')
@@ -230,7 +211,6 @@ class OrderIssueService
             ->leftJoin('order_issue_on_tops', 'order_issue_on_tops.order_issue_id', '=', 'order_issues.id')
             ->whereNull('order_issue_on_tops.deleted_at')
             ->orderBy('order_issue_on_tops.updated_at', 'desc')->paginate($arr['paginate'] ?? 50);
-
     }
 
     public function orderIssueTag(array $arr)
@@ -243,7 +223,7 @@ class OrderIssueService
         }
         foreach ($orderNos as $orderNo) {
             $orderIssue = $this->createOrFindByOrderNo($orderNo);
-            OrderIssueProcessLog::create(['order_issue_id' => $orderIssue['id'], 'user_id' => Auth::user()['id'], 'content' => '标记创建订单问题件', 'type' => '创建']);
+            OrderIssueProcessLog::query()->create(['order_issue_id' => $orderIssue['id'], 'user_id' => Auth::user()['id'], 'content' => '标记创建订单问题件', 'type' => '创建']);
         }
         $meg['success'] = true;
         return $meg;
@@ -251,7 +231,7 @@ class OrderIssueService
 
     public function createOrFindByOrderNo($orderNo)
     {
-        $orderHeader = OracleDOCOrderHeader::where('orderNo', $orderNo)->first();
+        $orderHeader = OracleDOCOrderHeader::query()->where('orderNo', $orderNo)->first();
         if (!$orderHeader) {
             return null;
         }
@@ -262,7 +242,7 @@ class OrderIssueService
     {
         $orderService = app('orderService');
         $rejectedService = app('rejectedService');
-        $orderHeader = OracleDOCOrderHeader::where('SOREFERENCE1', $clientCode)->first();
+        $orderHeader = OracleDOCOrderHeader::query()->where('SOREFERENCE1', $clientCode)->first();
         if (!$orderHeader) {
             return null;
         }
@@ -270,7 +250,7 @@ class OrderIssueService
         $arr = [
             'order_id' => $order['id'],
         ];
-        $orderIssue = OrderIssue::create($arr);
+        $orderIssue = OrderIssue::query()->create($arr);
         if ($order->client_code) {
             $rejectedBill = $rejectedService->getRejectedByClientNo($clientCode);
             if ($rejectedBill) {
@@ -278,7 +258,7 @@ class OrderIssueService
                 $orderIssue->save();
             } else {
                 if ($orderHeader['orderno']) {
-                    $rejectedBill = RejectedBill::where('order_number', $orderHeader['orderno'])->first();
+                    $rejectedBill = RejectedBill::query()->where('order_number', $orderHeader['orderno'])->first();
                     if ($rejectedBill) {
                         $orderIssue->rejected_bill_id = $rejectedBill['id'];
                         $orderIssue->save();