diff --git a/app/Business/KukaPostingBase/KukaPostingBasePageData.php b/app/Business/KukaPostingBase/KukaPostingBasePageData.php index 8ddf67c2..d65261bd 100644 --- a/app/Business/KukaPostingBase/KukaPostingBasePageData.php +++ b/app/Business/KukaPostingBase/KukaPostingBasePageData.php @@ -84,9 +84,16 @@ class KukaPostingBasePageData $companyId, $decodedRows->pluck('item_number')->filter()->unique()->values()->all(), ); + $brandCodes = $decodedRows + ->pluck('product_code') + ->merge($decodedRows->pluck('item_number')) + ->filter() + ->unique() + ->values() + ->all(); $brandItems = $this->repository->brandItemMaps( $companyId, - $decodedRows->pluck('product_code')->filter()->unique()->values()->all(), + $brandCodes, ); $quotations = $this->repository->effectiveQuotations( $companyId, @@ -99,6 +106,11 @@ class KukaPostingBasePageData $brandItemNumber = trim((string) ( $brandItems[$row['product_code']]->brand_item_number ?? '' )); + if ($brandItemNumber === '') { + $brandItemNumber = trim((string) ( + $brandItems[$row['item_number']]->brand_item_number ?? '' + )); + } if ($brandItemNumber !== '') { $values['货号'] = $brandItemNumber; diff --git a/app/Business/KukaPostingBase/KukaPostingBaseRepository.php b/app/Business/KukaPostingBase/KukaPostingBaseRepository.php index 4943f242..999b511f 100644 --- a/app/Business/KukaPostingBase/KukaPostingBaseRepository.php +++ b/app/Business/KukaPostingBase/KukaPostingBaseRepository.php @@ -114,16 +114,16 @@ class KukaPostingBaseRepository } /** - * @param list $productCodes + * @param list $lookupCodes * @return array */ - public function brandItemMaps(int $companyId, array $productCodes): array + public function brandItemMaps(int $companyId, array $lookupCodes): array { - $productCodes = array_values(array_unique(array_filter(array_map( + $lookupCodes = array_values(array_unique(array_filter(array_map( static fn (mixed $value): string => trim((string) $value), - $productCodes, + $lookupCodes, )))); - if ($productCodes === [] + if ($lookupCodes === [] || ! Schema::connection($this->connectionName())->hasTable('kuka_posting_brand_item_map_rows')) { return []; } @@ -131,7 +131,7 @@ class KukaPostingBaseRepository return $this->connection() ->table('kuka_posting_brand_item_map_rows') ->where('company_id', $companyId) - ->whereIn('product_code', $productCodes) + ->whereIn('product_code', $lookupCodes) ->get(['product_code', 'brand_item_number']) ->filter(static fn (object $row): bool => trim((string) $row->brand_item_number) !== '') ->keyBy(static fn (object $row): string => (string) $row->product_code) diff --git a/app/Business/KukaPostingBase/KukaPostingMaterialMapSynchronizer.php b/app/Business/KukaPostingBase/KukaPostingMaterialMapSynchronizer.php index 0c37844e..a251d9ac 100644 --- a/app/Business/KukaPostingBase/KukaPostingMaterialMapSynchronizer.php +++ b/app/Business/KukaPostingBase/KukaPostingMaterialMapSynchronizer.php @@ -61,7 +61,10 @@ class KukaPostingMaterialMapSynchronizer [$direct, $archive, $brandSku] = $this->sourceCandidates($items); $rows = $this->resolveRows($companyId, $items, $quotations, $direct, $archive, $brandSku); $stats = $this->stats($rows); - $brandItemRows = $this->brandItemRows($companyId, $identifiers['product_codes']); + // normalizedSku 同时覆盖聚水潭商品编码和原始货号,按唯一查询键一次同步。 + $brandCodes = array_values(array_unique(array_merge($items, $identifiers['product_codes']))); + sort($brandCodes, SORT_STRING); + $brandItemRows = $this->brandItemRows($companyId, $brandCodes); if (! $dryRun) { $connection->transaction(function () use ($connection, $companyId, $rows, $brandItemRows): void { @@ -133,12 +136,12 @@ class KukaPostingMaterialMapSynchronizer } /** - * @param list $productCodes + * @param list $brandCodes * @return list> */ - private function brandItemRows(int $companyId, array $productCodes): array + private function brandItemRows(int $companyId, array $brandCodes): array { - if ($productCodes === []) { + if ($brandCodes === []) { return []; } @@ -146,18 +149,18 @@ class KukaPostingMaterialMapSynchronizer $rows = []; $now = now(); - foreach (array_chunk($productCodes, self::SOURCE_ITEM_CHUNK) as $chunk) { + foreach (array_chunk($brandCodes, self::SOURCE_ITEM_CHUNK) as $chunk) { foreach ($query->select($this->brandItemSql(count($chunk)), $chunk) as $sourceRow) { - $productCode = trim((string) ($sourceRow['product_code'] ?? '')); + $brandCode = trim((string) ($sourceRow['product_code'] ?? '')); $brandItemNumber = trim((string) ($sourceRow['brand_item_number'] ?? '')); - if ($productCode === '' || $brandItemNumber === '') { + if ($brandCode === '' || $brandItemNumber === '') { continue; } $sourceImportedAt = trim((string) ($sourceRow['source_imported_at'] ?? '')); $rows[] = [ 'company_id' => $companyId, - 'product_code' => $productCode, + 'product_code' => $brandCode, 'brand_item_number' => $brandItemNumber, 'source_imported_at' => $sourceImportedAt === '' ? null : $sourceImportedAt, 'synced_at' => $now, diff --git a/app/Console/Commands/SyncKukaPostingMaterialMap.php b/app/Console/Commands/SyncKukaPostingMaterialMap.php index 9d36cfdd..1c93a1ca 100644 --- a/app/Console/Commands/SyncKukaPostingMaterialMap.php +++ b/app/Console/Commands/SyncKukaPostingMaterialMap.php @@ -38,7 +38,7 @@ class SyncKukaPostingMaterialMap extends Command $this->line(json_encode($result, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)); } else { $this->info(sprintf( - '物料映射%s完成:货号 %d,唯一匹配 %d,未匹配 %d,冲突 %d;直接物料编号 %d,档案条码 %d,品牌SKU %d;商品品牌货号 %d。', + '物料映射%s完成:货号 %d,唯一匹配 %d,未匹配 %d,冲突 %d;直接物料编号 %d,档案条码 %d,品牌SKU %d;商品编码/货号品牌映射 %d。', $result['dry_run'] ? '校验' : '同步', $result['items'], $result['matched'], diff --git a/docs/上游业务镜像清单.md b/docs/上游业务镜像清单.md index c97ba81e..f24065a5 100644 --- a/docs/上游业务镜像清单.md +++ b/docs/上游业务镜像清单.md @@ -17,7 +17,7 @@ | 状态 | 说明 | | --- | --- | | 本次接入 | 顾家过账基础数据读取聚水潭“销售主题分析(新版)→ 商品利润 → 明细(订单商品)”10 月导出,仅保留天猫、京东、拼多多和抖音的 12 家 HX 旗舰店,写入 `kuka_posting_base_rows`;导入摘要写入 `kuka_posting_base_imports`。只保存前 40 个聚水潭原始字段,后续成本映射、报价和过账分类不混入基础数据。XLSX 通过 `business-mirror:import-kuka-posting-base` 流式读取,校验 12 家店铺均有数据后,在单一事务内整月替换;文件缺失、字段错误或中断时保留上一版。当前 2026 年 10 月导出为 13,949 行。 | -| 本次接入 | `furniture3d_prod` PostgreSQL 只读库用于顾家发货明细映射:物料编号优先使用 `public.BarcodePrintImportRecord.updates.materialNo`,其次用 `public.SupplyChainProductArchive.sku` 对应聚水潭“货号”并校验候选 `barcode`,最后按 `updates.brandSkuCode` 对应报价单物料描述前缀回退;命中后必须存在报价单生效 `MaterialNumber`。同一物料编号允许多个货号共用,只要求单个货号内部候选唯一。页面“货号”另按聚水潭“商品编码”对应 `BarcodePrintImportRecord.normalizedSku`,取最新非空 `updates.brandSkuCode` 作为品牌货号;未命中时保留聚水潭原货号,物料编号和成本仍按原货号计算。紧凑结果分别写入 `kuka_posting_material_map_rows` 和 `kuka_posting_brand_item_map_rows`,不复制整库、不在页面直连上游;无命中或仍有多个报价候选时保留空值,不猜测。每日 05:50 执行 `business-mirror:sync-kuka-posting-material-map`。 | +| 本次接入 | `furniture3d_prod` PostgreSQL 只读库用于顾家发货明细映射:物料编号优先使用 `public.BarcodePrintImportRecord.updates.materialNo`,其次用 `public.SupplyChainProductArchive.sku` 对应聚水潭“货号”并校验候选 `barcode`,最后按 `updates.brandSkuCode` 对应报价单物料描述前缀回退;命中后必须存在报价单生效 `MaterialNumber`。同一物料编号允许多个货号共用,只要求单个货号内部候选唯一。页面“货号”先用聚水潭“商品编码”对应 `BarcodePrintImportRecord.normalizedSku`,未命中时再用原始“货号”对应 `normalizedSku`,统一取最新非空 `updates.brandSkuCode` 作为品牌货号;两级都未命中时保留聚水潭原货号,物料编号和成本仍按原货号计算。紧凑结果分别写入 `kuka_posting_material_map_rows` 和 `kuka_posting_brand_item_map_rows`,不复制整库、不在页面直连上游;无命中或仍有多个报价候选时保留空值,不猜测。每日 05:50 执行 `business-mirror:sync-kuka-posting-material-map`。 | | 本次接入 | 钉钉考勤 `attendance/list` 按财务中心在职成员同步到 `ding_attendance_records`,保留打卡记录 ID、用户、工作日期、上下班类型、打卡结果、审批标识、审批实例和打卡时间;每 15 分钟回看 35 天,按 7 天窗口和 50 人上限分页。钉钉排班通过 `getScheduleByRange` 同步到 `ding_attendance_schedule_records`,保留逐日排班 ID、用户、考勤组、班次、是否休息、变更状态和完整源数据;本机脚本为 `scripts/sync-ding-attendance-schedules.py`,导入命令为 `business-mirror:import-ding-attendance-schedules`,默认覆盖最近 95 天,查询不完整时拒绝覆盖旧镜像。日志漏写扣分只统计钉钉排班明确为工作日的日期,并继续排除没有日志但有“请假 / 休息 / 调休”等审批标记的日期;排班或考勤镜像未完成时扣分暂不计算,周五、周末或法定班次调整均以公司真实排班为准。依赖权限 `qyapi_attendance_isv_query_result`、`qyapi_get_attendance_data`。 | | 已完成 | `operations_replica/rpt.Bulk_Price_Limit` 已进入类型化表 `product_price_mirror_rows`,商品价格页面已读取镜像并支持完整分页。 | | 已完成 | `operations_replica/rpt.jst_sku` 已进入 `ops_jst_sku`,普通商品资料页面固定读取 `sku_type = normal` 的共享镜像,并支持稳定分页和业务筛选。 | diff --git a/tests/Feature/Business/KukaPostingBasePageTest.php b/tests/Feature/Business/KukaPostingBasePageTest.php index 814b2248..c0d966b9 100644 --- a/tests/Feature/Business/KukaPostingBasePageTest.php +++ b/tests/Feature/Business/KukaPostingBasePageTest.php @@ -180,7 +180,7 @@ class KukaPostingBasePageTest extends FeatureTestCase @unlink($file); } - public function test_brand_item_number_uses_product_code_and_falls_back_to_original_item(): void + public function test_brand_item_number_uses_product_code_then_item_number(): void { $file = $this->workbook(); @@ -198,6 +198,13 @@ class KukaPostingBasePageTest extends FeatureTestCase 'source_imported_at' => now(), 'synced_at' => now(), ]); + $connection->table('kuka_posting_brand_item_map_rows')->insert([ + 'company_id' => $this->company->id, + 'product_code' => 'ITEM-01', + 'brand_item_number' => 'BRAND-FALLBACK-01', + 'source_imported_at' => now(), + 'synced_at' => now(), + ]); $connection->table('kuka_posting_material_map_rows')->insert([ 'company_id' => $this->company->id, 'item_number' => 'ITEM-00', @@ -239,7 +246,16 @@ class KukaPostingBasePageTest extends FeatureTestCase 'store_name' => '京东-HX旗舰店101', ])) ->assertOk() - ->assertSeeText('ITEM-01'); + ->assertSeeText('BRAND-FALLBACK-01') + ->assertDontSeeText('ITEM-01'); + + $this->get(route('business.pages.show', [ + 'section' => 'posting-data', + 'page' => 'kuka-basic-data', + 'store_name' => '京东-HX旗舰店102', + ])) + ->assertOk() + ->assertSeeText('ITEM-02'); @unlink($file); } diff --git a/tests/Unit/Business/KukaPostingMaterialMapSynchronizerTest.php b/tests/Unit/Business/KukaPostingMaterialMapSynchronizerTest.php index b66a3c0e..07e52c7e 100644 --- a/tests/Unit/Business/KukaPostingMaterialMapSynchronizerTest.php +++ b/tests/Unit/Business/KukaPostingMaterialMapSynchronizerTest.php @@ -102,6 +102,11 @@ class KukaPostingMaterialMapSynchronizerTest extends TestCase 'brand_item_number' => 'BRAND-DISPLAY-G', 'source_imported_at' => '2026-10-02 10:00:00', ], + [ + 'product_code' => 'ITEM-B', + 'brand_item_number' => 'BRAND-FALLBACK-B', + 'source_imported_at' => '2026-10-03 10:00:00', + ], ]; } @@ -142,7 +147,7 @@ class KukaPostingMaterialMapSynchronizerTest extends TestCase 'direct' => 3, 'archive' => 1, 'brand_sku' => 1, - 'brand_item_mappings' => 2, + 'brand_item_mappings' => 3, ], $result); $rows = $connection->table('kuka_posting_material_map_rows') @@ -167,6 +172,7 @@ class KukaPostingMaterialMapSynchronizerTest extends TestCase ->pluck('brand_item_number', 'product_code') ->all(); $this->assertSame([ + 'ITEM-B' => 'BRAND-FALLBACK-B', 'PRODUCT-A' => 'BRAND-A', 'PRODUCT-G' => 'BRAND-DISPLAY-G', ], $brandItems);