修改 OracleDocWaveDetailService 方法

app/Http/Controllers/TestController.php

@@ -1559,11 +1559,13 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
 
     public function clearCancelledOrder()
     {
+        $wave_nos = ['W210129000248','W210202000216','W210202000251','W210202000216','W210202000282'];
+        $order_nos = ['SO210129004112' , 'SO210202003333','SO210202003333','SO210202003236','SO210202003247','SO210202003719'];
         try {
-            OracleDOCWaveDetails::query()->where('OrderNo', 'SO210202003270')->delete();
-            app('LogService')->log(__CLASS__, __METHOD__, 'Delete OracleDOCWaveDetails' . '  SO210202003270' );
+            OracleDOCWaveDetails::query()->whereIn('WaveNo',$wave_nos)->whereIn('OrderNo', $order_nos)->delete();
+            app('LogService')->log(__CLASS__, __METHOD__, 'Delete OracleDOCWaveDetails' . '  ' . json_encode($order_nos).json_encode($wave_nos));
         } catch (Exception $e) {
-            app('LogService')->log(__CLASS__, __METHOD__,'Error clearCancelledOrder' . 'SO210202003270');
+            app('LogService')->log(__CLASS__, __METHOD__,'Error clearCancelledOrder'.json_encode($order_nos).json_encode($wave_nos));
         }
     }
 }

app/Services/OracleDocWaveDetailService.php

@@ -22,12 +22,12 @@ class OracleDocWaveDetailService
         $orderHeader_arr = $orderHeaders->chunk(300);
         $orderHeader_arr->each(function ($items){
             $clearOrderNos = data_get($items, '*.orderno');
-            $ownerNos = array_values(array_diff(data_get($items, '*.waveno'),['*']));
+            $waveNos = 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).json_encode($ownerNos));
+                OracleDOCWaveDetails::query()->whereIn('OrderNo', $clearOrderNos)->whereIn('WaveNo', $waveNos)->delete();
+                app('LogService')->log(__CLASS__, __METHOD__, 'Delete OracleDOCWaveDetails' . '  ' . json_encode($clearOrderNos).json_encode($waveNos));
             } catch (Exception $e) {
-                app('LogService')->log(__CLASS__, __METHOD__,'Error clearCancelledOrder'.json_encode($clearOrderNos).json_encode($ownerNos));
+                app('LogService')->log(__CLASS__, __METHOD__,'Error clearCancelledOrder'.json_encode($clearOrderNos).json_encode($waveNos));
             }
         });
     }