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

app/Http/Controllers/TestController.php

@@ -1536,4 +1536,24 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
             app('LogService')->log(__CLASS__, __METHOD__,'Error clearCancelledOrder'.json_encode($order_nos).json_encode($wave_nos));
         }
     }
+
+    public function syncOrderByWaveNo()
+    {
+        $oracleDOCOrderHeaderService = new OracleDOCOrderHeaderService();
+        $orderService = new OrderService();
+        $waveNos = ['W210218000155','W210218000154'];
+        $orderHeaders = OracleDOCOrderHeader::query()
+            ->selectRaw(implode(',',OracleDOCOrderHeaderService::$columns))
+            ->whereIn('WaveNo',$waveNos)
+            ->get();
+        $orderHeaderList = $orderHeaders->chunk(2000);
+        foreach ($orderHeaderList as $item) {
+            $item = $oracleDOCOrderHeaderService->loadMissing($item);
+            $last_order = $item->first();                                                               // 时间点靠后的
+            $newest_orders = $item->where('addtime',$last_order->addtime);
+            if(count($newest_orders)>0 && count($orderHeaders) >0){
+                $orderService->syncOrder($orderHeaders);                                             //  同步订单
+            }
+        }
+    }
 }