Merge branch 'zengjun' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Http/Controllers/TestController.php

@@ -19,6 +19,7 @@ use App\Console\Commands\WasSyncWmsAsnInformation;
 use App\Exceptions\ErrorException;
 use App\Events\CancelOrder;
 use App\Events\SendEmailEvent;
+use App\Exceptions\Exception;
 use App\Http\Requests\ForeignHaiRobotic_taskUpdateRequest;
 use App\Http\Requests\TestAaRequest;
 use App\Imports\OrderTrackingImport;
@@ -1511,4 +1512,14 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
         app(BatchUpdateService::class)->batchUpdate('rejected_bills', $updates);
         }
     }
+
+    public function clearCancelledOrder()
+    {
+        try {
+            OracleDOCWaveDetails::query()->where('OrderNo', 'SO210202003270')->delete();
+            app('LogService')->log(__CLASS__, __METHOD__, 'Delete OracleDOCWaveDetails' . '  SO210202003270' );
+        } catch (Exception $e) {
+            app('LogService')->log(__CLASS__, __METHOD__,'Error clearCancelledOrder' . 'SO210202003270');
+        }
+    }
 }

app/Services/OracleDocWaveDetailService.php

@@ -2,6 +2,7 @@
 
 namespace App\Services;
 
+use App\Exceptions\Exception;
 use App\OracleDOCOrderHeader;
 use App\OracleDOCWaveDetails;
 use App\Order;
@@ -14,18 +15,18 @@ use App\Traits\ServiceAppAop;
 class OracleDocWaveDetailService
 {
     use ServiceAppAop;
-    protected $modelClass=OracleDocWaveDetail::class;
+    protected $modelClass=OracleDOCWaveDetails::class;
     public function clearCancelledOrder($orderHeaders)
     {
         if (!$orderHeaders) return;
         $orderHeader_arr = $orderHeaders->chunk(300);
         $orderHeader_arr->each(function ($items){
             $clearOrderNos = data_get($items, '*.orderno');
-            $ownerNos = array_diff(data_get($items, '*.waveno'),['*']) ;
+            $ownerNos = array_values(array_diff(data_get($items, '*.waveno'),['*']));
             try {
                 OracleDOCWaveDetails::query()->whereIn('OrderNo', $clearOrderNos)->whereIn('OwnerNo', $ownerNos)->delete();
-                app('LogService')->log(__CLASS__, __METHOD__, 'Delete OracleDOCWaveDetails' . '  ' . json_encode($clearOrderNos) );
-            } catch (\Exception $e) {
+                app('LogService')->log(__CLASS__, __METHOD__, 'Delete OracleDOCWaveDetails' . '  ' . json_encode($clearOrderNos).json_encode($ownerNos));
+            } catch (Exception $e) {
                 app('LogService')->log(__CLASS__, __METHOD__,'Error clearCancelledOrder'.json_encode($clearOrderNos).json_encode($ownerNos));
             }
         });