编辑orderPackage中

app/OrderPackage.php

@@ -92,9 +92,10 @@ class OrderPackage extends Model
         $this['batch_number'] = $this->oracleInfo['waveno']??null;
     }
     static public function createPackagesFromBatchCode($batchCode,$weight){
-        $resultOracleObjs=OracleDOCOrderHeader::query()->select(self::$oracleOrderHeaderFields);
-        $resultOracleObjs->where('doc_order_header.waveno',$batchCode);
-        $resultOracleObjs->leftJoin('act_allocation_details','act_allocation_details.orderno','doc_order_header.orderno')->get();
+        $queryBuilder=OracleDOCOrderHeader::query()->select(self::$oracleOrderHeaderFields);
+        $queryBuilder->where('doc_order_header.waveno',$batchCode);
+        $queryBuilder->leftJoin('act_allocation_details','act_allocation_details.orderno','doc_order_header.orderno');
+        $resultOracleObjs=$queryBuilder->leftJoin('doc_wave_header','doc_wave_header.waveno','doc_order_header.waveno')->get();
         $packages = [];
         $now = Carbon::now();
         foreach($resultOracleObjs as $resultOracleObj){
@@ -109,8 +110,9 @@ class OrderPackage extends Model
                 "created_at"=>$now,
             ]);
         }
+//        OrderPackage::whereIn('logistic_number',$packages)
         DB::transaction(function ()use($packages){
-            Package::query()->insert($packages);
+            OrderPackage::query()->insert($packages);
         });
     }
     public function unifyThisMeasureUnderSameBatch(){

app/Providers/AppServiceProvider.php

@@ -10,6 +10,7 @@ use App\Services\AllInventoryService;
 use App\Services\InventoryDailyLogService;
 use App\Services\LogisticService;
 use App\Services\OracleActAllocationDetailService;
+use App\Services\OrderIssueService;
 use App\Services\OrderPackageService;
 use App\Services\OwnerService;
 use App\Services\PackageStatisticsService;
@@ -85,5 +86,6 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('oracleActAllocationDetailService',OracleActAllocationDetailService::class);
         app()->singleton('shopService',ShopService::class);
         app()->singleton('orderPackageService',OrderPackageService::class);
+        app()->singleton('orderIssueService',OrderIssueService::class);
     }
 }

app/Services/RejectedService.php

@@ -92,7 +92,7 @@ class RejectedService
         return $this->conditionQuery($request->input())->get();
     }
     public function getSql(array $param){
-        $sql = $this->conditionQuery($param)->selectRaw('rejected_bills.*')->whereNull('deleted_at')
+        $sql = $this->conditionQuery($param)->selectRaw('rejected_bills.*')->whereNull('rejected_bills.deleted_at')
             ->leftJoin('owners','rejected_bills.id_owner','=','owners.id')
             ->selectRaw('owners.name owner_name')
             ->leftJoin('logistics','rejected_bills.id_logistic_return','=','logistics.id')