1. 新增 config/locales.php:定義 11 種系統支援語系白名單(原文+中文註記)、每台機台上限 5 種與 fallback (zh_TW)。 2. Company 新增 activeLocalesFor()/activeLocales():計算公司所有機台已開語系的聯集(去重、依白名單排序、保底 zh_TW),加快取與 forgetActiveLocales() 失效機制。 3. products 新增 spec_dictionary_key 欄位(migration);Product 新增 localized_spec accessor 與 specTranslations 關聯,商品規格比照名稱支援多語系。 4. ProductController 商品建立/更新改收 names 與 specs 物件,寫入 translations(group=product/product_spec),既有商品首次編輯補建 spec key,刪除時一併清除規格翻譯。 5. ProductCatalogService(B012)保留既有 t060v01_en/_jp 欄位,新增 t060v01_i18n/t060v03_i18n locale map,依公司語系聯集輸出並回退 zh_TW,確保線上舊 App 相容。 6. 機台系統設定(updateSystemSettings)新增 languages 顯示語系驗證與寫入(最多 5 種、白名單、去重,僅系統管理員),異動時失效語系聯集快取並重建商品目錄。 7. B014(getSettings)新增 LangSet 下發機台顯示語系(Languages 有序清單+Default 預設)。 8. 商品建立/編輯頁名稱與規格改為多語系 Tab(讀公司機台語系聯集、完成度標記),新增共用元件 product-locale-tabs;機台系統設定彈窗新增顯示語系勾選 UI(限 5 選、預設標記)。 9. 三語系 JSON(zh_TW/en/ja)新增 5 組對齊鍵並維持字母排序。 10. 同步更新文件:docs/API/product_multilingual_spec.md(規格書)、api-technical-specs SKILL.md(B012 i18n/B014 LangSet)、config/api-docs.php(B012/B014 範例與欄位)。 11. 系統設定同步:新增 sync-settings 路由與 update_settings 指令類型,ProcessCommandAck 與遠端指令歷史(remote index/tab-history)支援 update_settings 標籤,機台系統設定頁新增「同步設定」操作按鈕,並補 B016 回寫測試。 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
157 lines
5.5 KiB
PHP
157 lines
5.5 KiB
PHP
<?php
|
||
|
||
namespace App\Jobs\Machine;
|
||
|
||
use App\Models\Machine\Machine;
|
||
use App\Models\Machine\MachineStockMovement;
|
||
use App\Models\Machine\RemoteCommand;
|
||
use App\Services\Machine\MachineService;
|
||
use Illuminate\Bus\Queueable;
|
||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||
use Illuminate\Foundation\Bus\Dispatchable;
|
||
use Illuminate\Queue\InteractsWithQueue;
|
||
use Illuminate\Queue\SerializesModels;
|
||
use Illuminate\Support\Facades\Log;
|
||
|
||
class ProcessCommandAck implements ShouldQueue
|
||
{
|
||
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
||
|
||
protected string $serialNo;
|
||
protected array $payload;
|
||
|
||
/**
|
||
* 建立 Job 實例
|
||
*
|
||
* @param string $serialNo 機台序號(由 Go Gateway 從 Topic 路徑注入)
|
||
* @param array $payload MQTT Payload,包含 command_id, result, stock
|
||
*/
|
||
public function __construct(string $serialNo, array $payload)
|
||
{
|
||
$this->serialNo = $serialNo;
|
||
$this->payload = $payload;
|
||
}
|
||
|
||
/**
|
||
* 處理 B055 出貨回報 ACK
|
||
* 原始邏輯移植自 MachineController::reportDispenseResult()
|
||
*/
|
||
public function handle(MachineService $machineService): void
|
||
{
|
||
$commandId = $this->payload['command_id'] ?? null;
|
||
$resultCode = $this->payload['result'] ?? null;
|
||
$stockReported = $this->payload['stock'] ?? null;
|
||
|
||
if (empty($commandId)) {
|
||
Log::warning('MQTT CommandAck: Missing command_id', [
|
||
'serial_no' => $this->serialNo,
|
||
'payload' => $this->payload
|
||
]);
|
||
return;
|
||
}
|
||
|
||
$command = RemoteCommand::find($commandId);
|
||
|
||
if (!$command) {
|
||
Log::warning('MQTT CommandAck: Command not found', [
|
||
'serial_no' => $this->serialNo,
|
||
'command_id' => $commandId
|
||
]);
|
||
return;
|
||
}
|
||
|
||
$machine = $command->machine;
|
||
|
||
// 【優先執行】更新機台為在線狀態 (只要收到訊息就代表在線,不受指令狀態影響)
|
||
if ($machine) {
|
||
$machine->update([
|
||
'last_heartbeat_at' => now(),
|
||
'status' => 'online',
|
||
]);
|
||
}
|
||
|
||
// 核心邏輯:只有處於 pending 狀態的指令才處理後續的業務邏輯 (如庫存異動)
|
||
if ($command->status !== 'pending') {
|
||
Log::info('MQTT CommandAck: Command already processed, ignoring business logic', [
|
||
'command_id' => $commandId,
|
||
'current_status' => $command->status,
|
||
]);
|
||
return;
|
||
}
|
||
|
||
// 判定執行結果 (result: "success" 或 "0" 代表成功)
|
||
$status = in_array($resultCode, ['success', '0'], true) ? 'success' : 'failed';
|
||
|
||
$payloadUpdates = [
|
||
'reported_stock' => $stockReported,
|
||
'report_result' => $resultCode,
|
||
];
|
||
|
||
$machine = $command->machine;
|
||
|
||
if ($command->command_type === 'dispense') {
|
||
// 遠端出貨指令僅紀錄狀態,不再執行庫存預扣或回滾。
|
||
// 真正的庫存異動將由機台發送的 Transaction Finalize (結案) 流程處理。
|
||
$msgKey = ($status === 'success') ? "Remote dispense successful for slot :slot" : "Remote dispense failed for slot :slot";
|
||
$level = ($status === 'success') ? 'info' : 'error';
|
||
|
||
ProcessStateLog::dispatch(
|
||
$machine->id,
|
||
$machine->company_id,
|
||
$msgKey,
|
||
$level,
|
||
['slot' => $command->payload['slot_no'] ?? 'N/A']
|
||
);
|
||
}
|
||
|
||
elseif ($command->command_type === 'reload_stock') {
|
||
// 若同步失敗,自動 Rollback 回滾庫存
|
||
if ($status === 'failed' && isset($command->payload['slot_no'], $command->payload['old'])) {
|
||
$slotNo = $command->payload['slot_no'];
|
||
$slot = $machine->slots()->where('slot_no', $slotNo)->first();
|
||
|
||
if ($slot) {
|
||
$oldData = $command->payload['old'];
|
||
$slot->update([
|
||
'stock' => $oldData['stock'],
|
||
'expiry_date' => $oldData['expiry_date'] ?? null,
|
||
'batch_no' => $oldData['batch_no'] ?? null,
|
||
]);
|
||
|
||
Log::warning('MQTT CommandAck failed, rolled back inventory', [
|
||
'serial_no' => $this->serialNo,
|
||
'slot_no' => $slotNo,
|
||
'rolled_back_to' => $oldData
|
||
]);
|
||
}
|
||
}
|
||
}
|
||
|
||
$command->update([
|
||
'status' => $status,
|
||
'executed_at' => now(),
|
||
'payload' => array_merge($command->payload, $payloadUpdates),
|
||
]);
|
||
|
||
// 記錄維護類指令到機台日誌 (MachineLog)
|
||
if (in_array($command->command_type, ['reboot', 'reboot_card', 'lock', 'unlock', 'checkout', 'change', 'reload_stock', 'update_products', 'update_ads', 'update_settings'], true)) {
|
||
$msgKey = $status === 'success' ? 'log.command.success' : 'log.command.failed';
|
||
$level = $status === 'success' ? 'info' : 'warning';
|
||
|
||
ProcessStateLog::dispatch(
|
||
$machine->id,
|
||
$machine->company_id,
|
||
$msgKey,
|
||
$level,
|
||
['type' => __("command.{$command->command_type}")]
|
||
);
|
||
}
|
||
|
||
Log::info("MQTT CommandAck processed", [
|
||
'serial_no' => $this->serialNo,
|
||
'command_id' => $commandId,
|
||
'status' => $status,
|
||
]);
|
||
}
|
||
}
|