LD 5 лет назад
Родитель
Сommit
69575753c8

+ 2 - 0
app/Http/Controllers/api/thirdPart/haiq/StorageController.php

@@ -279,6 +279,8 @@ class StorageController
         return $this->light($request,$this->lightOff);
     }
     public function taskUpdate(ForeignHaiRobotic_taskUpdateRequest $request){
+        LogService::log('海柔请求','taskUpdate',
+            json_encode($request->all()));
         try{
             $this->service->taskUpdate(
 //                $request['groupCode']

+ 1 - 1
app/Http/Requests/ForeignHaiRobotic_taskUpdateRequest.php

@@ -38,7 +38,7 @@ class ForeignHaiRobotic_taskUpdateRequest extends FormRequest
     public function withValidator(Validator $validator)
     {
         $validator->after(function (Validator $validator) {
-            LogService::log('海柔请求','taskUpdate',
+            LogService::log('海柔请求','valideate',
                 json_encode($validator));
             if($validator->errors()->isNotEmpty()){
                 $validator->errors()->add('code','422');

+ 23 - 1
app/Services/ForeignHaiRoboticsService.php

@@ -193,12 +193,21 @@ class ForeignHaiRoboticsService
         $status,            //0:任务成功1:任务失败
         $binCode
     ):bool{
+        LogService::log('海柔请求','taskUpdateIn1',
+            json_encode([
+                $stationTaskMaterialBox_id,
+                $updateEventType,
+                $status,
+                $binCode
+            ]));
         $this->instant($this->stationTaskMaterialBoxService,'StationTaskMaterialBoxService');
         try{
             if(($failed
                     =$status)==1){
                 throw new ErrorException('海柔任务失败');
             }
+            LogService::log('海柔请求','taskUpdateIn2',
+                $failed);
             if($料箱不匹配=
                 !$stationTaskMaterialBox
                     =(function()use($stationTaskMaterialBox_id,$binCode){
@@ -206,8 +215,15 @@ class ForeignHaiRoboticsService
                     if($stationTaskMaterialBox['materialBox']['code']==$binCode)return $stationTaskMaterialBox;
                     return null;
                 })()){
-                throw new ErrorException('发回的料箱和任务号(ID)不匹配');
+                throw new ErrorException('发回的料箱和任务号(ID)不匹配:$stationTaskMaterialBox_id:'
+                    .$stationTaskMaterialBox_id.' $binCode:'.$binCode. ' '.
+                    StationTaskMaterialBox::query()
+                        ->where('id', $id=$stationTaskMaterialBox_id)
+                        ->get()
+                        ->toJson());
             }
+            LogService::log('海柔请求','taskUpdateIn2',
+                $料箱不匹配);
             ($标记已放置在库外=
                 function()use($updateEventType,$stationTaskMaterialBox){
                     if(($isPut
@@ -215,6 +231,8 @@ class ForeignHaiRoboticsService
                         $this->stationTaskMaterialBoxService->markHasTaken($stationTaskMaterialBox);
                     }
                 })();
+            LogService::log('海柔请求','taskUpdateIn3',
+                $标记已放置在库外);
             ($标记已入立架=
                 function()use($updateEventType,$stationTaskMaterialBox){
                     if(($isGet
@@ -222,7 +240,11 @@ class ForeignHaiRoboticsService
                         $this->stationTaskMaterialBoxService->markPutStored($stationTaskMaterialBox);
                     }
                 })();
+            LogService::log('海柔请求','taskUpdateIn4',
+                $标记已入立架);
         }catch (\Exception $e){
+            LogService::log('海柔请求','taskUpdateIn555',
+                $e->getMessage());
             $this->excepted($stationTaskMaterialBox_id, $binCode, $e->getMessage());
             return false;
         }

+ 2 - 0
app/Services/StationService.php

@@ -79,6 +79,8 @@ class StationService
                 "stationTaskMaterialBoxes.materialBox",
             ]);
         $this->broadcast($station_id, $stationTask);
+        LogService::log('海柔请求','broadcastBinMonitor',
+            json_encode($stationTask));
     }
 
 }

+ 2 - 0
app/Services/StationTaskMaterialBoxService.php

@@ -109,6 +109,8 @@ class StationTaskMaterialBoxService
         $this->instant($this->stationService,'StationService');
         try{
             $taskType=$this->getServingTaskType($stationTaskMaterialBox);
+            LogService::log('海柔请求','markHasTaken',
+                json_encode($taskType));
             switch ($taskType){
                 case '分波次':
                     $this->markProcessing($stationTaskMaterialBox);

+ 1 - 0
resources/views/station/monitor/show.blade.php

@@ -311,6 +311,7 @@
                         let json = JSON.parse(msg.json);
                         if(!json||json.length===0)return;
                         this.station['current_station_task']=json;
+                        console.log(json);
                     });
                 },
             },