Merge branch 'zengjun'

app/Filters/WorkOrderFilters.php

@@ -87,7 +87,7 @@ class WorkOrderFilters
         // 审核 默认为 待审核
         if (isset($this->params['is_review'])){
             $this->queryBuilder->where('status','2');
-            $this->queryBuilder->whereHas('orderIssue');
+            $this->queryBuilder->whereHas('orderIssue')->orderBydesc('work_orders.created_at');
         } else {
             $work_order_query = WorkOrder::query()->select('id')->where('status','2')->whereHas('orderIssue');
             $this->queryBuilder->whereNotIn('id',$work_order_query);

app/Http/Controllers/TestController.php

@@ -305,7 +305,7 @@ sql;
 
     public function syncOrderPackage()
     {
-        ini_set('memory_limit', '500M');
+        ini_set('memory_limit', '2048M');
         ini_set('max_execution_time', 0);
         $orderPackingSummary = OracleDocOrderPackingSummary::query()
             ->where('editTime', '>=', '2021-09-11 12:00:00')
@@ -316,6 +316,7 @@ sql;
         foreach ($orderPackingSummary_chunk as $orderPackingSummarys) {
             foreach ($orderPackingSummarys as $orderPackingSummary) {
                 $orderPackage = OrderPackage::query()->where('logistic_number', $orderPackingSummary->traceid)->first();
+                if (!$orderPackage)continue;
                 $orderPackage->update([
                     'uploaded_to_wms' => true,
                     'weight' => $orderPackingSummary->grossweight,