料箱分隔口

app/Services/ForeignHaiRoboticsService.php

@@ -143,11 +143,12 @@ class ForeignHaiRoboticsService
                 ->markProcessed($stationTaskMaterialBox);
             $stationTaskMaterialBox_next=
                 $this->stationTaskMaterialBoxService
-                ->processNextQueued($stationTaskMaterialBox); //找到队列中下一个料箱，并标记为处理中
+                    ->processNextQueued($stationTaskMaterialBox); //找到队列中下一个料箱，并标记为处理中
             $this->stationTaskCommoditiesService
                 ->markProcessed($stationTaskMaterialBox['stationTaskCommodities']);
-            $this->stationTaskCommoditiesService
-                ->markProcessing($stationTaskMaterialBox_next['stationTaskCommodities']);//因为上边商品任务被标记完成了，所以这里要将队列中找出正在处理的料箱对应的标记为“处理中”
+            if($stationTaskMaterialBox_next)
+                $this->stationTaskCommoditiesService
+                    ->markProcessing($stationTaskMaterialBox_next['stationTaskCommodities']);//因为上边商品任务被标记完成了，所以这里要将队列中找出正在处理的料箱对应的标记为“处理中”
             $this->stationService->broadcastBinMonitor($stationTaskMaterialBox['station_id'],$stationTaskMaterialBox['stationTask']);
             return true;
         }catch (\Exception $e){

database/migrations/2021_03_01_160004_add_column_grid_amount_for_material_boxes.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddColumnGridAmountForMaterialBoxes extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('material_boxes', function (Blueprint $table) {
+            $table->unsignedTinyInteger('');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('material_boxes', function (Blueprint $table) {
+            //
+        });
+    }
+}

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

@@ -6,9 +6,9 @@
         @component('station.menu')
         @endcomponent
         @component('station.monitor.menu')
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{URL::current()}}" :class="{active:isActive('{{$station->id}}',3)}">显示：{{$station->name}}</a>
-                    </li>
+            <li class="nav-item">
+                <a class="nav-link" href="{{URL::current()}}" :class="{active:isActive('{{$station->id}}',3)}">显示：{{$station->name}}</a>
+            </li>
         @endcomponent
     </div>
     <div class="container-fluid body" id="container">
@@ -22,25 +22,25 @@
                     <div class="col-4">
                         <div class="row">
                             <div class="col py-3 h4">
-                                波次号：<b>@{{ task.taskBatch.batch.code }}</b>
-                            </div>
-                            <div class="col py-3 h4">
-
+                                <div>波次号：</div>
+                                <div class=" text-center">
+                                    <b>@{{ task.taskBatch.batch.code }}</b>
+                                </div>
                             </div>
                         </div>
                         <div class="row">
-                            <div class="py-3 text-muted">
+                            <div class="col py-3 text-muted text-center">
                                 <img id="barcode" alt="">
                             </div>
                         </div>
                         <div class="row">
                             <div class="col py-3 h4">
-                                料箱号：<b v-if="task.currentCommodityIndex && task.currentCommodityIndex!=-1">@{{task.taskCommodities[task.currentCommodityIndex]['materialBox']['code']}}</b>
+                                料箱号：<b v-if="task.currentCommodityIndex && task.currentCommodityIndex!==-1">@{{task.taskCommodities[task.currentCommodityIndex]['materialBox']['code']}}</b>
                             </div>
                         </div>
                         <div class="row pt-2">
                             <div class="col">
-{{--                                @include("station.monitor._svg")--}}
+                                {{--                                @include("station.monitor._svg")--}}
                                 <img src="{{asset('images/demoBin.png')}}" alt="" class="img">
                             </div>
                         </div>
@@ -50,8 +50,15 @@
                             <div class="col py-3 h4" v-for="stationTypeBinMonitor in stationTypeBinMonitors">
                                 <table class="table border">
                                     <tr v-for="row in stationTypeBinMonitor">
-                                        <td class="border p-0" v-for="column in row"
-                                            :class="task.currentCommodityIndex&&task.currentCommodityIndex!==-1&&task.taskCommodities[task.currentCommodityIndex]['binNumber']==column ? 'bg-info' : ''">
+                                        <td class="border p-0"
+                                            v-for="column in row"
+                                            :class="
+                                                task.currentCommodityIndex
+                                                && task.currentCommodityIndex!==-1
+                                                && task.taskCommodities[task.currentCommodityIndex]['binNumber'] === column
+                                                    ? 'bg-info'
+                                                    : ''
+                                        ">
                                             <span style="opacity:0.25">@{{ column }}</span></td>
                                     </tr>
                                 </table>
@@ -76,7 +83,7 @@
                                         <td>@{{ i+1 }}</td>
                                         <td>@{{ taskCommodity.name }}</td>
                                         <td>@{{ taskCommodity.amount }}</td>
-                                        <td><small v-for="barcode in taskCommodity.barcodes">@{{ barcode.code }}</small><br></td>
+                                        <td><small class="text-dark font-weight-bold" v-for="barcode in taskCommodity.barcodes">@{{ barcode.code }}</small><br></td>
                                     </tr>
                                 </table>
                             </div>
@@ -132,7 +139,7 @@
                 this._broadcast();
                 console.log(this.stationTypeBinMonitor);
                 this._renderingstationTypeBinMonitor(this.stationTypeBinMonitor.amount,this.stationTypeBinMonitor.row,this.stationTypeBinMonitor.column);
-               /* this._renderingBox(3,5);*/
+                /* this._renderingBox(3,5);*/
             },
             methods:{
                 _broadcast(){
@@ -165,7 +172,7 @@
                         });
                     });
                     task.taskBatch=obj.station_task_batches[0];
-                    setBarcode(task.taskBatch.batch.code,"#barcode",2,50,false);
+                    setBarcode(task.taskBatch.batch.code,"#barcode",1,50,false);
                     console.log(task)
                     this.task = task;
                 },