stationTask完成标记

app/Services/ForeignHaiRoboticsService.php

@@ -131,7 +131,7 @@ class ForeignHaiRoboticsService
                         ->get(
                             [
                                 'material_box_id'=>$materialBox['id'],
-                                'status'=>['处理中','待处理','异常'],
+                                'status'=>['处理中','待处理','异常','处理队列'],
                             ]
                         )->first();
             })();

app/Services/StationService.php

@@ -56,18 +56,18 @@ class StationService
         return null;
     }
 
-    function broadcast($station_id, $json_data){
-        broadcast(new BroadcastToStation($station_id,$json_data));
+    function broadcast($station_id, StationTask $stationTask){
+        broadcast(new BroadcastToStation($station_id,$stationTask->toJson()));
     }
 
     function broadcastBinMonitor($station_id, ?StationTask $stationTask){
         $stationTask->loadMissing([
             "stationTaskCommodities.commodity.barcodes",
             "stationTaskCommodities.materialBox",
-            "stationTaskBatches.batch"
-            /*,"taskMaterialBoxes.box"*/
+            "stationTaskBatches.batch",
+            "stationTaskMaterialBoxes.materialBox",
         ]);
-        $this->broadcast($station_id, $stationTask->toJson());
+        $this->broadcast($station_id, $stationTask);
         //...
         //$stationTask->stationTaskBatch
         //$stationTask->stationTaskMaterialBox

app/Services/StationTaskService.php

@@ -104,7 +104,7 @@ class StationTaskService
             $stationTask_orCollection = collect([$stationTask_orCollection]);
         }
         $this->markProcessed_byIds(
-            data_get($stationTask_orCollection, '*.station_id')
+            data_get($stationTask_orCollection, '*.id')
         );
     }
 

resources/views/station/monitor/show.blade.php

@@ -310,33 +310,9 @@
                     window.Echo.channel(this.broadcastName).listen(this.channelName,(msg)=> {
                         let json = JSON.parse(msg.json);
                         console.log(json)
-                        // this._refreshData(json);
+                        this.station['current_station_task']=json;
                     });
                 },
-                // _refreshData(obj){
-                //     let task={};
-                //     task.taskCommodities = [];
-                //     task.sum = 0;
-                //     task.currentSum = 0;
-                //     task.currentCommodityIndex = "";
-                //     obj.station_task_commodities.forEach((taskCommodity,i)=> {
-                //         task.sum += Number(taskCommodity.amount);
-                //         if (taskCommodity.status === '完成') task.currentSum += Number(taskCommodity.amount);
-                //         if (taskCommodity.status === '处理中') task.currentCommodityIndex = i;
-                //         task.taskCommodities.push({
-                //             bg:this._setColor(taskCommodity.status),
-                //             amount:taskCommodity.amount,
-                //             binNumber:taskCommodity.bin_number,
-                //             name:taskCommodity.commodity?taskCommodity.commodity.name:'',
-                //             barcodes:taskCommodity.commodity?taskCommodity.commodity.barcodes:[],
-                //             materialBox:taskCommodity.material_box,
-                //         });
-                //     });
-                //     task.taskBatch=obj.station_task_batches[0];
-                //     setBarcode(task.taskBatch.batch.code,"#barcode",1,50,false);
-                //     console.log(task)
-                //     this.task = task;
-                // },
             },
             computed:{
                 task(){
@@ -447,6 +423,7 @@
                                         taskMaterialBox=taskMaterialBox_in;
                                     }
                                 });
+                                if(!taskMaterialBox)return 1;
                                 return taskMaterialBox.material_box.grid_amount;
                             }
                         )();
@@ -483,10 +460,10 @@
                             case 2:
                                 positions.forEach(function(position){
                                     grids.half.left.status = '启用';
-                                    grids.half.left.status = '启用';
+                                    grids.half.right.status = '启用';
                                     switch (position){
                                         case 1: grids.half.left.status = '处理中';break;
-                                        case 2: grids.half.left.status = '处理中';break;
+                                        case 2: grids.half.right.status = '处理中';break;
                                     }
                                 });break;
                             case 4: