From 80a5ca92c5e39dd81a74a126babf74dcb079524c Mon Sep 17 00:00:00 2001 From: chenxi Date: Tue, 27 Oct 2026 10:43:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8C=89=E5=90=AF=E7=94=A8=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=92=8C=E6=9C=80=E6=96=B0=E6=9D=A1=E7=A0=81=E6=98=A0?= =?UTF-8?q?=E5=B0=84=2091=20=E6=96=99=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/商品成本占位行规则清单.md | 13 +-- ...roductMaterialBarcodeMappingRepository.php | 79 +++++++++++++---- ...ctMaterialBarcodeMappingRepositoryTest.php | 85 ++++++++++++++++--- 3 files changed, 145 insertions(+), 32 deletions(-) diff --git a/docs/商品成本占位行规则清单.md b/docs/商品成本占位行规则清单.md index 101d309e..015940fb 100644 --- a/docs/商品成本占位行规则清单.md +++ b/docs/商品成本占位行规则清单.md @@ -41,7 +41,7 @@ store-receipt:product-cost:sync YYYY-MM --remap-warehouses-only | MKH-运营组合套装 | 商品编码以 `MKH-运营组合套装` 开头 | 不进入中文后缀或通用父子别名清洗,交给组合装组件规则 | 组件缺失时待核验 | | 零值组合占位 | 主行数量和金额均为 0,且没有可对平组件 | 不生成商品成本行 | 组件若存在但金额无法对平,忽略空主行,组件按原价格路径计价 | | 人工可读配件 | `原木色广岛`、`原木色舒美特实木面1把`、`胡桃色舒美特实木面1把` | 保持原编码,按现有价格来源计价 | 无有效价格时待核验,禁止自动删中文 | -| 91. 基础料号 | 商品编码匹配 `91.C数字.数字`,可带规格尾缀,例如 `91.C46324.01-N1280` | 去掉尾缀后查 `BarcodePrintImportRecord`:先由 `materialNo` 找基础 SKU,再取该 SKU 的 `updates.barcode`;无条码时才回退基础 SKU | 多候选或未找到映射时保留原编码并进入待核验 | +| 91. 基础料号 | 商品编码匹配 `91.C数字.数字`,可带规格尾缀,例如 `91.C46324.01-N1280` | 去掉尾缀后由 `materialNo` 找基础 SKU 及条码,再关联商品档案;仅保留商品状态为「销售」的条码,并按条码档案创建时间取最新。无条码记录时才回退基础 SKU | 无销售候选或最新时间并列时保留原编码并进入待核验 | | 其他中文别名 | 不属于上述分类,且找不到唯一正式编码或组件关系 | 不改写编码 | 保留原行待核验 | 中文后缀规则的严格匹配键为: @@ -111,15 +111,16 @@ store-receipt:product-cost:sync YYYY-MM --remap-warehouses-only 91.C49784.01-N1280-1 → 91.C49784.01 ``` -映射来源是只读来源 `product_barcode_catalog` 的 `public."BarcodePrintImportRecord"`: +映射来源是只读来源 `product_barcode_catalog` 的 `public."BarcodePrintImportRecord"` 和 `public."SupplyChainProductArchive"`: 1. 按 `updates->>'materialNo'` 匹配规范化基础料号; 2. 基础 SKU 优先取 `normalizedSku`,为空时回退 `skuCode`; 3. 目标商品编码优先取同一基础 SKU 的 `updates.barcode`;没有规格条码时才回退基础 SKU; -4. 同一基础料号仅有一个不同规格条码时自动替换; -5. 同号多个规格条码时保留原编码,候选全部写入待核验清单,禁止按时间、相似度或记录顺序选择; -6. 替换后仍按「月加权平均单价 → 线上代发价格 → 普通商品资料成本价」计算成本; -7. 不同尾缀映射到同一目标编码时,按「发货仓库 + 目标商品编码」合并数量,避免重复成本行。 +4. 条码或基础 SKU 必须能在商品档案找到 `productStatus = '销售'` 的记录,停产及无档案候选不参与映射; +5. 同一料号存在多个销售条码时,按商品档案的 `createdAt` 取最新;档案时间缺失时才使用条码导入记录 `createdAt`; +6. 最新时间对应唯一商品编码时自动替换;最高时间并列多个编码时保留原编码并写入待核验,禁止随机选择; +7. 替换后仍按「月加权平均单价 → 线上代发价格 → 普通商品资料成本价」计算成本; +8. 不同尾缀映射到同一目标编码时,按「发货仓库 + 目标商品编码」合并数量,避免重复成本行。 ## 3. 价格匹配 diff --git a/modules/EcommerceFinance/Repositories/ProductMaterialBarcodeMappingRepository.php b/modules/EcommerceFinance/Repositories/ProductMaterialBarcodeMappingRepository.php index bbd28f16..b1ede6ca 100644 --- a/modules/EcommerceFinance/Repositories/ProductMaterialBarcodeMappingRepository.php +++ b/modules/EcommerceFinance/Repositories/ProductMaterialBarcodeMappingRepository.php @@ -9,8 +9,8 @@ use Throwable; /** * 商品成本使用的基础料号 → 内部商品编码映射。 * - * 只读取条码打印导入记录的固定字段;数据库账号和连接参数由系统设置中的 - * product_barcode_catalog 来源提供,不进入仓库或业务数据。 + * 只读取条码打印导入记录和供应链商品档案的固定字段;数据库账号和连接参数由 + * 系统设置中的 product_barcode_catalog 来源提供,不进入仓库或业务数据。 */ class ProductMaterialBarcodeMappingRepository { @@ -60,6 +60,7 @@ class ProductMaterialBarcodeMappingRepository } $query ??= new UpstreamReadOnlyQuery(self::SOURCE_KEY, 15); + /** @var array> $candidates */ $candidates = []; $sourceRows = 0; @@ -69,39 +70,74 @@ class ProductMaterialBarcodeMappingRepository $rows = $query->select( 'WITH material_skus AS (' . 'SELECT DISTINCT ' - . "TRIM(updates->>'materialNo') AS material_no, " + . "UPPER(BTRIM(updates->>'materialNo')) AS material_no, " . 'COALESCE(NULLIF(BTRIM("normalizedSku"), \'\'), NULLIF(BTRIM("skuCode"), \'\')) AS sku_code ' . 'FROM public."BarcodePrintImportRecord" ' - . "WHERE TRIM(updates->>'materialNo') IN ({$placeholders}) " + . "WHERE UPPER(BTRIM(updates->>'materialNo')) IN ({$placeholders}) " . 'AND COALESCE(NULLIF(BTRIM("normalizedSku"), \'\'), NULLIF(BTRIM("skuCode"), \'\')) IS NOT NULL' . '), barcode_matches AS (' . 'SELECT DISTINCT material_skus.material_no, ' - . "NULLIF(BTRIM(product_rows.updates->>'barcode'), '') AS barcode " + . "UPPER(NULLIF(BTRIM(product_rows.updates->>'barcode'), '')) AS mapped_sku, " + . 'product_rows."createdAt" AS import_record_created_at ' . 'FROM material_skus ' . 'JOIN public."BarcodePrintImportRecord" product_rows ' . 'ON COALESCE(NULLIF(BTRIM(product_rows."normalizedSku"), \'\'), ' . 'NULLIF(BTRIM(product_rows."skuCode"), \'\')) = material_skus.sku_code ' . "WHERE NULLIF(BTRIM(product_rows.updates->>'barcode'), '') IS NOT NULL" - . ') ' - . 'SELECT barcode_matches.material_no, barcode_matches.barcode AS mapped_sku ' + . '), active_barcode_matches AS (' + . 'SELECT barcode_matches.material_no, barcode_matches.mapped_sku, ' + . 'archive."createdAt" AS candidate_created_at, ' + . 'archive."businessCreatedAt" AS business_created_at, ' + . 'archive."productStatus" AS product_status, ' + . 'barcode_matches.import_record_created_at ' . 'FROM barcode_matches ' - . 'UNION ' - . 'SELECT material_skus.material_no, material_skus.sku_code ' + . 'JOIN public."SupplyChainProductArchive" archive ' + . 'ON UPPER(BTRIM(archive.barcode)) = barcode_matches.mapped_sku ' + . "WHERE archive.\"productStatus\" = '销售'" + . '), base_sku_matches AS (' + . 'SELECT material_skus.material_no, ' + . 'UPPER(BTRIM(archive.sku::text)) AS mapped_sku, ' + . 'archive."createdAt" AS candidate_created_at, ' + . 'archive."businessCreatedAt" AS business_created_at, ' + . 'archive."productStatus" AS product_status, ' + . 'NULL::timestamp AS import_record_created_at ' . 'FROM material_skus ' + . 'JOIN public."SupplyChainProductArchive" archive ' + . 'ON UPPER(BTRIM(archive.sku::text)) = UPPER(BTRIM(material_skus.sku_code)) ' . 'WHERE NOT EXISTS (' . 'SELECT 1 FROM barcode_matches ' . 'WHERE barcode_matches.material_no = material_skus.material_no' - . ')', + . ') ' + . "AND archive.\"productStatus\" = '销售'" + . ') ' + . 'SELECT material_no, mapped_sku, candidate_created_at, business_created_at, ' + . 'product_status, import_record_created_at ' + . 'FROM active_barcode_matches ' + . 'UNION ' + . 'SELECT material_no, mapped_sku, candidate_created_at, business_created_at, ' + . 'product_status, import_record_created_at ' + . 'FROM base_sku_matches', $chunk, ); foreach ($rows as $row) { $sourceRows++; $materialCode = self::normalizeMaterialCode((string) ($row['material_no'] ?? '')); $mappedSku = mb_strtoupper(trim((string) ($row['mapped_sku'] ?? ''))); - if ($materialCode === null || $mappedSku === '') { + $productStatus = trim((string) ($row['product_status'] ?? '')); + if ($materialCode === null || $mappedSku === '' || $productStatus !== '销售') { continue; } - $candidates[$materialCode][$mappedSku] = true; + $createdAt = trim((string) ( + $row['candidate_created_at'] + ?? $row['import_record_created_at'] + ?? '' + )); + if ( + ! isset($candidates[$materialCode][$mappedSku]) + || $createdAt > $candidates[$materialCode][$mappedSku] + ) { + $candidates[$materialCode][$mappedSku] = $createdAt; + } } } } catch (Throwable $exception) { @@ -116,14 +152,25 @@ class ProductMaterialBarcodeMappingRepository $ambiguous = []; $missing = []; foreach ($materialCodes as $materialCode) { - $mappedSkus = array_keys($candidates[$materialCode] ?? []); + $mappedCandidates = $candidates[$materialCode] ?? []; + if ($mappedCandidates === []) { + $missing[] = $materialCode; + continue; + } + + $latestCreatedAt = max(array_values($mappedCandidates)); + $mappedSkus = []; + foreach ($mappedCandidates as $mappedSku => $createdAt) { + if ($createdAt === $latestCreatedAt) { + $mappedSkus[] = (string) $mappedSku; + } + } sort($mappedSkus, SORT_STRING); + if (count($mappedSkus) === 1) { $unique[$materialCode] = $mappedSkus[0]; - } elseif (count($mappedSkus) > 1) { - $ambiguous[$materialCode] = $mappedSkus; } else { - $missing[] = $materialCode; + $ambiguous[$materialCode] = $mappedSkus; } } diff --git a/tests/Unit/EcommerceFinance/ProductMaterialBarcodeMappingRepositoryTest.php b/tests/Unit/EcommerceFinance/ProductMaterialBarcodeMappingRepositoryTest.php index 368e40c9..f8f5566c 100644 --- a/tests/Unit/EcommerceFinance/ProductMaterialBarcodeMappingRepositoryTest.php +++ b/tests/Unit/EcommerceFinance/ProductMaterialBarcodeMappingRepositoryTest.php @@ -26,7 +26,7 @@ class ProductMaterialBarcodeMappingRepositoryTest extends TestCase $this->assertNull(ProductMaterialBarcodeMappingRepository::normalizeMaterialCode('91.OTHER')); } - public function test_unique_mapping_is_selected_and_ambiguous_or_missing_mapping_is_not_guessed(): void + public function test_latest_enabled_barcode_is_selected_and_missing_or_tied_mapping_is_not_guessed(): void { $query = $this->createMock(UpstreamReadOnlyQuery::class); $query->expects($this->once()) @@ -36,28 +36,93 @@ class ProductMaterialBarcodeMappingRepositoryTest extends TestCase $sql, 'FROM public."BarcodePrintImportRecord"', ) && str_contains($sql, "updates->>'barcode'") - && substr_count($sql, '?') === 3), - ['91.C45340.01', '91.C45438.01', '91.C49784.01'], + && str_contains($sql, 'JOIN public."SupplyChainProductArchive"') + && str_contains($sql, "archive.\"productStatus\" = '销售'") + && str_contains($sql, 'archive."createdAt"') + && substr_count($sql, '?') === 5), + [ + '91.C45340.01', + '91.C45438.01', + '91.C45492.01', + '91.C45493.01', + '91.C49784.01', + ], ) ->willReturn([ - ['material_no' => '91.C45340.01', 'mapped_sku' => 'GBGJ-SJ025102N09V01'], - ['material_no' => '91.C45340.01', 'mapped_sku' => 'GBGJ-SJ025102N09V01'], - ['material_no' => '91.C45438.01', 'mapped_sku' => 'GBGJ-DNZ036601N09V01'], - ['material_no' => '91.C45438.01', 'mapped_sku' => 'MKHDNZ0409260601235'], + [ + 'material_no' => '91.C45340.01', + 'mapped_sku' => 'GBGJ-SJ025102N09V01', + 'product_status' => '销售', + 'candidate_created_at' => '2026-08-07 05:08:00', + ], + [ + 'material_no' => '91.C45340.01', + 'mapped_sku' => 'GBGJ-SJ025102N09V01', + 'product_status' => '销售', + 'candidate_created_at' => '2026-08-07 05:09:00', + ], + [ + 'material_no' => '91.C45438.01', + 'mapped_sku' => 'GBGJ-DNZ036601N09V01', + 'product_status' => '销售', + 'candidate_created_at' => '2026-08-07 05:08:56', + ], + [ + 'material_no' => '91.C45438.01', + 'mapped_sku' => 'MKHDNZ0409260601235', + 'product_status' => '销售', + 'candidate_created_at' => '2026-08-07 05:11:13', + ], + [ + 'material_no' => '91.C45438.01', + 'mapped_sku' => 'GBGJ-DNZ036601N08V01', + 'product_status' => '停产', + 'candidate_created_at' => '2026-08-07 05:12:00', + ], + [ + 'material_no' => '91.C45492.01', + 'mapped_sku' => 'GBGJ-CYJ005701N1282V01', + 'product_status' => '停产', + 'candidate_created_at' => '2026-08-07 05:12:00', + ], + [ + 'material_no' => '91.C45492.01', + 'mapped_sku' => 'GBGJ-CYJ005701N1411V01', + 'product_status' => '销售', + 'candidate_created_at' => '2026-08-07 05:09:31', + ], + [ + 'material_no' => '91.C45493.01', + 'mapped_sku' => 'SKU-TIE-A', + 'product_status' => '销售', + 'candidate_created_at' => '2026-08-07 05:10:00', + ], + [ + 'material_no' => '91.C45493.01', + 'mapped_sku' => 'SKU-TIE-B', + 'product_status' => '销售', + 'candidate_created_at' => '2026-08-07 05:10:00', + ], ]); $result = (new ProductMaterialBarcodeMappingRepository())->resolve([ '91.C45340.01-N09', '91.C45438.01-N09', + '91.C45492.01-N1411', + '91.C45493.01-N01', '91.C49784.01-N1280-1', 'GBGJ-SJ025102', ], $query); - $this->assertSame(['91.C45340.01' => 'GBGJ-SJ025102N09V01'], $result['unique']); $this->assertSame([ - '91.C45438.01' => ['GBGJ-DNZ036601N09V01', 'MKHDNZ0409260601235'], + '91.C45340.01' => 'GBGJ-SJ025102N09V01', + '91.C45438.01' => 'MKHDNZ0409260601235', + '91.C45492.01' => 'GBGJ-CYJ005701N1411V01', + ], $result['unique']); + $this->assertSame([ + '91.C45493.01' => ['SKU-TIE-A', 'SKU-TIE-B'], ], $result['ambiguous']); $this->assertSame(['91.C49784.01'], $result['missing']); - $this->assertSame(4, $result['source_rows']); + $this->assertSame(9, $result['source_rows']); } } -- 2.47.2