修改 波次删除任务

app/OracleDOCWaveDetails.php

@@ -13,14 +13,14 @@ class OracleDOCWaveDetails extends Model
     protected $connection='oracle';
     protected $table='DOC_WAVE_DETAILS';
     public $timestamps=false;
-    protected $primaryKey = 'OrdderNo';
+    protected $primaryKey = 'OrderNo';
     function getIncrementing()
     {
         return false;
     }
 
     static public function unpackedOrders($batchNumber){
-        return OracleDOCWaveDetails::where('doc_wave_details.waveno', $batchNumber)->leftJoin('doc_order_header','doc_order_header.orderno','doc_wave_details.orderno')->where(function ($query){
+        return OracleDOCWaveDetails::query()->where('doc_wave_details.waveno', $batchNumber)->leftJoin('doc_order_header','doc_order_header.orderno','doc_wave_details.orderno')->where(function ($query){
             $query->where('doc_order_header.SOSTATUS','<>','99')->where('doc_order_header.SOSTATUS','<>','63');
         })->get();
     }

app/Services/OracleDocWaveDetailService.php

@@ -25,9 +25,9 @@ class OracleDocWaveDetailService
             $waveNos = array_values(array_diff(data_get($items, '*.waveno'),['*']));
             try {
                 OracleDOCWaveDetails::query()->whereIn('OrderNo', $clearOrderNos)->whereIn('WaveNo', $waveNos)->delete();
-                app('LogService')->log(__CLASS__, __METHOD__, 'Delete OracleDOCWaveDetails' . '  ' . json_encode($clearOrderNos).json_encode($waveNos));
+                app('LogService')->log(__CLASS__, __FUNCTION__, 'Delete OracleDOCWaveDetails' . '  ' . json_encode($clearOrderNos).json_encode($waveNos));
             } catch (Exception $e) {
-                app('LogService')->log(__CLASS__, __METHOD__,'Error clearCancelledOrder'.json_encode($clearOrderNos).json_encode($waveNos));
+                app('LogService')->log(__CLASS__, __FUNCTION__,'Error clearCancelledOrder'.json_encode($clearOrderNos).json_encode($waveNos));
             }
         });
     }
@@ -99,11 +99,11 @@ class OracleDocWaveDetailService
             return;
 
         $orderHeaders = OracleDOCOrderHeader::query()
-            ->selectRaw('orderno,waveno,editTime')
-            ->where('EDITTIME', '>', Carbon::parse($sync_at))
-            ->where('ERPCANCELFLAG', 'Y')
-            ->orderByDesc('editTime')->get();
-
+            ->selectRaw('orderno,waveno,edittime,erpcancelflag')
+            ->where('EditTime', '>', Carbon::parse($sync_at))
+            ->where('WaveNo','!=','*')
+            ->where('ERPCancelFLAG', 'Y')
+            ->orderByDesc('EditTime')->get();
         $orderHeaderList = $orderHeaders->chunk(50);
         $update_at = Carbon::now();
         if(count($orderHeaders)>0){
@@ -111,19 +111,19 @@ class OracleDocWaveDetailService
                 $this->clearCancelledOrder($items);
                 if ($items->count() > 0) {
                     OracleDOCOrderHeader::query()
-                        ->whereIn('orderNo', data_get($items, '*.orderno'))
+                        ->whereIn('orderno', data_get($items, '*.orderno'))
                         ->whereIn('waveno', data_get($items, '*.waveno'))
                         ->update(['waveno' => '*','editTime' =>$update_at]);
                     $json = json_encode($items->map(function ($orderHeader) {
                         return ['orderno' => $orderHeader->orderno, 'waveno' => $orderHeader->waveno];
                     }));
-                    app('LogService')->log(__CLASS__, __METHOD__, 'update OrderHeader' . '  ' . $json);
+                    app('LogService')->log(__CLASS__, __FUNCTION__, 'update OrderHeader' . '  ' . $json);
                     $this->disposeOrderBatchId(data_get($items, '*.orderno'));
                 }
             }
         }
         $end_time = (string)Carbon::now();
-        $sync_at = $orderHeaders->first()->editTime ?? $sync_at;
+        $sync_at = $orderHeaders->first()->edittime ?? $sync_at;
         $this->setSyncAt($sync_at);
         $this->setSyncStartAt((string)$start_time);
         $this->setSyncEndAt($end_time);