|
|
@@ -74,14 +74,14 @@ class StationTaskMaterialBoxService
|
|
|
$orderCommodities=OrderCommodity::query()->with('orderBin')->whereIn('order_id',$order_ids)->get();
|
|
|
if($orderCommodities->isEmpty())return $stationMaterialBoxes_toCreate;
|
|
|
$stationType=$this->stationTypeService->getForMaterialBox_onBatchProcess();
|
|
|
- $stationTaskBatch=$this->stationTaskBatchService->get(['batch_id',$batch['id']]);
|
|
|
+ $stationTaskBatch=$this->stationTaskBatchService->get(['batch_id'=>$batch['id']])->first();
|
|
|
foreach ($orderCommodities as $orderCommodity){
|
|
|
$station=$this->stationService->getStation_byType($stationType['name']);
|
|
|
$materialBox=$this->materialBoxService->firstOrCreate(['code' => $orderCommodity['location']]);
|
|
|
$stationMaterialBoxes_toCreate->push([
|
|
|
'station_id'=>$station['id'],
|
|
|
'material_box_id'=>$materialBox['id'],
|
|
|
- 'station_task_batch_id'=>$stationTaskBatch['id'],
|
|
|
+ 'station_task_batch_id'=>$stationTaskBatch['id']??null,
|
|
|
'status'=>'待处理'
|
|
|
]);
|
|
|
}
|