|
@@ -170,7 +170,7 @@ class ForeignHaiRoboticsService
|
|
|
): bool
|
|
): bool
|
|
|
{
|
|
{
|
|
|
LogService::log('海柔请求','markBinProcessed1.1',
|
|
LogService::log('海柔请求','markBinProcessed1.1',
|
|
|
- '');
|
|
|
|
|
|
|
+ $binCode.'|'.$success.'|'.$exception.'|'.$is_in_plan);
|
|
|
$this->instant($this->stationService,'StationService');
|
|
$this->instant($this->stationService,'StationService');
|
|
|
$this->instant($this->materialBoxService,'MaterialBoxService');
|
|
$this->instant($this->materialBoxService,'MaterialBoxService');
|
|
|
$this->instant($this->stationTaskMaterialBoxService,'StationTaskMaterialBoxService');
|
|
$this->instant($this->stationTaskMaterialBoxService,'StationTaskMaterialBoxService');
|
|
@@ -207,21 +207,21 @@ class ForeignHaiRoboticsService
|
|
|
->first();
|
|
->first();
|
|
|
})();
|
|
})();
|
|
|
LogService::log('海柔请求','markBinProcessed1.6',
|
|
LogService::log('海柔请求','markBinProcessed1.6',
|
|
|
- json_encode($stationTaskMaterialBox));
|
|
|
|
|
|
|
+ json_encode($stationTaskMaterialBox).'|'.$binCode);
|
|
|
if(!$stationTaskMaterialBox){
|
|
if(!$stationTaskMaterialBox){
|
|
|
throw new ErrorException($binCode.'该料箱没有安排在处理队列中.');
|
|
throw new ErrorException($binCode.'该料箱没有安排在处理队列中.');
|
|
|
}
|
|
}
|
|
|
LogService::log('海柔请求','markBinProcessed1.7',
|
|
LogService::log('海柔请求','markBinProcessed1.7',
|
|
|
- json_encode($stationTaskMaterialBox));
|
|
|
|
|
|
|
+ json_encode($stationTaskMaterialBox).'|'.$binCode);
|
|
|
|
|
|
|
|
- DB::transaction(function ()use($stationTaskMaterialBox){
|
|
|
|
|
|
|
+ DB::transaction(function ()use($stationTaskMaterialBox,$binCode){
|
|
|
$stationTaskMaterialBox_next=
|
|
$stationTaskMaterialBox_next=
|
|
|
$this->stationTaskMaterialBoxService
|
|
$this->stationTaskMaterialBoxService
|
|
|
->processNextQueued($stationTaskMaterialBox); //找到队列中下一个料箱,并标记为处理中
|
|
->processNextQueued($stationTaskMaterialBox); //找到队列中下一个料箱,并标记为处理中
|
|
|
$this->stationTaskCommoditiesService
|
|
$this->stationTaskCommoditiesService
|
|
|
->markProcessed($stationTaskMaterialBox['stationTaskCommodities']);
|
|
->markProcessed($stationTaskMaterialBox['stationTaskCommodities']);
|
|
|
LogService::log('海柔请求','markBinProcessed1.8',
|
|
LogService::log('海柔请求','markBinProcessed1.8',
|
|
|
- json_encode($stationTaskMaterialBox));
|
|
|
|
|
|
|
+ json_encode($stationTaskMaterialBox).'|'.$binCode);
|
|
|
if($stationTaskMaterialBox_next)
|
|
if($stationTaskMaterialBox_next)
|
|
|
$this->stationTaskCommoditiesService
|
|
$this->stationTaskCommoditiesService
|
|
|
->markProcessing($stationTaskMaterialBox_next['stationTaskCommodities']);//因为上边商品任务被标记完成了,所以这里要将队列中找出正在处理的料箱对应的标记为“处理中”
|
|
->markProcessing($stationTaskMaterialBox_next['stationTaskCommodities']);//因为上边商品任务被标记完成了,所以这里要将队列中找出正在处理的料箱对应的标记为“处理中”
|
|
@@ -232,26 +232,26 @@ class ForeignHaiRoboticsService
|
|
|
if($notProcessedBoxTasks->isEmpty()){
|
|
if($notProcessedBoxTasks->isEmpty()){
|
|
|
$this->instant($this->stationTaskService,'StationTaskService');
|
|
$this->instant($this->stationTaskService,'StationTaskService');
|
|
|
LogService::log('海柔请求','markBinProcessed1.81',
|
|
LogService::log('海柔请求','markBinProcessed1.81',
|
|
|
- json_encode($stationTaskMaterialBox['stationTaskBatch']));
|
|
|
|
|
|
|
+ json_encode($stationTaskMaterialBox['stationTaskBatch']).'|'.$binCode);
|
|
|
$stationTaskMaterialBox->loadMissing('stationTaskBatch');
|
|
$stationTaskMaterialBox->loadMissing('stationTaskBatch');
|
|
|
$this->stationTaskBatchService->markProcessed($stationTaskMaterialBox['stationTaskBatch']);
|
|
$this->stationTaskBatchService->markProcessed($stationTaskMaterialBox['stationTaskBatch']);
|
|
|
LogService::log('海柔请求','markBinProcessed1.82',
|
|
LogService::log('海柔请求','markBinProcessed1.82',
|
|
|
- json_encode($stationTaskMaterialBox['stationTaskBatch']));
|
|
|
|
|
|
|
+ json_encode($stationTaskMaterialBox['stationTaskBatch']).'|'.$binCode);
|
|
|
$this->stationTaskService->markProcessed($stationTaskMaterialBox['stationTask']);
|
|
$this->stationTaskService->markProcessed($stationTaskMaterialBox['stationTask']);
|
|
|
}
|
|
}
|
|
|
$this->storeBox($stationTaskMaterialBox)
|
|
$this->storeBox($stationTaskMaterialBox)
|
|
|
?true
|
|
?true
|
|
|
:(function(){throw new ErrorException('呼叫机器人回收U型线料箱失败');})();
|
|
:(function(){throw new ErrorException('呼叫机器人回收U型线料箱失败');})();
|
|
|
LogService::log('海柔请求','markBinProcessed1.9',
|
|
LogService::log('海柔请求','markBinProcessed1.9',
|
|
|
- json_encode($stationTaskMaterialBox));
|
|
|
|
|
|
|
+ json_encode($stationTaskMaterialBox).'|'.$binCode);
|
|
|
$this->stationService->broadcastBinMonitor($stationTaskMaterialBox['station_id'],$stationTaskMaterialBox['stationTask']);
|
|
$this->stationService->broadcastBinMonitor($stationTaskMaterialBox['station_id'],$stationTaskMaterialBox['stationTask']);
|
|
|
LogService::log('海柔请求','markBinProcessed1.99',
|
|
LogService::log('海柔请求','markBinProcessed1.99',
|
|
|
- json_encode($stationTaskMaterialBox));
|
|
|
|
|
|
|
+ json_encode($stationTaskMaterialBox).'|'.$binCode);
|
|
|
});
|
|
});
|
|
|
-
|
|
|
|
|
return true;
|
|
return true;
|
|
|
}catch (\Exception $e){
|
|
}catch (\Exception $e){
|
|
|
-
|
|
|
|
|
|
|
+ LogService::log('海柔请求','markBinProcessed E1',
|
|
|
|
|
+ $binCode);
|
|
|
$this->instant($this->stationTaskMaterialBoxService,'StationTaskMaterialBoxService');
|
|
$this->instant($this->stationTaskMaterialBoxService,'StationTaskMaterialBoxService');
|
|
|
$this->instant($this->materialBoxService,'MaterialBoxService');
|
|
$this->instant($this->materialBoxService,'MaterialBoxService');
|
|
|
$box=$this->materialBoxService->firstOrCreate(['code'=>$binCode]);
|
|
$box=$this->materialBoxService->firstOrCreate(['code'=>$binCode]);
|
|
@@ -271,6 +271,8 @@ class ForeignHaiRoboticsService
|
|
|
);
|
|
);
|
|
|
$this->controlHaiRobot($dataToPost,collect([$stationTaskMaterialBox_toStore]),'输送线入立架');
|
|
$this->controlHaiRobot($dataToPost,collect([$stationTaskMaterialBox_toStore]),'输送线入立架');
|
|
|
|
|
|
|
|
|
|
+ LogService::log('海柔请求','markBinProcessed E2',
|
|
|
|
|
+ $binCode);
|
|
|
$stationTaskMaterialBox = $stationTaskMaterialBox_toStore??$materialBox??null;
|
|
$stationTaskMaterialBox = $stationTaskMaterialBox_toStore??$materialBox??null;
|
|
|
if($stationTaskMaterialBox && get_class($stationTaskMaterialBox)==MaterialBox::class){
|
|
if($stationTaskMaterialBox && get_class($stationTaskMaterialBox)==MaterialBox::class){
|
|
|
$stationTaskMaterialBox = StationTaskMaterialBox::query()
|
|
$stationTaskMaterialBox = StationTaskMaterialBox::query()
|