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

app/Http/Controllers/CacheShelfController.php

@@ -30,16 +30,15 @@ class CacheShelfController extends Controller
     }
 
     /**
-     * 获取缓存货架上的任务列表
+     * 获取缓存货架上的料箱
      * @param Request $request
      * @param string $id
      * @param CacheShelfService $service
      */
-    public function getTasksApi(Request $request,string $id,CacheShelfService $service)
+    public function getChildStationApi(Request $request,string $id,CacheShelfService $service)
     {
-        /** @var Station $station */
-        $station = $service->getChildStation($id);
-        $this->success($station);
+        $stations = $service->getChildStation($id);
+        $this->success($stations);
     }
 
     /**
@@ -48,21 +47,23 @@ class CacheShelfController extends Controller
      * @param CacheShelfService $service
      * @return mixed
      */
-    public function lightOnApi(Request $request,CacheShelfService $service)
+    public function lightOnApi(Request $request,CacheShelfService $service): array
     {
-        if($request['stationCode'] && $request['materialBoxCode'])
-           return $service->createStationTask($request['stationCode'],$request['materialBoxCode']);
+        if($request['stationCode'] && $request['materialBoxCode']){
+            return  $service->bindMaterialBox($request['stationCode'],$request['materialBoxCode']);
+        }
         return ['success' => false,'message' => '参数错误'];
     }
 
     /**
      * @param Request $request
+     * @param CacheShelfService $service
      * @return array|bool[]
      */
-    public function clearTaskApi(Request $request): array
+    public function clearTaskApi(Request $request,CacheShelfService $service): array
     {
         $code = $request['station'];
-        return app(CacheShelfService::class)->clearTask($code);
+        return $service->clearTask($code);
     }
 
 }

app/Http/Controllers/DischargeTaskController.php

@@ -7,11 +7,15 @@ use App\Facilitator;
 use App\DischargeTask;
 use App\Filters\DischargeTaskFilters;
 use App\Http\Requests\DischargeTask\DischargeTaskRequest;
+use App\Imports\CommodityImport;
+use App\Imports\DischargeTaskImport;
 use App\Services\common\ExportService;
 use App\Services\OwnerService;
 use App\Warehouse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Gate;
+use Maatwebsite\Excel\Facades\Excel;
 use Oursdreams\Export\Export;
 use function Sodium\compare;
 
@@ -25,13 +29,12 @@ class DischargeTaskController extends Controller
         if (!Gate::allows('人事管理-卸货-查询')) {
             return redirect(url('/'));
         }
-
-        $dischargeTasks = DischargeTask::query()->with(['facilitator', 'owner','warehouse'])->filter($filters)->orderByDesc('id')->paginate($request['paginate'] ?? 50);
         $owners = app(OwnerService::class)->getAuthorizedOwners();
-        $warehouses = Warehouse::query()->select('id','name')->get();
+        $dischargeTasks = DischargeTask::query()->with(['facilitator', 'owner', 'warehouse'])->filter($filters)->whereIn('owner_id',data_get($owners,'*.id'))->orderByDesc('income_at')->paginate($request['paginate'] ?? 50);
+        $warehouses = Warehouse::query()->select('id', 'name')->get();
         $facilitators = Facilitator::query()->select('name', 'id')->get();
 
-        return view('personnel.discharge.task.index', compact('dischargeTasks', 'owners', 'facilitators','warehouses'));
+        return view('personnel.discharge.task.index', compact('dischargeTasks', 'owners', 'facilitators', 'warehouses'));
     }
 
     // 结算报表
@@ -41,7 +44,7 @@ class DischargeTaskController extends Controller
             return redirect(url('/'));
         }
 
-        $dischargeStatements = DischargeTask::query()->with('facilitator')->filter($filters)->orderByDesc('id')->paginate($request['paginate'] ?? 50);
+        $dischargeStatements = DischargeTask::query()->with('facilitator')->filter($filters)->orderByDesc('income_at')->paginate($request['paginate'] ?? 50);
         $owners = app(OwnerService::class)->getAuthorizedOwners();
         $facilitators = Facilitator::query()->select('name', 'id')->get();
 
@@ -114,8 +117,8 @@ class DischargeTaskController extends Controller
     public function export(Request $request, DischargeTaskFilters $filters)
     {
         $this->gate('人事管理-卸货-查询');
-
-        $dischargeTasks = DischargeTask::query()->with(['Facilitator', 'owner'])->filter($filters)->orderByDesc('id')->get();
+        $owners = app(OwnerService::class)->getAuthorizedOwners();
+        $dischargeTasks = DischargeTask::query()->with(['Facilitator', 'owner'])->filter($filters)->whereIn('owner_id',data_get($owners,'*.id'))->orderByDesc('id')->get();
 
         $row = ['日期', '客户名称', '作业名称', '入库单号', '数量', '单位', '单价', '收费', '状态', '备注'];
         $json = app('DischargeTaskService')->getJson($dischargeTasks);
@@ -129,38 +132,62 @@ class DischargeTaskController extends Controller
     {
         $this->gate('人事管理-卸货-结算报表-查询');
 
-        $dischargeTasks = DischargeTask::query()->with(['facilitator', 'owner','warehouse'])->filter($filters)->orderByDesc('id')->get();
+        $dischargeTasks = DischargeTask::query()->with(['facilitator', 'owner', 'warehouse'])->filter($filters)->orderByDesc('id')->get();
 
-        $row = ['日期', '客户名称','仓库', '作业名称', '入库单号', '数量', '单位', '收入单价', '收入合计', '装卸队', '数量', '单位', '支出单价', '支出合计', '状态', '收入备注', '支出备注'];
+        $row = ['日期', '客户名称', '仓库', '作业名称', '入库单号', '数量', '单位', '收入单价', '收入合计', '装卸队', '数量', '单位', '支出单价', '支出合计', '状态', '收入备注', '支出备注'];
         $json = app('DischargeTaskService')->getStatementsJson($dischargeTasks);
 
         return Export::make($row, $json, "卸货结算报表");
         //return app(ExportService::class)->json($row, $json, "卸货结算报表");
     }
 
-    // 回执单
     public function receipt(Request $request)
     {
-        $task = DischargeTask::query()->with(['facilitator', 'owner','warehouse'])->where('id' , $request['id'])->first();
+        $task = DischargeTask::query()->with(['facilitator', 'owner', 'warehouse'])->where('id', $request['id'])->first();
         $task->type = DischargeTask::types[$task->type];
-        return view('personnel.discharge.task.receipt',compact('task'));
+        return view('personnel.discharge.task.receipt', compact('task'));
+    }
+
+    public function importApi(Request $request): array
+    {
+        $this->gate('人事管理-卸货-创建');
+
+        $extension = $request->file()['file']->getClientOriginalExtension();
+        if (in_array($extension, ['xlsx', 'xlsm', 'xltx', 'xltm', 'xls', 'xlt', 'ods', 'ots', 'slk', 'xml', 'gnumeric', 'htm', 'html', 'csv', 'tsv']))
+            return ['success' => false,'message'=>'请检查导入文件是否符合要求'];
+        $extension[0] = strtoupper($extension[0]);
+        try {
+            Excel::import(new DischargeTaskImport(), $request->file()['file']->path(), null, $extension);
+        } catch (\Exception $e) {
+            return ['success' => false, 'message' => ['请检查导入文件是否符合要求']];
+        }
+        if (Cache::has('exception')) {
+            return ['success' => false, 'errors' => Cache::get('exception')];
+        }
+        return ['success' => true];
     }
 
+
     public function show(DischargeTask $dischargeTask)
     {
     }
+
     public function edit(DischargeTask $dischargeTask)
     {
     }
+
     public function update(Request $request, DischargeTask $dischargeTask)
     {
     }
+
     public function store(Request $request)
     {
     }
+
     public function create()
     {
     }
+
     public function destroy(DischargeTask $dischargeTask)
     {
 

app/Http/Controllers/TestController.php

@@ -50,6 +50,7 @@ use App\ProcurementTotalBill;
 use App\RejectedBillItem;
 use App\Services\BatchService;
 use App\Services\CacheService;
+use App\Services\CacheShelfService;
 use App\Services\CommodityService;
 use App\Services\common\BatchUpdateService;
 use App\Services\common\DataHandlerService;
@@ -1379,7 +1380,6 @@ TEXT;
 
         $orderPackages = OrderPackage::query()->selectRaw('count(1) counts,logistic_number')->where('created_at','>=','2020-01-01')->groupBy('logistic_number')->having('counts','>','1')->get();
 
-
         $updateParams = [];
         $deleteParams = [];
         foreach ($orderPackages as $orderPackage) {
@@ -1429,14 +1429,9 @@ TEXT;
             $deleteParams[]  = $orderPackages_filter;
             $saveOrderPackage->save();
         }
-        dd($updateParams,$deleteParams);
+        dd('任务完成');
     }
 
-    public function endStationTask()
-    {
-        $stationTask = StationTask::query()->where('id',711)->first();
-        $stationTask->update(['status'=>'完成']);
-    }
 
     public function order_package_exception_type_counting_record_init()
     {

app/Http/Requests/DischargeTask/DischargeTaskRequest.php

@@ -69,6 +69,12 @@ class DischargeTaskRequest extends FormRequest
         'expenditure_unit.required' => '单位为必选项',
         'expenditure_unit_price.required' => '单价为必填项',
     ];
+    protected $uploadApiRule = [
+        'file' => 'required',
+    ];
+    protected $uploadApiMessage = [
+        'file' => 'required',
+    ];
 
     public function authorize(): bool
     {
@@ -88,6 +94,8 @@ class DischargeTaskRequest extends FormRequest
                 return $this->updateApiRules;
             case 'discharge.updateTaskFacilitatorApi':
                 return $this->updateTaskFacilitatorApiRules;
+            case 'discharge.importApi':
+                return $this->uploadApiRule;
             default :
                 return [];
         }
@@ -106,6 +114,8 @@ class DischargeTaskRequest extends FormRequest
                 return $this->updateApiMessage;
             case 'discharge.updateTaskFacilitatorApi':
                 return $this->updateTaskFacilitatorApiMessage;
+            case 'discharge.importApi':
+                return $this->uploadApiMessage;
             default :
                 return [];
         }

app/Imports/DischargeTaskImport.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Imports;
+
+use App\DischargeTask;
+use App\Owner;
+use App\Services\DischargeTaskService;
+use App\Warehouse;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Cache;
+use Maatwebsite\Excel\Concerns\ToCollection;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Imports\HeadingRowFormatter;
+
+HeadingRowFormatter::default('none');
+
+class DischargeTaskImport implements ToCollection, WithHeadingRow
+{
+    /**
+     * @param Collection $collection
+     */
+    public function collection(Collection $collection)
+    {
+        /** @var DischargeTaskService $service */
+        $service = app(DischargeTaskService::class);
+        $exception = [];
+        $numbers = [];
+        foreach ($collection as $row => $item) {
+            $index = $row + 1;
+            $message = '';
+            $owner = Owner::query()->where('name', trim($item['货主']))->first();
+            $waveHouse = Warehouse::query()->where('name', trim($item['仓库']))->first();
+            $type = array_search(trim($item['作业名称']), DischargeTask::types);
+            $unit = array_search(trim($item['单位']), DischargeTask::units);
+
+            if (array_search(trim($item['入库单']), $numbers)) $message .= '入库单号重复；';
+
+            if (!$owner) $message .= '对应货主不存在；';
+
+            if (!$waveHouse) $message .= '对应仓库不存在；';
+
+            if (!$item['入库单'] || strlen(trim('入库单')) == 0) $message .= '未输入入库单；';
+
+            if (!$item['数量'] || strlen(trim('数量')) == 0) $message .= '未输入数量；';
+
+            if (!$item['单价'] || strlen(trim('单价')) == 0) $message .= '未输入单价；';
+
+            if (!$item['单位'] || strlen(trim('单位')) == 0) $message .= '未输入单位；';
+
+            if (isset($type) && $type != 0) $message .= '指定作业类型错误；';
+
+            if (!$item['作业名称']) $message .= '未指定作业类型';
+
+            if (DischargeTask::query()->where('numbers',$item['入库单'])->exists()) $message .= '入库单号已存在;';
+
+            if (strlen($message) > 0) {
+                $exception[] = "第{$index}行卸货任务创建失败:" . $message;
+                continue;
+            }
+            $params = [
+                'owner_id' => $owner->id,
+                'warehouse_id' => $waveHouse->id,
+                'type' => $type,
+                'numbers' => trim($item['入库单']),
+                'income_amount' => $item['数量'],
+                'income_unit_price' => $item['单价'],
+                'income_unit' => $unit,
+                'income_total_cost' => $item['数量'] * $item['单价'],
+                'status' => 0,
+                'income_remark' => $item['备注'],
+                'income_at' => $item['预约日期'] ?formatExcelDateTime($item['预约日期']): Carbon::now()->format(Carbon::DEFAULT_TO_STRING_FORMAT)
+            ];
+            try {
+                $service->createTask($params, false);
+                $numbers[] = trim($item['入库单']);
+            } catch (\Exception $e) {
+                $exception[] = "第{$index}行创建失败:创建异常";
+            }
+        }
+        Cache::put('exception', $exception, 86400);
+    }
+}

app/Services/CacheShelfService.php

@@ -7,9 +7,11 @@ use App\Exceptions\ErrorException;
 use App\MaterialBox;
 use App\Station;
 use App\StationTask;
+use App\StationTaskChild;
 use App\StationTaskChildren;
 use App\StationTaskMaterialBox;
 use App\StationType;
+use App\Storage;
 use App\Traits\ServiceAppAop;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Http;
@@ -40,7 +42,7 @@ class   CacheShelfService
      */
     public function getChildStation($id)
     {
-        return Station::query()->where('parent_id',$id)->with('parent','pendingStationTask.stationTaskMaterialBoxes.materialBox')->get();
+        return Station::query()->where('parent_id', $id)->with('storage.materialBox')->get();
     }
 
 
@@ -49,134 +51,95 @@ class   CacheShelfService
      * @param $locCode
      * @param $PTLAction
      * @return array|bool[]
+     * @throws \Exception
      */
     public function lightOffTask($locCode, $PTLAction): array
     {
-        $station = Station::query()->with('pendingStationTask.stationTaskMaterialBoxes.materialBox')->where('code', $locCode)->first();
+        $station = Station::query()->with('storage.materialBox')->where('code', $locCode)->first();
         try {
             $bool = $this->putBinToStore($station);                         // 推送任务
-            if($bool){
-                LogService::log(__CLASS__,'lightOffTask','code' .' true'. $locCode.json_encode($station));
+            if ($bool) {
+                LogService::log(__CLASS__, 'lightOffTask', 'code' . ' true' . $locCode . json_encode($station));
                 return ['success' => true];
-            }else{
-                return ['success' => false,'errMsg' => '机器人推送失败'];
+            } else {
+                return ['success' => false, 'errMsg' => '机器人推送失败'];
             }
         } catch (ErrorException $e) {
-            LogService::log(__FUNCTION__,'缓存架推送任务失败',json_encode($e->getMessage()));
-            return ['success' => false,'errMsg' => $e->getMessage()];
+            LogService::log(__FUNCTION__, '缓存架推送任务失败', json_encode($e->getMessage()));
+            return ['success' => false, 'errMsg' => $e->getMessage()];
         }
     }
 
     /**
      * 推任务至海柔机器人
      * @param  $station
-     * @return bool
+     * @return array
      * @throws ErrorException
+     * @throws \Exception
      */
-    public function putBinToStore($station): bool
+    public function putBinToStore($station): array
     {
-        $this->instant($this->stationTaskMaterialBoxService, 'StationTaskMaterialBoxService');
         $this->instant($this->foreignHaiRoboticsService, 'ForeignHaiRoboticsService');
         $this->instant($this->stationService, 'StationService');
-        $this->instant($this->stationTaskService, 'StationTaskService');
-        $this->instant($this->stationTaskChildService, 'StationTaskChildService');
 
-        /** @var StationTaskMaterialBox $takeStationTaskMaterialBox */
-        $takeStationTaskMaterialBox = $station['pendingStationTask']['stationTaskMaterialBoxes']->first();
-        $formStation = $this->stationService->getStation_byType('立库');
+        /** @var MaterialBox $materialbox */
+        $materialBox = $station->storage->materialbox;
+
+        $formStation = $this->stationService->getStation_byType('立库');          // 立库
+
+        $stationTask = StationTask::query()->create(['station_id' => $formStation['id'], 'status' => '待处理']);   // 生成任务
 
-        // 查询是否有待处理的入库任务
-        $putStationTaskMaterialBox = StationTaskMaterialBox::query()->where([
+        /** @var StationTaskMaterialBox $stationTaskMaterialBox */
+        $stationTaskMaterialBox = StationTaskMaterialBox::query()->create([
             'station_id' => $formStation['id'],
-            'material_box_id' => $takeStationTaskMaterialBox['material_box_id'],
+            'material_box_id' => $materialBox['id'],
             'status' => '待处理',
-        ])->first();
-
-        // 创建入立库任务
-        if(!$putStationTaskMaterialBox){
-            $stationTask = $this->stationTaskService->create(1);               // 生成站任务
-            $this->stationTaskService->registerStations($stationTask,[$formStation['id']]);   // 注册站任务站
-            /** @var StationTaskMaterialBox $putStationTaskMaterialBox */
-            $putStationTaskMaterialBox = $this->stationTaskMaterialBoxService->create([
-                'station_id' => $formStation['id'],
-                'material_box_id' => $takeStationTaskMaterialBox['material_box_id'],
-                'status' => '待处理',
-            ]);
-            $putStationTaskMaterialBox['station_task_id'] = $stationTask->first()['id'];
-            $putStationTaskMaterialBox['type'] = '放';
-            $putStationTaskMaterialBox->update();
-
-            $params = [[
-                'station_task_id'=>$stationTask->first()['id'],
-                'station_taskable_type'=>StationTaskMaterialBox::class,
-                'station_taskable_id'=>$putStationTaskMaterialBox['id']
-            ]];
+            'station_task_id' => $stationTask['id'],
+            'type' => '放',
+        ]);
 
-            $this->stationTaskChildService->insert($params);    // 任务任务注册
-        }
+        StationTaskChildren::query()->create([
+            'station_task_id' => $stationTask['id'],
+            'station_taskable_type' => StationTaskMaterialBox::class,
+            'station_taskable_id' => $stationTaskMaterialBox['id']
+        ]);
 
-        // 推立库任务
-        $isSuccess =  $this->foreignHaiRoboticsService->putBinToStore_fromCacheShelf($putStationTaskMaterialBox,$station['code']);
-        if($isSuccess) $this->stationTaskMaterialBoxService->set($takeStationTaskMaterialBox,['status' => '处理中']);  // 任务推送成功 标记站任务为处理中
-        else {
-            $materialBoxCode = $station['pendingStationTask']['stationTaskMaterialBoxes']->first()->code ?? '';
-            $this->_stationCacheBroadCast($station->code,0,'error');
-            $this->_stationCacheLightOn($station->code,$materialBoxCode,'拍灯重试任务');
-        }
-        return $isSuccess;
+        $bool = $this->foreignHaiRoboticsService->putBinToStore_fromCacheShelf($stationTaskMaterialBox, $station['code']);
+        return $bool ? ['success' => true] : ['success' => false];
     }
 
     /**
-     * 创建站任务和料箱任务
+     * 缓存架和料箱的绑定
      * @param $stationCode
      * @param $materialBoxCode
      * @return array
      */
-    public function createStationTask($stationCode,$materialBoxCode): array
+    public function bindMaterialBox($stationCode, $materialBoxCode): array
     {
-        $this->instant($this->stationTaskService, 'StationTaskService');
-        $this->instant($this->stationTaskMaterialBoxService,'StationTaskMaterialBoxService');
-        $this->instant($this->stationTaskChildService,'StationTaskChildService');
+        $station = Station::query()->with('storage')->where('code', $stationCode)->first();
 
-        $station = Station::query()->where('code' , $stationCode)->first();
-        if(!$station){
+        if (!$station) {
             $arr = [];
-            preg_match('/^HAI([\w]+)/',$stationCode,$arr);
+            preg_match('/^HAI([\w]+)/', $stationCode, $arr);
             $parentCode = $arr[1] ?? '';
-            $stationType = StationType::query()->where('name','缓存架')->first();
-            $parentStation = Station::query()->firstOrCreate(['code'=>$parentCode],['station_type_id'=>$stationType['id']]);
-            $station = Station::query()->firstOrCreate(['code' => $stationCode,'parent_id'=>$parentStation['id']],['name'=>$stationCode,'station_type_id' => $stationType['id']]);
+            $stationType = StationType::query()->where('name', '缓存架')->first();
+            $parentStation = Station::query()->firstOrCreate(['code' => $parentCode], ['station_type_id' => $stationType['id']]);
+            $station = Station::query()->firstOrCreate(['code' => $stationCode, 'parent_id' => $parentStation['id']], ['name' => $stationCode, 'station_type_id' => $stationType['id']]);
         }
 
         $materialBox = MaterialBox::query()->firstOrCreate(['code' => $materialBoxCode]);
 
-        $station->load('pendingStationTask.stationTaskMaterialBoxes.materialBox');
-        if($station->pendingStationTask){
-            if($station['pendingStationTask']['stationTaskMaterialBoxes']->first()->materialBox->code == $materialBoxCode){
-                $response = $this->_stationCacheLightOn($stationCode,$materialBoxCode,'任务重试');
-                if($response->code) return ['success'=>true,'message' =>  '任务重试'];
-                return ['success'=>true,'message' =>  '任务重试失败'];
-            }
-            return ['success' => false,'message' => '当前已有进行重的任务'];
-        }
+        $storage = $station->storage ?? Storage::query()->firstOrCreate(['station_id' => $station['id']]);
 
-        $stationTask = $this->stationTaskService->create(1);                                                       // 生成站任务
-        $stationTaskMaterialBox = $this->stationTaskMaterialBoxService->createByStationAndMaterialBox($station,$materialBox);     // 创建料箱任务
-        $this->stationTaskService->registerStations($stationTask,[$station['id']]);                                               // 注册站任务站
-        $stationTaskMaterialBox['station_task_id'] = $stationTask->first()['id'];
-        $stationTaskMaterialBox->update();
-        $params = [[
-                'station_task_id'=>$stationTask->first()['id'],
-                'station_taskable_type'=>StationTaskMaterialBox::class,
-                'station_taskable_id'=>$stationTaskMaterialBox['id']
-            ]];
-        $this->stationTaskChildService->insert($params);                                                                        // 任务任务注册
-
-        $body = $this->_stationCacheLightOn($stationCode,$materialBoxCode);
-        if($body->code == 200)return ['success'=>true];
-        return ['success' => false,'message' => '机器人亮灯异常'];
+        $result = $this->_stationCacheLightOn($station['code'],$materialBoxCode);
+        if($result['code'] == 200){
+            $storage->update(['material_box_id' => $materialBox['id'],'status' => 1]);
+            return ['success' => true];
+        }
+        return ['success' => false,'message' => $result['errMsg']];
     }
 
+
     /**
      * 控制格口亮灯
      * @param $locCode
@@ -185,13 +148,13 @@ class   CacheShelfService
      * @param string $color
      * @return mixed
      */
-    public function _stationCacheLightOn($locCode,$materialCode = null,$title = 'title' ,string $color = '1')
+    public function _stationCacheLightOn($locCode, $materialCode = null, $title = 'title', string $color = '1')
     {
         $params = [
             "areaCode" => "1004",
             'locCode' => $locCode,
             'PTLAction' => 1,
-            'PTLSettings' => ['color'=> $color, 'frequency'  =>1],
+            'PTLSettings' => ['color' => $color, 'frequency' => 1],
             "displayInfo" => [
                 "detail01" => $materialCode,
                 "detail02" => "detail02",
@@ -214,8 +177,9 @@ class   CacheShelfService
      * @param $locCode
      * @return mixed
      */
-    public function _stationCacheLightOff($locCode){
-        if(!$locCode)return null;
+    public function _stationCacheLightOff($locCode)
+    {
+        if (!$locCode) return null;
         $params = [
             "areaCode" => "1004",
             'locCode' => $locCode,
@@ -231,84 +195,62 @@ class   CacheShelfService
      * @param $PTLAction
      * @param string $type
      */
-    public function _stationCacheBroadCast($locCode, $PTLAction,string $type = 'success')
+    public function _stationCacheBroadCast($locCode, $PTLAction, string $type = 'success')
     {
-        if($PTLAction == 0){
-            $station = Station::query()->with('parent')->where('code',$locCode)->first();
+        if (!$locCode) return;
+        if ($PTLAction == 0) {
+            $station = Station::query()->with('parent')->where('code', $locCode)->first();
 
-            $json = json_encode( [
+            $json = json_encode([
                 'station_id' => $station['parent']['id'],
-                'code'  => $station['parent']['code'],
+                'code' => $station['parent']['code'],
                 'gird_id' => $station['id'],
                 'grid_code' => $station['code'],
-                'type' => $type
+                'type' => $type,
+                'status' => 0
             ]);
-            broadcast(new BroadcastToStation($station['parent_id'],$json));
+            broadcast(new BroadcastToStation($station['parent_id'], $json));
         }
     }
 
     /**
-     * 根据立库任务完成 缓存架任务 和 入立架任务
-     * @param StationTaskMaterialBox $putStationTaskMaterial
+     * 根据立库任务完成对storage进行修改
+     * @param StationTaskMaterialBox $stationTaskMaterial
      */
-    public function putStationTaskMaterialBoxProcess(StationTaskMaterialBox $putStationTaskMaterial)
+    public function putStationTaskMaterialBoxProcess(StationTaskMaterialBox $stationTaskMaterial)
     {
-        $this->instant($this->stationTaskMaterialBoxService,'StationTaskMaterialBoxService');
-
-        $takeStationTaskMaterialBox = StationTaskMaterialBox::query()->with('station','stationTask')->where('material_box_id',$putStationTaskMaterial['material_box_id'])->whereIn('station_id',function($query){
-            $query->from('stations')->selectRaw('id')->whereIn('station_type_id',function($query){
-                $query->from('station_types')->selectRaw('id')->where('name','缓存架');
-            });
-        })->where('status','处理中')->first();
-
-        if(!$takeStationTaskMaterialBox)return ;
-        $this->stationTaskMaterialBoxService->set($takeStationTaskMaterialBox, [
-            'status' => '完成'
-        ]);
+        $this->instant($this->stationTaskMaterialBoxService, 'StationTaskMaterialBoxService');
 
-        // 缓存架任务
-        if($takeStationTaskMaterialBox->stationTask)$takeStationTaskMaterialBox->stationTask->update(['status' => '完成']);
-        // 入立架任务
-        if($putStationTaskMaterial->stationTask)$putStationTaskMaterial->stationTask->update(['status' => '完成']);
+        $storage = Storage::query()->where('material_box_id', $stationTaskMaterial['material_box_id'])->where('status',1)->first();
+        if($storage)$storage->update(['status' => 0, 'material_box_id' => null]);
 
-        $this->_stationCacheLightOff($takeStationTaskMaterialBox->station->code ?? null);  //海柔格口灭灯
-        $this->_stationCacheBroadCast($takeStationTaskMaterialBox->station->code, 0);    //通知缓存架任务完成
+        $this->_stationCacheLightOff($stationTaskMaterial->station->code ?? null);  //海柔格口灭灯
+        $this->_stationCacheBroadCast($stationTaskMaterial->station->code ?? null, 0);    //通知缓存架任务完成
     }
 
     /**
      * 取消任务
      * @param $stationCode
      * @return array
+     * @throws \Exception
      */
     public function clearTask($stationCode): array
     {
-        $station = Station::query()->with(['currentStationTask.stationTaskMaterialBoxes.materialBox',
-            'pendingStationTask.stationTaskMaterialBoxes.materialBox'])
-            ->where('code',$stationCode)->first();
+        $station = Station::query()->with('storage')->where('code', $stationCode)->first();
 
-        if($station->currentStationTask)return ['success' => false,'message' => '当前任务正在执行','data'=>$stationCode];
-        if($station->pendingStationTask->stationTaskMaterialBoxes->count() == 0){
-            $station->pendingStationTask->delete();
-            return ['success' => true];
-        }
-
-        $taskStationTaskMaterialBox = $station->pendingStationTask->stationTaskMaterialBoxes->first() ?? null;
-        $stationTaskMaterialBoxes = StationTaskMaterialBox::query()->with('stationTask')
-            ->where('material_box_id',$taskStationTaskMaterialBox['material_box_id'])
-            ->where('station_id','!=',$station->pendingStationTask['id'])
-            ->get();
+        if (!$station) return ['success' => false, 'message' => '传入参数异常,找不到对应的缓存架记录'];
 
-        foreach ($stationTaskMaterialBoxes as $stationTaskMaterialBox) {
-            if($stationTaskMaterialBox->stationTask){
-                StationTaskChildren::query()->where([
-                    'station_task_id' => $stationTaskMaterialBox->stationTask['id'],
-                    'station_taskable_type'=>StationTaskMaterialBox::class,
-                    'station_taskable_id'=>$stationTaskMaterialBox['id']])->delete();
-
-                $stationTaskMaterialBox->stationTask->delete();
+        $stationTaskMaterialBox = StationTaskMaterialBox::query()->where('material_box_id',$station['storage']['material_box_id'])->first();
+        if($stationTaskMaterialBox ){
+            if($stationTaskMaterialBox->status == '处理中')
+                return ['success' => false, 'message' => '当前缓存架任务正在处理中'];
+            else{
+                $stationTaskMaterialBox->delete();
             }
-            $stationTaskMaterialBox->delete();
         }
+
+        $station->storage->update(['status' => 0,'material_box_id' => null]);
+
         return ['success' => true];
     }
 }

app/Services/DischargeTaskService.php

@@ -72,7 +72,7 @@ class DischargeTaskService
     }
 
     // 创建卸货任务
-    public function createTask(array $param): array
+    public function createTask(array $param,bool $loadMissing = true): array
     {
         if (isset($param['id'])) unset($param['id']);
         if (empty($param['income_total_cost'])) $param['income_total_cost'] = $param['income_unit_price'] * $param['income_amount'];
@@ -80,7 +80,7 @@ class DischargeTaskService
         if (empty($param['status'])) $param['status'] = 0;
 
         $dischargeTask = DischargeTask::query()->create($param);
-        $dischargeTask->loadMissing('facilitator', 'owner','warehouse');
+        if($loadMissing)$dischargeTask->loadMissing('facilitator', 'owner','warehouse');
 
         return ['success' => true, 'data' => $dischargeTask];
     }

app/Services/ForeignHaiRoboticsService.php

@@ -326,26 +326,12 @@ class ForeignHaiRoboticsService
     public function putBinToStore_fromCacheShelf(?StationTaskMaterialBox $stationTaskMaterialBox,
                                                  string $formLocation): bool
     {
-        LogService::log('海柔请求','putBinToStore_fromCacheShelf1', '');
-        LogService::log('海柔请求','putBinToStore_fromCacheShelf2', json_encode($stationTaskMaterialBox));
-
-        $dataToPost=$this->makeJson_move(
-            collect([$stationTaskMaterialBox]),
-            '缓存架入立架',
-            $formLocation,
-            ''
-        );
-        LogService::log('海柔请求','putBinToStore_fromCacheShelf3', json_encode($dataToPost));
+        $dataToPost=$this->makeJson_move(collect([$stationTaskMaterialBox]), '缓存架入立架', $formLocation, '');
 
         $controlSuccess = $this->controlHaiRobot($dataToPost,collect([$stationTaskMaterialBox]),'缓存架入立架');
-        LogService::log('海柔请求','putBinToStore_fromCacheShelf4', 'controlHaiRobot '. json_encode($controlSuccess));
-
         if($controlSuccess){
             $this->instant($this->stationTaskMaterialBoxService,'StationTaskMaterialBoxService');
-            $this->stationTaskMaterialBoxService->set($stationTaskMaterialBox,[
-                'status' => '处理中',
-            ]);
-            LogService::log('海柔请求','putBinToStore_fromCacheShelf5', 'controlHaiRobot '. json_encode($stationTaskMaterialBox));
+            $this->stationTaskMaterialBoxService->set($stationTaskMaterialBox,['status' => '处理中']);
         }
         return $controlSuccess;
     }

app/Station.php

@@ -49,4 +49,9 @@ class Station extends Model
             ->where('status','=','待处理');
     }
 
+    public function storage(): HasOne
+    {
+        return $this->hasOne(Storage::class);
+    }
+
 }

app/Utils/helpers.php

@@ -3,6 +3,8 @@
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 
+const DAY_TO_MILLI_SECONDS  = 1000*60*60*24;
+
 function formatExcelDate(int $timestamp)
 {
     $diff = intval($timestamp);
@@ -11,6 +13,13 @@ function formatExcelDate(int $timestamp)
     return $day->toDateString();
 }
 
+function formatExcelDateTime(float $timestamp): string
+{
+    $today = new Carbon('1900-01-01');
+    $day = $today->addMilliseconds(intval($timestamp*DAY_TO_MILLI_SECONDS))->subDays(2);
+    return $day->toDateTimeString();
+}
+
 function diff($array1,$array2,string $identification,array $mapping,bool $intactDetached = false):array
 {
     $changes = [
@@ -48,4 +57,4 @@ function diff($array1,$array2,string $identification,array $mapping,bool $intact
         }else $changes['detached'][] = array_keys($map);
     }
     return $changes;
-}
+}

database/factories/StationTaskFactory.php

@@ -9,5 +9,6 @@ $factory->define(StationTask::class, function (Faker $faker) {
     $status = ['待处理','挂起','处理中','完成','异常','取消'];
     return [
         "status"=>'待处理',
+        'station_id' => 0
     ];
 });

database/factories/StationTaskMaterialBoxFactory.php

@@ -7,6 +7,11 @@ use Faker\Generator as Faker;
 
 $factory->define(StationTaskMaterialBox::class, function (Faker $faker) {
     return [
-        'status'=>'待处理'
+        'station_id' => 0,
+        'material_box_id' => 0,
+        'status'=>'待处理',
+        'type' => 0,
+        'station_task_batch_id' =>0 ,
+        'station_task_id' => 0
     ];
 });

database/factories/StorageFactory.php

@@ -0,0 +1,15 @@
+<?php
+
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use Faker\Generator as Faker;
+
+$factory->define(\App\Storage::class, function (Faker $faker) {
+    return [
+        "station_id" => rand(0,10),
+        "material_box_id" =>  rand(0,10),
+        "commodity_id" => 0 ,
+        "amount" => 0,
+        "status" => 0,
+    ];
+});

resources/views/personnel/discharge/statement/_table.blade.php

@@ -7,7 +7,11 @@
         <th class="td-yellow" colspan="3">其他信息</th>
     </tr>
     <tr class="text-center" >
-        <th><input type="checkbox" class="form-check" name="selectAll" id="selectAll" @click="checkAll"/></th>
+        <th>
+            <label>
+                <input type="checkbox" class="form-check" name="selectAll" id="selectAll" @click="checkAll">
+            </label>
+        </th>
         <th class="td-helpful">序号</th>
         <th class="td-helpful">日期</th>
         <th class="td-helpful">作业名称</th>
@@ -27,9 +31,13 @@
     </tr>
     <template v-if="dischargeStatements.length > 0">
         <tr v-for="(dischargeTask,index) in dischargeStatements" class="text-center"  @click="selectTr===index+1?selectTr=0:selectTr=index+1" :class="selectTr===index+1?'focusing' : ''">
-            <td ><input type="checkbox" class="form-check" :value="dischargeTask.id" v-model="checkData"></td>
+            <td >
+                <label>
+                    <input type="checkbox" class="form-check" :value="dischargeTask.id" v-model="checkData">
+                </label>
+            </td>
             <td class="td-helpful">@{{ index+1 }}</td>
-            <td class="td-helpful">@{{ dischargeTask.created_at }}</td>
+            <td class="td-helpful">@{{ dischargeTask.income_at }}</td>
             <td class="td-helpful">@{{ dischargeTask.type }}</td>
             <td class="td-helpful">@{{ dischargeTask.numbers }}</td>
             <td class="td-cool">@{{ dischargeTask.income_amount }}</td>

resources/views/personnel/discharge/task/_import.blade.php

@@ -0,0 +1,38 @@
+<div class="modal fade" id="importModal">
+    <div class="modal-dialog modal-dialog-centered modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">
+                    卸货任务导入
+                </h5>
+                <button type="button" class="close" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <form>
+                    <div class="form-group">
+                        <label for="importFile">导入文件</label>
+                        <input type="file" ref="file" name="file"  id="importFile"  class="form-control-file">
+                    </div>
+                    <div class="form-group">
+                        <small>文件类型：xlsx ，xlsm ，xls</small>
+                    </div>
+                    <div class="form-group">
+                        <small>字段：*货主，*预约日期，*作业名称，*仓库，*入库单，*数量，*单位，*单价，备注（非必填）</small>
+                    </div>
+                    <div class="form-group" v-if="uploadErrors.length > 0">
+                        <p class="text-danger">导入异常明细</p>
+                        <ul class="list-group" v-if="uploadErrors">
+                            <li class="list-group-item" v-for="error in uploadErrors">@{{ error }}</li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-success" @click="cancelImport">关闭</button>
+                <button class="btn btn-success" @click="importDischarge">导入</button>
+            </div>
+        </div>
+    </div>
+</div>

resources/views/personnel/discharge/task/index.blade.php

@@ -22,12 +22,21 @@
                     <a class="dropdown-item" @click="dischargeTaskExport(true)" href="javascript:">导出所有页</a>
                 </div>
             </span>
+
             <span class="ml-1">
                 @can('人事管理-卸货-创建')
                 <button type="button" class="btn btn-outline-dark btn-sm form-control-sm tooltipTarget" @click="showCreateTaskModal(true)" style="background: #dad7e8;">创建任务</button>
                 @endcan
             </span>
+            @can('人事管理-卸货-创建')
+            <span class="ml-1">
+                  <button type="button" class="btn btn-outline-primary btn-sm form-control-sm tooltipTarget"
+                          @click="importModal"
+                  >批量导入</button>
+            </span>
+            @endcan
         </div>
+        @include('personnel.discharge.task._import')
         @include('personnel.discharge.task._table')
         @can('人事管理-卸货-创建')
         @include('personnel.discharge.task._createTask')
@@ -54,6 +63,7 @@
                 addTask: {income_at:null},
                 executingTack: {},
                 taskError:{},
+                uploadErrors:[],
                 taskTypes: [
                     {name: 0, value: "装车"},
                     {name: 1, value: "卸车"},
@@ -63,8 +73,8 @@
                 units: [
                     {name: 0, value: 'm3'},
                     {name: 1, value: '吨'},
-                    {name: 2, value: '件'},
-                    {name: 3, value: '托'},
+                    {name: 2, value: '托'},
+                    {name: 3, value: '件'},
                 ],
                 status: [
                     {name: 0, value: '创建'},
@@ -353,6 +363,42 @@
                 },
                 showReceipt(task){
                     window.open(this.getReceiptUrl(task.id));
+                },
+                // 批量导入
+                importDischarge(){
+                    window.tempTip.setIndex(1999);
+
+                    let formData = new FormData();
+                    let file = document.querySelector('#importFile').files[0];
+                    if(file==null){
+                        window.tempTip.show('请选择上传文件');
+                    }
+                    formData.append('file',file);
+                    let url = '{{url('apiLocal/personnel/discharge/task/import')}}';
+                    window.axios.post(url,formData,{
+                        'Content-Type': 'multipart/form-data'
+                    }).then(res=>{
+                        if(res.data.success){
+                            window.tempTip.showSuccess(res.data.message ? res.data.message : '导入成功！刷新页面显示');
+                            return ;
+                        }else if(res.data.errors){
+                            window.tempTip.show('导入创建卸货任务失败!，详情请看列表')
+                            this.uploadErrors = res.data.errors;
+                            return ;
+                        }
+                        window.tempTip.show('导入失败!'+(res.data.message ? res.data.message : ''));
+                    }).catch(err=>{
+                        window.tempTip.show(err);
+                    });
+                },
+                importModal(){
+                    document.querySelector('#importFile').file = [];
+                    $('#importModal').modal('show');
+                },
+                cancelImport(){
+                    this.uploadErrors = [];
+                    $('#importModal').modal('hide');
+                    document.querySelector('#importFile').value = null;
                 }
 
 

resources/views/rejected/search/general.blade.php

@@ -47,7 +47,7 @@
                 @endcan
 
                 @can('退货管理-编辑')
-                    <a class="btn btn-sm btn-outline-dark" href="{{url('rejected/importRejectedNumber')}}" style="cursor: pointer">导入修改</a>
+                    <a class="btn btn-sm btn-outline-dark" href="{{url('rejected/importRejectedNumber')}}" style="cursor: pointer">批量填充订单号</a>
                 @endcan
                 <button class="btn btn-sm ml-2 btn-primary" @click="copyLogisticNumber()">复制快递单号</button>
                 <table class="table table-striped table-sm table-bordered table-hover text-nowrap table-body td-min-width-80"  style="background: #fff;" id="table">

resources/views/station/cachingShelf/list/index.blade.php

@@ -102,7 +102,7 @@
                 // },
                 /** 初始化格口 */
                 initCacheGrid() {
-                    let url = '{{url('apiLocal/station/cacheShelf/getTasks')}}'+'/'+this.currentStation.id;
+                    let url = '{{url('apiLocal/station/cacheShelf/getChildStation')}}'+'/'+this.currentStation.id;
                     window.tempTip.setIndex(1099);
                     window.tempTip.setDuration(3000);
                     $('#alert-box').show();
@@ -110,11 +110,9 @@
                         if (res.data.data) {
                             for (let index = 0; index < res.data.data.length; index++) {
                                 let stationCode = res.data.data[index]['code'];
-                                if(!res.data.data[index]['pending_station_task'])continue;
-                                if(!res.data.data[index]['pending_station_task']['station_task_material_boxes'])continue;
-                                if(!res.data.data[index]['pending_station_task']['station_task_material_boxes'][0])continue;
-                                if(!res.data.data[index]['pending_station_task']['station_task_material_boxes'][0]['material_box'])continue;
-                                let materialBoxCode = res.data.data[index]['pending_station_task']['station_task_material_boxes'][0]['material_box']['code'] ?? null;
+                                if(!res.data.data[index]['storage'])continue;
+                                if(!res.data.data[index]['storage']['material_box'])continue;
+                                let materialBoxCode = res.data.data[index]['storage']['material_box']['code'] ?? null;
                                 this.$set(this.currentStation.grids[stationCode],'materialBoxCode',materialBoxCode);
                             }
                             $('#alert-box').hide();

routes/apiLocal.php

@@ -47,6 +47,7 @@ Route::group(['prefix' => 'personnel'], function () {
             Route::put('update', 'DischargeTaskController@updateApi')->name('discharge.updateApi');
             Route::put('updateFacilitator', 'DischargeTaskController@updateTaskFacilitatorApi')->name('discharge.updateTaskFacilitatorApi');
             Route::put('updateColumn', 'DischargeTaskController@updateApi')->name('facilitator.updateColumnApi');
+            Route::post('import', 'DischargeTaskController@importApi')->name('discharge.importApi');
         });
     });
 });
@@ -169,6 +170,7 @@ Route::group(['prefix' => 'configuration'],function(){
     Route::delete('{id}','ConfigurationController@destroyApi')->name('configuration.destroyApi');
 });
 
+
 /** 装卸队 */
 Route::group(['prefix' => 'facilitator'], function () {
     Route::post('store', 'FacilitatorController@storeApi')->name('facilitator.storeApi');
@@ -202,7 +204,7 @@ Route::group(['prefix' => 'station'],function(){
         Route::post('pushTask','CacheShelfController@pushTaskApi')->name('station.cacheShelf.pushTaskApi');
         Route::post('clearTask','CacheShelfController@clearTaskApi')->name('station.cacheShelf.clearTaskApi');
         Route::post('lightOn','CacheShelfController@lightOnApi')->name('station.cacheShelf.lightOnApi');
-        Route::get('getTasks/{id}','CacheShelfController@getTasksApi')->name('station.cacheShelf.getTasksApi');
+        Route::get('getChildStation/{id}','CacheShelfController@getChildStationApi')->name('station.cacheShelf.getChildStationApi');
     });
 
     /** 栈规则 */

tests/Services/CacheShelfService/BindMaterialBoxTest.php

@@ -0,0 +1,57 @@
+<?php
+
+
+namespace Tests\Services\CacheShelfService;
+
+
+use App\MaterialBox;
+use App\Services\CacheShelfService;
+use App\Services\ForeignHaiRoboticsService;
+use App\Services\StationTaskMaterialBoxService;
+use App\Services\StationTaskService;
+use App\Station;
+use App\Storage;
+use App\Traits\TestMockSubServices;
+use Tests\TestCase;
+
+class BindMaterialBoxTest extends TestCase
+{
+    use TestMockSubServices;
+
+
+    /** @var CacheShelfService $cacheShelfService*/
+    public $cacheShelfService;
+    public $data = [];
+
+
+
+    protected function setUp(): void
+    {
+        parent::setUp(); // TODO: Change the autogenerated stub
+        $this->cacheShelfService =  $this->subMock([
+            'class' => CacheShelfService::class,
+            'methods' => [
+                '_stationCacheLightOn' => new MaterialBox(['code' => 200])
+            ],
+        ]);
+        $this->data['station'] = factory(Station::class)->create();
+        $this->data['materialBox'] = factory(MaterialBox::class)->create();
+        $this->data['storage'] = factory(Storage::class)->create(['station_id' => $this->data['station']['id']]);
+    }
+
+    public function testBindMaterialBoxTest()
+    {
+        $result = $this->cacheShelfService->bindMaterialBox($this->data['station']['code'],$this->data['materialBox']['code']);
+        $this->assertTrue($result['success']);
+        $storage = Storage::query()->whereKey($this->data['storage']['id'])->first();
+        $this->assertEquals($this->data['materialBox']['id'],$storage['material_box_id']);
+    }
+
+    protected function tearDown(): void
+    {
+        if($this->data['station'] ?? false) Station::query()->whereKey($this->data['station']['id'])->delete();
+        if($this->data['materialBox'] ?? false) MaterialBox::query()->whereKey($this->data['materialBox']['id'])->delete();
+        if($this->data['storage'] ?? false)
+        parent::tearDown(); // TODO: Change the autogenerated stub
+    }
+}

tests/Services/CacheShelfService/ClearTaskTest.php

@@ -15,6 +15,7 @@ use App\StationTask;
 use App\StationTaskChildren;
 use App\StationTaskMaterialBox;
 use App\StationType;
+use App\Storage;
 use Tests\TestCase;
 
 class ClearTaskTest extends TestCase
@@ -41,73 +42,57 @@ class ClearTaskTest extends TestCase
         $stationType = StationType::query()->firstOrCreate(['name'=>'立库']);
 
         $this->data['LiKuStation'] = factory(Station::class)->create(['station_type_id'=>$stationType['id']]);
-        $this->data['station'] = factory(Station::class)->create();
 
-        $this->data['stationTask'] = [];
-        $this->data['stationTaskMaterialBoxes'] = [];
         $this->data['materialBox'] = factory(MaterialBox::class)->create();
 
-        $this->data['stationTask'] = $this->stationTaskService->create(1);                                                    // 生成站任务
-        $this->data['stationTaskMaterialBoxes'][] = $this->stationTaskMaterialBoxService->createByStationAndMaterialBox($this->data['station'],$this->data['materialBox']);     // 创建料箱任务
-        $this->stationTaskService->registerStations($this->data['stationTask'],[$this->data['station']['id']]);                                            // 注册站任务站
-        $this->data['stationTaskMaterialBoxes'][0]['station_task_id'] = $this->data['stationTask'][0]['id'];
-        $this->data['stationTaskMaterialBoxes'][0]->update();
-        $params = [[
-            'station_task_id'=>$this->data['stationTask'][0]->first()['id'],
-            'station_taskable_type'=>StationTaskMaterialBox::class,
-            'station_taskable_id'=>$this->data['stationTaskMaterialBoxes'][0]['id']
-        ]];
-
-        $this->stationTaskChildService->insert($params);                                                                        // 任务任务注册
+        $this->data['station'] = factory(Station::class)->create();
+
+        $this->data['storage'] = factory(Storage::class)->create(['station_id' => $this->data['station']['id']]);
+
     }
 
     public function testClearTask()
     {
         $result = $this->service->clearTask($this->data['station']->code);
-        $stationTask = StationTask::query()->where('station_id',$this->data['station']['id'])->first();
-        $this->assertEmpty($stationTask);
-        $stationTaskMaterialBox = StationTaskMaterialBox::query()->where('material_box_id',$this->data['materialBox']['id'])->get();
-        $this->assertEmpty($stationTaskMaterialBox);
+        $this->assertTrue($result['success']);
+        $storage = Storage::query()->with('materialBox')->whereKey($this->data['storage'])->first();
+        $this->assertNull($storage->materialBox);
     }
 
     public function testClearTask_taskIsRunning()
     {
-        StationTask::query()->where('station_id',$this->data['station']['id'])->update(['status' => '处理中']);
-        $result = $this->service->clearTask($this->data['station']->code);
+        Storage::query()->where('station_id',$this->data['station']['id'])->update(['material_box_id'=>$this->data['materialBox']['id']]);
 
-        $stationTask = StationTask::query()->where('station_id',$this->data['station']['id'])->first();
+        $this->data['task'] = factory(StationTask::class)->create(['station_id' => $this->data['station']['id']]);
+
+        $this->data['stationTaskMaterialBox'] = StationTaskMaterialBox::query()->create([
+            'station_id' => $this->data['LiKuStation']['id'],
+            'material_box_id' => $this->data['materialBox']['id'],
+            'status' => '处理中',
+            'station_task_id' => $this->data['task']['id'],
+            'type' => '放',
+        ]);
+
+        $this->data['stationTaskChildren'] = StationTaskChildren::query()->create([
+            'station_task_id' => $this->data['task']['id'],
+            'station_taskable_type' => StationTaskMaterialBox::class,
+            'station_taskable_id' => $this->data['stationTaskMaterialBox']['id']
+        ]);
+
+        $result = $this->service->clearTask($this->data['station']->code);
 
-        $this->assertEquals('处理中',$stationTask->status);
         $this->assertFalse($result['success']);
     }
 
 
     protected function tearDown(): void
     {
-        if($this->data['station']){
-            $stationTasks = StationTask::query()->where('station_id',$this->data['station']['id'])->get();
-            foreach ($stationTasks as $stationTask) {
-                $stationTaskMaterialBoxes = $stationTask->stationTaskMaterialBoxes;
-                foreach ($stationTaskMaterialBoxes as $stationTaskMaterialBox) {
-                    StationTaskChildren::query()->where(['station_task_id' => $stationTask['id'],'station_taskable_type'=> StationTaskMaterialBox::class,'station_taskable_id'=>$stationTaskMaterialBox['id']])->delete();
-                    $stationTaskMaterialBox->delete();
-                }
-            }
-            Station::query()->where('id',$this->data['station']['id'])->delete();
-        }
-
-        if($this->data['LiKuStation']){
-            $stationTasks = StationTask::query()->where('station_id',$this->data['LiKuStation']['id'])->get();
-            foreach ($stationTasks as $stationTask) {
-                $stationTaskMaterialBoxes = $stationTask->stationTaskMaterialBoxes;
-                foreach ($stationTaskMaterialBoxes as $stationTaskMaterialBox) {
-                    StationTaskChildren::query()->where(['station_task_id' => $stationTask['id'],'station_taskable_type'=> StationTaskMaterialBox::class,'station_taskable_id'=>$stationTaskMaterialBox['id']])->delete();
-                    $stationTaskMaterialBox->delete();
-                }
-            }
-            Station::query()->where('id',$this->data['LiKuStation']['id'])->delete();
-        }
-        if($this->data['materialBox'])MaterialBox::query()->where('id',$this->data['materialBox'])->delete();
+        if($this->data['materialBox'])MaterialBox::query()->whereKey($this->data['materialBox']['id'])->delete();
+        if($this->data['station'])Station::query()->whereKey($this->data['station']['id'])->delete();
+        if($this->data['storage'])Storage::query()->whereKey($this->data['storage']['id'])->delete();
+        if($this->data['task'] ?? false)StationTask::query()->whereKey($this->data['task']['id'])->delete();
+        if($this->data['stationTaskMaterialBox'] ?? false)StationTaskMaterialBox::query()->whereKey($this->data['stationTaskMaterialBox']['id'])->delete();
+        if($this->data['stationTaskChildren'] ?? false)StationTaskChildren::query()->whereKey($this->data['stationTaskChildren']['id'])->delete();
         parent::tearDown(); // TODO: Change the autogenerated stub
     }
 

tests/Services/CacheShelfService/CreateStationTask.php

@@ -1,100 +0,0 @@
-<?php
-
-
-namespace Tests\Services\CacheShelfService;
-
-
-use App\MaterialBox;
-use App\Services\CacheShelfService;
-use App\Services\ForeignHaiRoboticsService;
-use App\Services\StationTaskMaterialBoxService;
-use App\Services\StationTaskService;
-use App\Station;
-use App\StationTask;
-use App\StationTaskMaterialBox;
-use App\Traits\TestMockSubServices;
-use Tests\TestCase;
-
-class CreateStationTask extends TestCase
-{
-    use TestMockSubServices;
-
-    /** @var CacheShelfService $service */
-    protected $service;
-    /** @var StationTaskService $stationTaskService */
-    protected $stationTaskService;
-
-    protected $data = [];
-
-    /**
-     * createStationTask
-     * 注册站任务
-     * 注册站料箱任务
-     * 注册站任务子任务
-     */
-    protected function setUp(): void
-    {
-        parent::setUp();
-        $this->service = $this->subMock([
-            'class' => CacheShelfService::class,
-            'methods' => [
-                '_stationCacheLightOn' => new MaterialBox(['code' => 200])
-            ],
-            'subService' => [[
-                'serviceName' => 'foreignHaiRoboticsService',
-                'class' => ForeignHaiRoboticsService::class,
-                'methods' => [
-                    'controlHaiRobot' => true
-                ]
-            ], [
-                'serviceName' => 'stationTaskService',
-                'class' => StationTaskService::class
-            ], [
-                'serviceName' => 'stationTaskMaterialBoxService',
-                'class' => StationTaskMaterialBoxService::class,
-            ]
-            ]
-        ]);
-        $this->stationTaskService = $this->subMock([
-            'class' => StationTaskService::class,
-        ]);
-        $this->data['parentStation'] = factory(Station::class)->create();
-        $this->data['station'] = factory(Station::class)->create(['parent_id' => $this->data['parentStation']['id']]);
-        $this->data['materialBox'] = factory(MaterialBox::class)->create();
-    }
-
-    public function testCreatStationTask()
-    {
-        $data = $this->service->createStationTask($this->data['station']['code'], $this->data['materialBox']['code']);
-        $this->assertTrue($data['success']);
-
-        $stationTask = StationTask::query()->where('station_id', $this->data['station']['id'])->with('stationTaskMaterialBoxes')->first();
-        $stationTaskMaterialBox = StationTaskMaterialBox::query()->with('materialBox')->where('station_id', $this->data['station']['id'])->first();
-        $this->assertEquals($stationTask['status'], '待处理');
-        $this->assertEquals($stationTaskMaterialBox['materialBox']['code'], $this->data['materialBox']['code']);
-
-        $station = Station::query()->with(['pendingStationTask.stationTaskMaterialBoxes'])->where('id', $this->data['station']['id'])->first();
-        $this->assertEquals($station['pendingStationTask']['stationTaskMaterialBoxes']->first()['station_id'], $stationTask['station_id']);
-    }
-
-    public function testStationTaskIsExists()
-    {
-        $this->data['stationTask'] = $this->stationTaskService->create(1);
-        $this->stationTaskService->registerStations($this->data['stationTask'], [$this->data['station']['id']]);
-
-        $data = $this->service->createStationTask($this->data['station']['code'], $this->data['materialBox']['code']);
-        $this->assertFalse($data['success']);
-    }
-
-
-    protected function tearDown(): void
-    {
-        Station::query()->where('id', $this->data['station']['id'])->delete();
-        Station::query()->where('id', $this->data['parentStation']['id'])->delete();
-        StationTask::query()->where('station_id', $this->data['station']['id'])->delete();
-        MaterialBox::query()->where('id', $this->data['materialBox']['id'])->delete();
-        StationTaskMaterialBox::query()->where('station_id', $this->data['station']['id'])->delete();
-        if ($this->data['stationTask'] ?? false) StationTask::query()->whereIn('id', data_get($this->data['stationTask'], '*.id'))->delete();
-        parent::tearDown();
-    }
-}

tests/Services/CacheShelfService/GetChildStationTest.php

@@ -10,6 +10,7 @@ use App\StationTask;
 use App\StationTaskChildren;
 use App\StationTaskMaterialBox;
 use App\StationType;
+use App\Storage;
 use Faker\Factory;
 use Illuminate\Database\Eloquent\Collection;
 use Tests\TestCase;
@@ -31,45 +32,25 @@ class GetChildStationTest extends TestCase
         $this->data['parentStation'] = factory(Station::class)->create(['station_type_id' => $stationType['id']]);
         $this->data['station'] = factory(Station::class)->create(['parent_id'=>$this->data['parentStation']['id']]);
         $this->data['materialBox'] = factory(MaterialBox::class)->create();
-        $this->data['stationTask'] = factory(StationTask::class)->create();
-        $this->data['stationTask']['station_id'] = $this->data['station']['id'];
-        $this->data['stationTask']->save();
-
-        $this->data['stationTaskMaterialBox'] = factory(StationTaskMaterialBox::class)->create([
-            'station_id' => $this->data['station']['id'],
-            'material_box_id' => $this->data['materialBox']['id'],
-            'status' => '待处理'
-        ]);
-
-        $this->data['stationTaskMaterialBox']['station_task_id'] = $this->data['stationTask']['id'];
-        $this->data['stationTaskMaterialBox']->save();
-
-        $this->data['stationTaskChildren']  = StationTaskChildren::query()->create([
-            "station_task_id" => $this->data['stationTask']['id'],
-        ]);
+        $this->data['storage'] = factory(Storage::class)->create(['station_id' => $this->data['station']['id'],'material_box_id' => $this->data['materialBox']['id']]);
     }
 
     public function testGetTasks()
     {
-        $grids = $this->service->getChildStation($this->data['station']['id']);
-        $this->assertTrue($grids ? true : false);
+        $childStations = $this->service->getChildStation($this->data['parentStation']['id']);
+        $this->assertTrue($childStations ? true : false);
+        $station = $childStations->first();
+        $this->assertEquals($this->data['storage']['id'],$station->storage['id']);
+        $this->assertEquals($this->data['materialBox']['id'],$station->storage->materialBox['id']);
     }
 
 
     protected function tearDown(): void
     {
-        $materialBox = MaterialBox::query()->where('id', $this->data['materialBox']['id'])->first();
-        if ($materialBox) {
-            $stationTaskMaterialBoxes = StationTaskMaterialBox::query()->where('material_box_id', $materialBox['id'])->get();
-            foreach ($stationTaskMaterialBoxes as $stationTaskMaterialBox) {
-                if($stationTaskMaterialBox->station->parent)$stationTaskMaterialBox->station->parent->delete();
-                if ($stationTaskMaterialBox->station) $stationTaskMaterialBox->station->delete();
-                if ($stationTaskMaterialBox->stationTask) $stationTaskMaterialBox->stationTask->delete();
-                $stationTaskMaterialBox->delete();
-            }
-            $materialBox->delete();
-        }
-        if($this->data['stationTaskChildren'])StationTaskChildren::query()->where('id',$this->data['stationTaskChildren']['id'])->delete();
+        if($this->data['parentStation'])Station::query()->whereKey($this->data['parentStation']['id'])->delete();
+        if($this->data['station'])Station::query()->whereKey($this->data['station']['id'])->delete();
+        if($this->data['materialBox'])MaterialBox::query()->whereKey($this->data['materialBox']['id'])->delete();
+        if($this->data['storage'])Storage::query()->whereKey($this->data['storage']['id'])->delete();
         parent::tearDown(); // TODO: Change the autogenerated stub
     }
 

tests/Services/CacheShelfService/LightOffTaskTest.php

@@ -48,18 +48,17 @@ class LightOffTaskTest extends TestCase
         $this->data['station'] = factory(Station::class)->create(['parent_id'=>$this->data['parentStation']['id'],'code' => $this->data['locCode']]);
         $this->data['materialBox'] = factory(MaterialBox::class)->create();
 
-        $this->data['stationTask'] = factory(StationTask::class)->create();
+        $this->data['stationTask'] = factory(StationTask::class)->create(['station_id' =>$this->data['station']['id']]);
         $this->data['stationTask']['station_id'] = $this->data['station']['id'];
         $this->data['stationTask']->save();
 
         $this->data['stationTaskMaterialBox'] = factory(StationTaskMaterialBox::class)->create([
             'station_id' => $this->data['station']['id'],
             'material_box_id' => $this->data['materialBox']['id'],
-            'status' => '待处理'
+            'status' => '待处理',
+            'station_task_id' => $this->data['stationTask']['id'],
         ]);
 
-        $this->data['stationTaskMaterialBox']['station_task_id'] = $this->data['stationTask']['id'];
-        $this->data['stationTaskMaterialBox']->save();
 
         $this->data['stationTaskChildren']  = StationTaskChildren::query()->create([
             "station_task_id" => $this->data['stationTask']['id'],