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

app/Http/Controllers/TestController.php

@@ -123,10 +123,12 @@ class TestController extends Controller
     }
     public function test()
     {
-        $s = Station::query()->where("parent_id",6);
-        $t = StationTask::query()->where("status","==",'待处理')->where("station_id",$s);
-        StationTask::query()->where("status","==",'待处理')->where("station_id",$s)->update(["status"=>"完成"]);
-        StationTaskMaterialBox::query()->where("station_task_id",$t)->update(["status"=>"完成"]);
+        $s = Station::query()->select("id")->where("parent_id",6);
+        $t = StationTask::query()->select("id")->where("status","==",'待处理')
+            ->whereIn("station_id",$s);
+        StationTask::query()->where("status","==",'待处理')
+            ->whereIn("station_id",$s)->update(["status"=>"完成"]);
+        StationTaskMaterialBox::query()->whereIn("station_task_id",$t)->update(["status"=>"完成"]);
         dd("OK");
     }
     public function orderCreateBill()
@@ -167,7 +169,7 @@ class TestController extends Controller
                 "type" => null,
                 "wms_type" => "09.[BAOSHI]\u622a\u5355\u6ce2\u6b21\u3010\u65e0\u5907\u6ce8\u3011",
                 "wms_status" => "\u90e8\u5206\u6536\u8d27",
-                "wms_created_at" => "0000-00-00 00=>00=>00",
+                "wms_created_at" => "0000-00-00 00=>00 =>00",
                 "created_at" => "2021-03-12T09=>10=>44.000000Z",
                 "updated_at" => "2021-03-12T09=>10=>44.000000Z",
                 "remark" => null,