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

app/Services/ForeignHaiRoboticsService.php

@@ -114,8 +114,8 @@ class ForeignHaiRoboticsService
         switch ($modeName){
             case '输送线入立架': return 1;
             case '立架出至输送线': return 2;
-            case '立架出至缓存架':
             case '移动立架内位置': return 3;
+            case '立架出至缓存架':
             case '缓存架入立架':return 6;
             default: throw new \Exception('发至海柔的移料箱请求，模式不存在');
         }
@@ -528,6 +528,6 @@ class ForeignHaiRoboticsService
             $stationCollection->add($station->code);
             $blacklist[] = $box->id;
         }
-        app("ForeignHaiRoboticsService")->fetchGroup_multiLocation($stationCollection,$collection,'','立架出至缓存架');
+        $this->fetchGroup_multiLocation($stationCollection,$collection,'','立架出至缓存架');
     }
 }