Эх сурвалжийг харах

海柔机器人料箱状态

LD 4 жил өмнө
parent
commit
6ba9c7f2ba

+ 6 - 4
app/MaterialBox.php

@@ -16,10 +16,12 @@ class MaterialBox extends Model
         'status'=>[
             '在库外'=>1,
             '在U型线'=>2,
-            '在出库中'=>3,
-            '在入库中'=>4,
-            '在立库'=>5,
-            '异常'=>6,
+            '在缓存架'=>3,
+            '在立库'=>4,
+            '在出库中'=>5,
+            '在入库中'=>6,
+            '未知'=>7,
+            '异常'=>8,
         ],
     ];
     function __construct(array $attributes = [])

+ 23 - 6
app/Services/ForeignHaiRoboticsService.php

@@ -100,7 +100,7 @@ class ForeignHaiRoboticsService
             $groupIdPrefix
         );
         LogService::log(__METHOD__,'runMany','波次任务分配6.r5f2:'.json_encode($dataToPost));
-        return $this->controlHaiRobot($dataToPost);
+        return $this->controlHaiRobot($dataToPost,$taskMaterialBoxes,'立架出至输送线');
     }
 
     public function moveBin(){
@@ -216,7 +216,7 @@ class ForeignHaiRoboticsService
                 '',
                 $stationTaskMaterialBox_toStore['stationTaskBatch']['id']
             );
-            $this->controlHaiRobot($dataToPost);
+            $this->controlHaiRobot($dataToPost,collect([$stationTaskMaterialBox_toStore]),'输送线入立架');
 
             $stationTaskMaterialBox = $stationTaskMaterialBox_toStore??$materialBox??null;
             if($stationTaskMaterialBox && get_class($stationTaskMaterialBox)==MaterialBox::class){
@@ -257,7 +257,7 @@ class ForeignHaiRoboticsService
         );
         LogService::log('海柔请求','putBinToStore3',
             json_encode($dataToPost));
-        $controlSuccess = $this->controlHaiRobot($dataToPost);
+        $controlSuccess = $this->controlHaiRobot($dataToPost,collect([$stationTaskMaterialBox_toStore]),'输送线入立架');
 
         return $controlSuccess;
     }
@@ -282,7 +282,7 @@ class ForeignHaiRoboticsService
         );
         LogService::log('海柔请求','putBinToStore_fromCacheShelf3', json_encode($dataToPost));
 
-        $controlSuccess = $this->controlHaiRobot($dataToPost);
+        $controlSuccess = $this->controlHaiRobot($dataToPost,collect([$stationTaskMaterialBox]),'缓存架入立架');
         LogService::log('海柔请求','putBinToStore_fromCacheShelf4', 'controlHaiRobot '. json_encode($controlSuccess));
 
         if($controlSuccess){
@@ -380,7 +380,7 @@ class ForeignHaiRoboticsService
      * @param array $dataToPost
      * @return bool
      */
-    public function controlHaiRobot(array $dataToPost): bool
+    public function controlHaiRobot(array $dataToPost,Collection $taskMaterialBoxes,$modeName): bool
     {
         LogService::log('海柔请求','runMany','波次任务分配6.r5f2c1:'.json_encode($dataToPost));
         try{
@@ -424,7 +424,24 @@ class ForeignHaiRoboticsService
             . '请求:' . json_encode($dataToPost)
             . '调用堆栈c:' . json_encode(array_slice(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS), 0, 3))
         );
-        return $isSuccess = !$errMsg;
+        $isSuccess = !$errMsg;
+        $标记料箱状态=(function() use ($taskMaterialBoxes,$modeName){
+            foreach ($taskMaterialBoxes as $taskMaterialBox){
+                switch ($modeName){
+                    case '缓存架入立架':
+                    case '输送线入立架':
+                    case '移动立架内位置':
+                    $taskMaterialBox->materialBox['status']='在入库中';break;
+                    case '立架出至输送线':
+                    case '立架出至缓存架':
+                    $taskMaterialBox->materialBox['status']='在出库中';break;
+                    default:
+                        $taskMaterialBox->materialBox['status']='未知';break;
+                }
+                $taskMaterialBox->materialBox->update();
+            }
+        })();
+        return $isSuccess;
     }
 
 }

+ 8 - 2
app/Services/StationTaskMaterialBoxService.php

@@ -165,16 +165,22 @@ class StationTaskMaterialBoxService
                     /** @var StationTask $stationTask */
                     $stationTask = $this->stationTaskService->getProcessing();
                     $this->stationService->broadcastBinMonitor($stationTaskMaterialBox['station_id'], $stationTask);
+                    $stationTaskMaterialBox->materialBox['status']='在U型线';
+                    $stationTaskMaterialBox->materialBox->save();
                     break;
                 case '入立库':
                     $this->set($stationTaskMaterialBox,[
                         'id' => $stationTaskMaterialBox['station_id'],
                         'status' => '完成',
                     ]);
-
                     $this->cacheShelfService->putStationTaskMaterialBoxProcess($stationTaskMaterialBox);
+                    $stationTaskMaterialBox->materialBox['status']='在立库';
+                    $stationTaskMaterialBox->materialBox->save();
+                    break;
+                case '入缓存架':
+                    $stationTaskMaterialBox->materialBox['status']='在缓存架';
+                    $stationTaskMaterialBox->materialBox->save();
                     break;
-                case '入缓存架':break;
                 default:;
             }
         }catch (\Exception $e){

+ 1 - 1
resources/views/maintenance/tutorial/create.blade.php

@@ -1,7 +1,7 @@
 @extends('layouts.app')
 @section('title')录入-教程@endsection
 @section('head')
-    <link rel="stylesheet" type="text/css" href="{{mix('css/trix.css')}}">
+    <link rel="stylesheet" type="text/css" href="{{asset('css/trix.css')}}">
     <script type="text/javascript" src="{{mix('js/trix.js')}}"></script>
     <script>