修改stationTaskCommodities与taskMaterialBox关系

app/Http/Controllers/StationController.php

@@ -57,7 +57,7 @@ class StationController extends Controller
 //        $stationTypeBinMonitor = StationTypeBinMonitor::query()->where("station_id",$station->id)->first();
         $station->loadMissing([
             "stationTasks_today.stationTaskCommodities.commodity.barcodes",
-            "stationTasks_today.stationTaskCommodities.materialBox",
+            "stationTasks_today.stationTaskCommodities.stationTaskMaterialBox",
             "stationTasks_today.stationTaskBatches.batch.owner",
             "stationTasks_today.stationTaskMaterialBoxes.materialBox",
             "stationTypeBinMonitor",

app/Services/BatchService.php

@@ -101,7 +101,7 @@ class BatchService
             foreach ($stationTasks as &$stationTask){
                 $stationTask->loadMissing([
                     "stationTaskCommodities.commodity.barcodes",
-                    "stationTaskCommodities.materialBox",
+                    "stationTaskCommodities.stationTaskMaterialBox",
                     "stationTaskBatches.batch.owner",
                     "stationTaskMaterialBoxes.materialBox",
                 ]);

app/Services/StationService.php

@@ -82,7 +82,7 @@ class StationService
         if($stationTask)
             $stationTask->loadMissing([
                 "stationTaskCommodities.commodity.barcodes",
-                "stationTaskCommodities.materialBox",
+                "stationTaskCommodities.stationTaskMaterialBox",
                 "stationTaskBatches.batch",
                 "stationTaskMaterialBoxes.materialBox",
             ]);

app/Services/StationTaskCommodityService.php

@@ -156,7 +156,7 @@ class StationTaskCommodityService
                 });
                 if(count($processingIds)==0){
                     foreach($groupByBatch as &$stationTaskCommodity){
-                        if($stationTaskCommodity['material_box_id']==$groupByBatch[0]['material_box_id']){
+                        if($stationTaskCommodity['station_task_material_box_id']==$groupByBatch[0]['station_task_material_box_id']){
                             $stationTaskCommodity['status']='处理中';
                         }
                     }

app/StationTaskCommodity.php

@@ -11,15 +11,15 @@ class StationTaskCommodity extends Model
 {
     use ModelLogChanging;
 
-    protected $fillable= ['station_id','material_box_id','commodity_id','amount','order_id','status',"bin_number","station_task_batch_id","material_box_position"];
+    protected $fillable= ['station_id','station_task_material_box_id','commodity_id','amount','order_id','status',"bin_number","station_task_batch_id","material_box_position"];
 
     public function commodity(): BelongsTo
     {   //商品
         return $this->belongsTo(Commodity::class);
     }
-    public function materialBox(): BelongsTo
+    public function StationTaskMaterialBox(): BelongsTo
     {   //料箱
-        return $this->belongsTo(MaterialBox::class);
+        return $this->belongsTo(StationTaskMaterialBox::class);
     }
     function stationTask(): BelongsTo
     {

database/migrations/2021_06_29_161702_change_station_task_commodities_field_material_box.php

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