一些BUG修复

app/Http/Controllers/TestController.php

@@ -202,6 +202,7 @@ class TestController extends \App\Http\Controllers\api\thirdPart\syrius\producer
     }
     public function test()
     {
+        dd(app("MenuService")->getVisibleFunctionList());
         dd($this->response("德玛西亚",[]));
        $st = '[{"taskMode":1,"bins":[{"taskCode":"102876_1632099648.1379","binCode":"IDE0000686","fromLocCode":"BIN-IN1","toLocCode":""}],"groupCode":"_1632099648.1379","priority":10,"sequenceFlag":1}]';
        $st = json_decode($st,true);

app/Services/OrderPackageService.php

@@ -287,7 +287,7 @@ class OrderPackageService
         $update_params[] = ['id', 'sent_at'];
         foreach ($packages as $package) {
             if ($package->sent_at || !isset($map[$package->logistic_number])) continue;
-            list($allocation,$orderHeader) = $map[$package->logistic_number];
+            $allocation = $map[$package->logistic_number];
             try {
                 $checktime = $allocation->checktime;
             } catch (\Exception $e) {
@@ -295,7 +295,7 @@ class OrderPackageService
             }
             if ($checktime) {
                 //EDISENDFLAG
-                $this->checkingAndProcess($package,$allocation->orderlineno,$orderHeader); //检查和处理揽收
+                $this->checkingAndProcess($package,$allocation->orderlineno); //检查和处理揽收
                 $update_params[] = [
                     'id' => $package->id,
                     'sent_at' => $checktime,
@@ -310,13 +310,12 @@ class OrderPackageService
      *
      * @param OrderPackage|\stdClass $package
      * @param int $lineNo
-     * @param \stdClass|mixed $orderHeader
      */
-    public function checkingAndProcess(OrderPackage $package, int $lineNo, $orderHeader)
+    public function checkingAndProcess(OrderPackage $package, int $lineNo)
     {
         //校验快递商 订单状态 复核标记 揽收标记
-        $package->loadMissing("order.logistic");
         if ($package->collecting_status == '1' || !$package->logistic_number)return;
+        $package->loadMissing("order.logistic");
         if (strpos($package->order->logistic->code ?? '','ZTO') === false)return;
         $statusMapping = array_flip(Order::STATUS);
         if (($statusMapping[$package->order->wms_status] ?? 90) == 90){
@@ -342,7 +341,7 @@ class OrderPackageService
             $actAllocationDetails = $orderHeader->actAllocationDetails;
             foreach ($actAllocationDetails as $actAllocationDetail) {
                 $logistic_number = $actAllocationDetail->picktotraceid;
-                $map[$logistic_number] = [$actAllocationDetail,$orderHeader];
+                $map[$logistic_number] = $actAllocationDetail;
             }
         }
         return $map;

resources/views/layouts/app.blade.php

@@ -125,12 +125,10 @@
         switch (type) {
             case 2:
                 a.innerText = menu.name;
-                li.appendChild(a);
-                return li;
+                break;
             case 3:
                 a.innerText = menu.name;
-                li.appendChild(a);
-                return li;
+                break;
             default:
                 if (menu.font){
                     let span = document.createElement("span");
@@ -139,9 +137,14 @@
                     a.appendChild(span);
                 }
                 a.appendChild(document.createTextNode(menu.name));
-                li.appendChild(a);
-                return li;
+                break;
         }
+        li.appendChild(a);
+        a.onclick = function (){
+
+            return false;
+        };
+        return li;
     }
     function getMenu() {
         let xhr = new XMLHttpRequest();