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

app/Http/Controllers/TestController.php

@@ -46,6 +46,7 @@ use App\OrderIssue;
 use App\OrderPackage;
 use App\Owner;
 use App\OwnerAreaReport;
+use App\OwnerFeeDetail;
 use App\OwnerMaterial;
 use App\Package;
 use App\Procurement;
@@ -144,7 +145,12 @@ class TestController extends Controller
 
     public function test1()
     {
-        dd(app(MaterialBoxService::class)->getAnEmptyBox());
+        foreach (Order::query()->select("id")->where("wms_edittime",">=","2021-06-01 00:00:00")
+                     ->whereNotIn("id",OwnerFeeDetail::query()->select("outer_id")
+                         ->where("created_at",">=",'2021-06-01 00:00:00')
+                         ->where("outer_table_name","orders"))->get() as $order){
+            dispatch(new OrderCreateInstantBill($order));
+        }
     }
 
     public function test2()

app/Services/StorageService.php

@@ -87,7 +87,7 @@ class StorageService
         if ($storage->station_id)$update["station_id"] = null;
         if ($update)$storage->update($update);
         //一号缓存架操作完下达补充料箱
-        if ($storage->prent_id == 6)app("ForeignHaiRoboticsService")->paddingCacheShelf(Station::query()->where("code",$stationTaskMaterialBox->station_id)->get());
+        if ($stationTaskMaterialBox->station->parent_id == 6)app("ForeignHaiRoboticsService")->paddingCacheShelf(Station::query()->where("code",$stationTaskMaterialBox->station_id)->get());
     }
 
     /**