手动出库海柔入口

app/Http/Controllers/api/thirdPart/haiq/LightController.php

@@ -39,7 +39,7 @@ class LightController
 //        }
         $success = $request->input('success');
         $location = $success?200:0;
-        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->all()));
+        app('LogService')->log(__METHOD__,__FUNCTION__,'拍灯：'.json_encode($request->all()));
         return ['location'=>$location,'errMsg'=>'','data'=>$request->all()];
     }
 

app/Http/Controllers/api/thirdPart/haiq/StorageController.php

@@ -320,6 +320,7 @@ class StorageController
         }
         $response = Http::post(config('api.haiq.storage.moveBin'),$post);
         $responseBody = $response->body();
+        LogService::log(__CLASS__,__METHOD__,$responseBody);
         $responseBody = strstr($responseBody,'200')?'请求出库料箱"'.implode(',',$codes).'"成功':$responseBody;
         return ['result'=> $responseBody];
     }

app/Http/Requests/ForeignHaiRobotic_taskUpdateRequest.php

@@ -29,7 +29,7 @@ class ForeignHaiRobotic_taskUpdateRequest extends FormRequest
            'groupCode'=>'required',
            'taskCode'=>'required',
            'updateEventType'=>'required|in:0,1',
-           'status'=>'required|in:0,1',
+           'status'=>'required',//|in:0,1
 //           'binCode'=>'required',
            'kubotId'=>'required',
            'description'=>'nullable',

app/Services/BatchService.php

@@ -80,7 +80,10 @@ class BatchService
             $stationTaskMaterialBoxes_occupied = $this->stationTaskMaterialBoxService->getOccupied_byBatches($batches_shouldProcess); //按规则过滤需要的波次
             LogService::log(__METHOD__,'assignTasks','波次任务分配2b：'.json_encode($batches));
             if($stationTaskMaterialBoxes_occupied->isNotEmpty()) {
-                BatchTaskJob::dispatch($batches_shouldProcess->toArray())
+                foreach ($batches_shouldProcess as $batch){
+                    Cache::tags(['波次防重叠'.$batch['id']])->flush();
+                }
+                BatchTaskJob::dispatch($batches_shouldProcess)
                     ->delay(now()->addMinutes(1));    //因为料箱被占用了，所以将任务推迟1分钟后尝试
                 return;
             }

app/Services/ForeignHaiRoboticsService.php

@@ -241,7 +241,8 @@ class ForeignHaiRoboticsService
             $this->stationTaskMaterialBoxService->firstOrCreate([
                 'station_id' => $this->stationService->getStation_byType('立库')['id'],
                 'material_box_id' => $stationTaskMaterialBox['materialBox']['id'],
-                'status' => '处理中'
+                'status' => '处理中',
+                'type' => '放',
             ]);
         LogService::log('海柔请求','putBinToStore2',
             json_encode($stationTaskMaterialBox));

resources/views/store/deliveryAppointment/appointment.blade.php

@@ -14,7 +14,7 @@
                         <div class="card-header">
                             <div class="row">
                                 <label class="col-2">
-                                    <label class="text-danger font-weight-bold ml-2 h4">*</label>
+{{--                                    <label class="text-danger font-weight-bold ml-2 h4">*</label>--}}
                                 </label>
                                 <label class="col-2">车牌号</label>
                                 <label class="col-2">车型</label>
@@ -356,4 +356,4 @@
             },
         });
     </script>
-@stop
+@stop