Merge branch 'yang-fix-panel' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Services/NewOrderCountingRecordService.php

@@ -411,8 +411,18 @@ class NewOrderCountingRecordService
                     break;
             }
             $item['amount'] = $amount;
-
-            return $result->push($item);
+            return $result->push(new OrderCountingRecord( [
+                'owner_id' => $item->owner_id,
+                'shop_id' => $item->shop_id,
+                'warehouse_id' => $item->warehouse_id,
+                'logistic_id' => $item->logistic_id,
+                'date_target' => $item->date_target,
+                'counting_unit' => $item->counting_unit,
+                'amount'=>$item->amount,
+                'year'=>$item->year,
+                'month'=>$item->month,
+                'week'=>$item->week
+            ]));
         }
         return $result;
     }