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

app/Http/Controllers/TestController.php

@@ -123,8 +123,10 @@ class TestController extends Controller
     }
     public function test()
     {
-        foreach(Owner::query()->get() as $owner)app("OwnerService")->refreshRelevance($owner->id);
-
+        $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"=>"完成"]);
         dd("OK");
     }
     public function orderCreateBill()

app/Http/Controllers/WaybillController.php

@@ -629,7 +629,7 @@ class WaybillController extends Controller
         /** @var Collection $waybills */
         $row = [
             "运单类型", "货主", "上游单号", "wms订单号", "运单号", "运输收费",
-            "其他收费", "其他收费备注", "始发地", "目的地", "承运商", "承运商单号",
+            "其他收费", "其他收费备注", "始发地", "目的地","下单备注", "承运商", "承运商单号",
             "仓库计抛", "承运商计抛", "仓库计重", "承运商计重", "车型", "车辆信息",
             "计件", "里程数", "运费(元)", "提货费(元)", "其他费用(元)", "发货时间",
             "调度备注", "创建时间"
@@ -647,6 +647,7 @@ class WaybillController extends Controller
                 $waybill->other_charge_remark,
                 $waybill->origination,
                 $waybill->order->address ?? $waybill->destination,
+                $waybill->ordering_remark,
                 $waybill->logistic->name ?? "",
                 $waybill->carrier_bill,
                 $waybill->warehouse_weight,