|
|
@@ -144,7 +144,7 @@ class StationTaskCommodityService
|
|
|
$taskBatchId=$groupByBatch[0]['station_task_batch_id'];
|
|
|
$processing=$this->getProcessing_byTaskBatch($taskBatchId);
|
|
|
if(!$processing
|
|
|
- || $processing['station_task_batch_id']==$taskBatchId ){
|
|
|
+ || $processing['material_box_id'] == $taskBatchId['material_box_id']){
|
|
|
$status='处理中';
|
|
|
}else{
|
|
|
$status='处理队列';
|
|
|
@@ -160,10 +160,10 @@ class StationTaskCommodityService
|
|
|
$toProcess=$toArray->where('status','处理中');
|
|
|
$ids_toQueue_toUpdate = data_get($toQueue, '*.id');
|
|
|
if(count($ids_toQueue_toUpdate))
|
|
|
- StationTaskCommodity::query()->where('id',$ids_toQueue_toUpdate)->update(['status'=>'处理队列']);
|
|
|
+ StationTaskCommodity::query()->whereIn('id',$ids_toQueue_toUpdate)->update(['status'=>'处理队列']);
|
|
|
$ids_toProcess_toUpdate = data_get($toProcess, '*.id');
|
|
|
if(count($ids_toProcess_toUpdate))
|
|
|
- StationTaskCommodity::query()->where('id',$ids_toProcess_toUpdate)->update(['status'=>'处理中']);
|
|
|
+ StationTaskCommodity::query()->whereIn('id',$ids_toProcess_toUpdate)->update(['status'=>'处理中']);
|
|
|
})();
|
|
|
|
|
|
}
|