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

app/Services/CacheShelfService.php

@@ -105,7 +105,7 @@ class CacheShelfService
             return ['success' => false,'message' => '当前已有未完成的站任务'];
         }
         $stationTask = $this->stationTaskService->create(1);                                                    // 生成站任务
-        $stationTaskMaterialBox = $this->stationTaskMaterialBoxService->createByStationMaterialBox($station,$materialBox);     // 创建料箱任务
+        $stationTaskMaterialBox = $this->stationTaskMaterialBoxService->createByStationAndMaterialBox($station,$materialBox);     // 创建料箱任务
         $this->stationTaskService->registerStations($stationTask,[$station['id']]);                                            // 注册站任务站
         $params = [[
                 'station_task_id'=>$stationTask->first()['id'],