|
@@ -11,6 +11,7 @@ namespace OpenMind\FindBox;
|
|
|
use Base;
|
|
use Base;
|
|
|
use DB\SQL;
|
|
use DB\SQL;
|
|
|
use Exception;
|
|
use Exception;
|
|
|
|
|
+use Generator;
|
|
|
use Log;
|
|
use Log;
|
|
|
use OpenMind\System\QueueSystem;
|
|
use OpenMind\System\QueueSystem;
|
|
|
|
|
|
|
@@ -57,8 +58,8 @@ class AsyncJobClass
|
|
|
/** @var integer $retryForFault */
|
|
/** @var integer $retryForFault */
|
|
|
public $retryForFault;
|
|
public $retryForFault;
|
|
|
|
|
|
|
|
- /** @var \Generator $blinkGenerator */
|
|
|
|
|
- private $blinkGenerator;
|
|
|
|
|
|
|
+ /** @var Generator $blinkGenerator */
|
|
|
|
|
+ private $blinkGenerator = null;
|
|
|
|
|
|
|
|
/** @var array|null ledParams */
|
|
/** @var array|null ledParams */
|
|
|
private $ledParams;
|
|
private $ledParams;
|
|
@@ -91,6 +92,9 @@ class AsyncJobClass
|
|
|
|
|
|
|
|
public function __destruct()
|
|
public function __destruct()
|
|
|
{
|
|
{
|
|
|
|
|
+ if (!$this->blinkGenerator)
|
|
|
|
|
+ return;
|
|
|
|
|
+
|
|
|
$this->Stop('Class Disposed');
|
|
$this->Stop('Class Disposed');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -253,9 +257,7 @@ class FindBoxService
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// Async check on JOBS
|
|
// Async check on JOBS
|
|
|
- $jobManager->Run(/**
|
|
|
|
|
- * @param AsyncJobClass $asyncBlink
|
|
|
|
|
- */ function ($asyncBlink) {
|
|
|
|
|
|
|
+ $jobManager->Run(function (AsyncJobClass $asyncBlink) {
|
|
|
|
|
|
|
|
$err = $asyncBlink->GetCurrentValue(); // Fa scattare il generator e ricava il valore
|
|
$err = $asyncBlink->GetCurrentValue(); // Fa scattare il generator e ricava il valore
|
|
|
|
|
|
|
@@ -272,6 +274,7 @@ class FindBoxService
|
|
|
$asyncBlink->BlinkON();
|
|
$asyncBlink->BlinkON();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ return FALSE;
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
}
|
|
}
|
|
@@ -301,7 +304,7 @@ class FindBoxService
|
|
|
break;
|
|
break;
|
|
|
case QueueCommand::$Q_DISPLAY:
|
|
case QueueCommand::$Q_DISPLAY:
|
|
|
$this->ServiceLogger->write("Change display for label {$qCommand->id} requested", 'd/m/Y H:i:s');
|
|
$this->ServiceLogger->write("Change display for label {$qCommand->id} requested", 'd/m/Y H:i:s');
|
|
|
- $esl = new SmartESL($this->findBoxCore, [$qCommand->id]);
|
|
|
|
|
|
|
+ $esl = new SmartESL($this->findBoxCore, $qCommand->id);
|
|
|
$esl->Display($qCommand->params['templateId'], $qCommand->params['barcode']);
|
|
$esl->Display($qCommand->params['templateId'], $qCommand->params['barcode']);
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
@@ -311,14 +314,15 @@ class FindBoxService
|
|
|
/**
|
|
/**
|
|
|
* Send SaveProduct to Label
|
|
* Send SaveProduct to Label
|
|
|
*
|
|
*
|
|
|
- * @param $label
|
|
|
|
|
|
|
+ * @param QueueCommand $label
|
|
|
* @return bool
|
|
* @return bool
|
|
|
*/
|
|
*/
|
|
|
public function saveProduct($label)
|
|
public function saveProduct($label)
|
|
|
{
|
|
{
|
|
|
if ($label->operation == QueueCommand::$Q_SAVEPRODUCT) {
|
|
if ($label->operation == QueueCommand::$Q_SAVEPRODUCT) {
|
|
|
- $this->findBoxCore->SaveProducts($label->id, $label->description, $label->params['dataFields']);
|
|
|
|
|
- $this->ServiceLogger->write("Save product {$label->id}", 'd/m/Y H:i:s');
|
|
|
|
|
|
|
+ $this->findBoxCore->SaveProducts($label->id[0], $label->description, $label->params['dataFields']);
|
|
|
|
|
+ $labelsJ = join(', ', $label->id);
|
|
|
|
|
+ $this->ServiceLogger->write("Save product {$labelsJ}", 'd/m/Y H:i:s');
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
return false;
|
|
return false;
|