优化寄售仓库现货统计与可匹配矩阵

This commit is contained in:
2026-11-22 15:20:25 +08:00
parent dbf3c9daf1
commit f5ef500708
8 changed files with 913 additions and 22 deletions
@@ -0,0 +1,209 @@
/**
* 寄售仓库统计口径集成测试(仅隔离库)。
*
* 运行:
* CONSIGNMENT_MATCHING_TEST_DATABASE_URL=postgres://.../order_site_ctest \
* DATABASE_URL=postgres://.../order_site_ctest \
* node --import tsx --test src/repositories/worker-platform/consignment-inventory-stats.integration.test.ts
*/
import assert from 'node:assert/strict'
import test from 'node:test'
import { closeDb, query } from '../../db/client.js'
import { resolveIntegrationDatabaseOrThrow } from '../../test-support/integration-db-guard.js'
import { getConsignmentInventoryStats } from './consignment-repo.js'
const TEST_DATABASE_URL = String(process.env.CONSIGNMENT_MATCHING_TEST_DATABASE_URL || '').trim()
const suffix = `${Date.now().toString(36)}${Math.floor(Math.random() * 1000)}`
const statsDate = '2099-01-15'
const inventoryNos = [
`CSTATS-${suffix}-A`,
`CSTATS-${suffix}-B`,
`CSTATS-${suffix}-C`,
`CSTATS-${suffix}-D`,
`CSTATS-${suffix}-E`,
`CSTATS-${suffix}-F`,
]
async function insertInventory(input: {
inventoryNo: string
system: string
series: string
diamondLevel: number
brillianceCount: number
quantity: number
remainingQuantity: number
costPriceFen: number
status: 'in_stock' | 'consumed' | 'archived'
buyerName: string
specValuesJson: Record<string, string>
allowMatching?: boolean
}) {
await query(
`
INSERT INTO consignment_inventories (
inventory_no, item_name, system, server_zone, series, diamond_level,
brilliance_count, cost_price_fen, buyer_name, inbound_batch,
quantity, remaining_quantity, sale_price_fen, listed_at,
spec_values_json, status, source_type, inbound_at, created_at, updated_at,
allow_matching
) VALUES (
$1, $2, $3, '互通', $4, $5,
$6, $7, $8, '统计测试',
$9, $10, $7, $11,
$12::jsonb, $13, 'manual', $11, $11, $11,
$14
)
`,
[
input.inventoryNo,
`${input.system}${input.series}${input.diamondLevel}钻 统计测试`,
input.system,
input.series,
input.diamondLevel,
input.brillianceCount,
input.costPriceFen,
input.buyerName,
input.quantity,
input.remainingQuantity,
`${statsDate}T12:00:00+08:00`,
JSON.stringify(input.specValuesJson),
input.status,
input.allowMatching ?? true,
],
)
}
test(
'寄售仓库统计:按剩余件数、成本乘数量,并按系统+系列+钻级汇总现货',
{
skip: TEST_DATABASE_URL ? false : '未设置 CONSIGNMENT_MATCHING_TEST_DATABASE_URL',
},
async () => {
assert(resolveIntegrationDatabaseOrThrow('CONSIGNMENT_MATCHING_TEST_DATABASE_URL'))
try {
await insertInventory({
inventoryNo: inventoryNos[0]!,
system: '苹果',
series: '暗潮',
diamondLevel: 2,
brillianceCount: 0,
quantity: 3,
remainingQuantity: 2,
costPriceFen: 100,
status: 'in_stock',
buyerName: '小明',
specValuesJson: { system: '苹果', series: '暗潮', diamondLevel: '2' },
})
await insertInventory({
inventoryNo: inventoryNos[1]!,
system: '苹果',
series: '暗潮',
diamondLevel: 2,
brillianceCount: 2,
quantity: 1,
remainingQuantity: 1,
costPriceFen: 100,
status: 'in_stock',
buyerName: '小明',
specValuesJson: { system: '苹果', series: '暗潮', diamondLevel: '2' },
})
await insertInventory({
inventoryNo: inventoryNos[2]!,
system: '安卓',
series: '怒嚎',
diamondLevel: 3,
brillianceCount: 5,
quantity: 2,
remainingQuantity: 2,
costPriceFen: 200,
status: 'in_stock',
buyerName: '小红',
specValuesJson: { system: '安卓', series: '怒嚎', diamondLevel: '3' },
})
await insertInventory({
inventoryNo: inventoryNos[3]!,
system: '苹果',
series: '暗潮',
diamondLevel: 2,
brillianceCount: 1,
quantity: 4,
remainingQuantity: 0,
costPriceFen: 100,
status: 'consumed',
buyerName: '小明',
specValuesJson: { system: '苹果', series: '暗潮', diamondLevel: '2' },
})
await insertInventory({
inventoryNo: inventoryNos[4]!,
system: '苹果',
series: '暗潮',
diamondLevel: 2,
brillianceCount: 0,
quantity: 2,
remainingQuantity: 0,
costPriceFen: 100,
status: 'archived',
buyerName: '小明',
specValuesJson: { system: '苹果', series: '暗潮', diamondLevel: '2' },
})
// 历史库存没有动态规格值:统计必须回退旧列,不能丢货。
await insertInventory({
inventoryNo: inventoryNos[5]!,
system: '苹果',
series: '暗潮',
diamondLevel: 2,
brillianceCount: 0,
quantity: 1,
remainingQuantity: 1,
costPriceFen: 50,
status: 'in_stock',
buyerName: '小明',
specValuesJson: {},
allowMatching: false,
})
const stats = await getConsignmentInventoryStats({
dateFrom: statsDate,
dateTo: statsDate,
})
assert.equal(
stats.totalInStockCount,
6,
'顶部在库数量必须按全部在库 remaining_quantity 汇总,不排除禁止匹配库存',
)
assert.equal(
stats.totalInStockCostFen,
750,
'顶部在库成本必须按 单价 × 剩余数量 汇总,不排除禁止匹配库存',
)
assert.equal(stats.totalConsumedCount, 4, '已出库数量必须按 quantity 汇总')
assert.equal(stats.totalConsumedCostFen, 400, '已出库成本必须按 单价 × quantity 汇总')
assert.deepEqual(stats.byStockSpec, [
{ system: '苹果', series: '暗潮', diamond_level: 2, quantity: 3 },
{ system: '安卓', series: '怒嚎', diamond_level: 3, quantity: 2 },
])
const buyer = stats.byBuyer.find((item) => item.buyer_name === '小明')
assert.equal(buyer?.count, 4, '收购人分布展示全部当前在库件数')
assert.equal(buyer?.total_cost_fen, 350, '收购人成本按剩余数量计算')
assert.equal(buyer?.consumed_count, 4, '收购人已出库件数按 quantity 计算')
const appleOnly = await getConsignmentInventoryStats({
dateFrom: statsDate,
dateTo: statsDate,
specFilters: [{ key: 'system', value: '苹果' }],
})
assert.equal(appleOnly.totalInStockCount, 4)
assert.deepEqual(appleOnly.byStockSpec, [
{ system: '苹果', series: '暗潮', diamond_level: 2, quantity: 3 },
])
} finally {
await query('DELETE FROM consignment_inventories WHERE inventory_no = ANY($1::text[])', [
inventoryNos,
])
await closeDb().catch(() => undefined)
}
},
)
@@ -166,6 +166,13 @@ export type ConsignmentStatsSummary = {
byShop: Array<{ shop_name: string; count: number }>
byBatch: Array<{ inbound_batch: string; count: number; total_cost_fen: number }>
bySeries: Array<{ series: string; diamond_level: number; count: number }>
/** 现货分布:system + series + diamondLevel -> 剩余可匹配件数;璀璨数不参与分组。 */
byStockSpec: Array<{
system: string
series: string
diamond_level: number
quantity: number
}>
}
/** 寄售仓库按寄卖配置动态规格筛选:key 走白名单,值一律参数绑定。 */
@@ -448,10 +455,24 @@ export async function getConsignmentInventoryStats(
const totalsSql = `
SELECT
COALESCE(SUM(CASE WHEN ci.status = 'in_stock' THEN 1 ELSE 0 END), 0)::integer AS in_stock_count,
COALESCE(SUM(CASE WHEN ci.status = 'in_stock' THEN ci.cost_price_fen ELSE 0 END), 0)::integer AS in_stock_cost_fen,
COALESCE(SUM(CASE WHEN ci.status = 'consumed' THEN 1 ELSE 0 END), 0)::integer AS consumed_count,
COALESCE(SUM(CASE WHEN ci.status = 'consumed' THEN ci.cost_price_fen ELSE 0 END), 0)::integer AS consumed_cost_fen
COALESCE(SUM(
CASE WHEN ci.status = 'in_stock' THEN GREATEST(ci.remaining_quantity, 0) ELSE 0 END
), 0)::integer AS in_stock_count,
COALESCE(SUM(
CASE WHEN ci.status = 'in_stock'
THEN ci.cost_price_fen::bigint * GREATEST(ci.remaining_quantity, 0)
ELSE 0
END
), 0)::integer AS in_stock_cost_fen,
COALESCE(SUM(
CASE WHEN ci.status = 'consumed' THEN GREATEST(ci.quantity, 0) ELSE 0 END
), 0)::integer AS consumed_count,
COALESCE(SUM(
CASE WHEN ci.status = 'consumed'
THEN ci.cost_price_fen::bigint * GREATEST(ci.quantity, 0)
ELSE 0
END
), 0)::integer AS consumed_cost_fen
FROM consignment_inventories ci
${whereWith()}
`
@@ -471,12 +492,24 @@ export async function getConsignmentInventoryStats(
const buyerSql = `
SELECT
COALESCE(NULLIF(ci.buyer_name, ''), '未知') AS buyer_name,
COUNT(*)::integer AS count,
SUM(ci.cost_price_fen)::integer AS total_cost_fen,
COUNT(CASE WHEN ci.status = 'consumed' THEN 1 END)::integer AS consumed_count
COALESCE(SUM(
CASE WHEN ci.status = 'in_stock' THEN GREATEST(ci.remaining_quantity, 0) ELSE 0 END
), 0)::integer AS count,
COALESCE(SUM(
CASE WHEN ci.status = 'in_stock'
THEN ci.cost_price_fen::bigint * GREATEST(ci.remaining_quantity, 0)
ELSE 0
END
), 0)::integer AS total_cost_fen,
COALESCE(SUM(
CASE WHEN ci.status = 'consumed' THEN GREATEST(ci.quantity, 0) ELSE 0 END
), 0)::integer AS consumed_count
FROM consignment_inventories ci
${whereWith()}
${whereWith(`ci.status IN ('in_stock', 'consumed')`)}
GROUP BY ci.buyer_name
HAVING SUM(
CASE WHEN ci.status = 'in_stock' THEN GREATEST(ci.remaining_quantity, 0) ELSE 0 END
) > 0
ORDER BY count DESC
LIMIT 20
`
@@ -490,7 +523,7 @@ export async function getConsignmentInventoryStats(
const shopSql = `
SELECT
COALESCE(NULLIF(ci.shop_name, ''), '其他') AS shop_name,
COUNT(*)::integer AS count
COALESCE(SUM(GREATEST(ci.quantity, 0)), 0)::integer AS count
FROM consignment_inventories ci
${whereWith(`ci.status = 'consumed'`, `ci.shop_name <> ''`)}
GROUP BY ci.shop_name
@@ -502,10 +535,12 @@ export async function getConsignmentInventoryStats(
const batchSql = `
SELECT
COALESCE(NULLIF(ci.inbound_batch, ''), '未分类') AS inbound_batch,
COUNT(*)::integer AS count,
SUM(ci.cost_price_fen)::integer AS total_cost_fen
COALESCE(SUM(GREATEST(ci.remaining_quantity, 0)), 0)::integer AS count,
COALESCE(SUM(
ci.cost_price_fen::bigint * GREATEST(ci.remaining_quantity, 0)
), 0)::integer AS total_cost_fen
FROM consignment_inventories ci
${whereWith()}
${whereWith(`ci.status = 'in_stock'`)}
GROUP BY ci.inbound_batch
ORDER BY count DESC
LIMIT 20
@@ -519,7 +554,7 @@ export async function getConsignmentInventoryStats(
SELECT
COALESCE(NULLIF(ci.series, ''), '未注明') AS series,
ci.diamond_level,
COUNT(*)::integer AS count
COALESCE(SUM(GREATEST(ci.remaining_quantity, 0)), 0)::integer AS count
FROM consignment_inventories ci
${whereWith(`ci.status = 'in_stock'`)}
GROUP BY ci.series, ci.diamond_level
@@ -531,6 +566,37 @@ export async function getConsignmentInventoryStats(
values,
)
const stockSpecSql = `
SELECT
COALESCE(
NULLIF(BTRIM(ci.spec_values_json ->> 'system'), ''),
NULLIF(BTRIM(ci.system), ''),
'未注明'
) AS system,
COALESCE(
NULLIF(BTRIM(ci.spec_values_json ->> 'series'), ''),
NULLIF(BTRIM(ci.series), ''),
'未注明'
) AS series,
CASE
WHEN BTRIM(COALESCE(ci.spec_values_json ->> 'diamondLevel', '')) ~ '^[0-9]+$'
THEN BTRIM(ci.spec_values_json ->> 'diamondLevel')::integer
ELSE ci.diamond_level
END AS diamond_level,
COALESCE(SUM(GREATEST(ci.remaining_quantity, 0)), 0)::integer AS quantity
FROM consignment_inventories ci
${whereWith(`ci.status = 'in_stock'`, `ci.allow_matching = TRUE`, `ci.remaining_quantity > 0`)}
GROUP BY 1, 2, 3
ORDER BY quantity DESC, system ASC, series ASC, diamond_level ASC
LIMIT 100
`
const stockSpecRes = await query<{
system: string
series: string
diamond_level: number
quantity: number
}>(stockSpecSql, values)
return {
totalInStockCount: totals.in_stock_count,
totalInStockCostFen: totals.in_stock_cost_fen,
@@ -540,6 +606,7 @@ export async function getConsignmentInventoryStats(
byShop: shopRes.rows,
byBatch: batchRes.rows,
bySeries: seriesRes.rows,
byStockSpec: stockSpecRes.rows,
}
}
@@ -210,3 +210,33 @@ test('筛选项排序:苏尔南手枪固定排第一,其余保持配置顺
['苏尔南手枪', '密钥', '其它'],
)
})
test('现货统计:按 remaining_quantity 汇总,成本乘数量,并输出系统+系列+钻级汇总', async () => {
const source = await readFile(
new URL('../../repositories/worker-platform/consignment-repo.ts', import.meta.url),
'utf8',
)
const totalsSql = source.slice(
source.indexOf('const totalsSql'),
source.indexOf('const buyerSql'),
)
assert.ok(!totalsSql.includes('ci.allow_matching'), '顶部在库统计保持全部在库口径')
assert.ok(totalsSql.includes('GREATEST(ci.remaining_quantity, 0)'), '在库件数必须按剩余数量')
assert.ok(
totalsSql.includes('ci.cost_price_fen::bigint * GREATEST(ci.remaining_quantity, 0)'),
'在库成本必须乘剩余数量',
)
assert.ok(source.includes('byStockSpec: stockSpecRes.rows'), '统计结果必须返回现货分布字段')
const stockSpecSql = source.slice(
source.indexOf('const stockSpecSql'),
source.indexOf('const stockSpecRes'),
)
assert.ok(stockSpecSql.includes("ci.spec_values_json ->> 'system'"), '现货分布必须优先读动态规格')
assert.ok(stockSpecSql.includes("ci.spec_values_json ->> 'series'"), '现货分布必须优先读动态规格')
assert.ok(
stockSpecSql.includes("ci.spec_values_json ->> 'diamondLevel'"),
'现货分布必须优先读动态规格',
)
assert.ok(stockSpecSql.includes('ci.allow_matching = TRUE'), '现货分布必须只包含允许匹配的库存')
assert.ok(!stockSpecSql.includes('brillianceCount'), '璀璨数不参与分组')
})
@@ -72,6 +72,14 @@ import {
resolveConsignmentSpecValueText,
} from '@/utils/consignment-spec-display'
import { CONSIGNMENT_SYSTEM_OPTIONS, CONSIGNMENT_ZONE_OPTIONS } from '@/utils/consignment-spec'
import {
buildConsignmentStockSpecFilter,
buildConsignmentStockSpecMatrix,
formatConsignmentStockSpecLabel,
formatConsignmentStockSpecSummary,
isSameConsignmentStockSpec,
type ConsignmentStockSpecSummaryItem,
} from '@/utils/consignment-stock-summary'
import { formatDateTime } from '@/utils/date-time'
const { Text } = Typography
@@ -148,6 +156,10 @@ export default function ConsignmentInventoryPanel() {
const [categoryId, setCategoryId] = useState<number | null>(null)
const [categoryExpandedKeys, setCategoryExpandedKeys] = useState<Array<string | number>>([])
const [specFilters, setSpecFilters] = useState<Record<string, string>>({})
/** 点击现货汇总标签产生的列表筛选;不参与顶部统计和汇总本身。 */
const [stockSpecFilter, setStockSpecFilter] = useState<ConsignmentStockSpecSummaryItem | null>(
null,
)
const [allowMatching, setAllowMatching] = useState<string>('')
// 对接客服多选:0 作为「未指定」哨兵值,与真实客服 id 分开。
const [contactSupporterIds, setContactSupporterIds] = useState<number[]>([])
@@ -297,11 +309,22 @@ export default function ConsignmentInventoryPanel() {
}, [dynamicFilters, specFilters])
const specFilterParams =
Object.keys(specFilterPayload).length > 0 ? JSON.stringify(specFilterPayload) : undefined
const stockSpecFilterPayload = useMemo(
() => (stockSpecFilter ? buildConsignmentStockSpecFilter(stockSpecFilter) : {}),
[stockSpecFilter],
)
// 现货汇总标签只筛选下方列表;统计和汇总继续显示当前分类下的完整现货分布。
const listSpecFilterPayload = { ...specFilterPayload, ...stockSpecFilterPayload }
const listSpecFilterParams =
Object.keys(listSpecFilterPayload).length > 0
? JSON.stringify(listSpecFilterPayload)
: undefined
// 对接客服筛选只按 id 传参;未指定单独标记,后端与多选 id 取并集。
const contactSupporterIdsParam = contactSupporterIds.filter((id) => id > 0).join(',') || undefined
const includeUnassignedContactSupporter = contactSupporterIds.includes(0)
function updateSpecFilter(field: ConsignmentInventoryFilterField, value: string) {
setStockSpecFilter(null)
setSpecFilters((current) => {
const next = { ...current }
if (value) next[field.key] = value
@@ -311,13 +334,24 @@ export default function ConsignmentInventoryPanel() {
setPage(1)
}
function handleStockSpecClick(item: ConsignmentStockSpecSummaryItem) {
if (isSameConsignmentStockSpec(stockSpecFilter, item)) {
setStockSpecFilter(null)
} else {
setStockSpecFilter(item)
setAllowMatching('yes')
setStatus('in_stock')
}
setPage(1)
}
// 数据查询
const inventoriesQuery = useQuery({
queryKey: [
'admin-consignment-inventories',
status,
categoryId,
specFilterParams,
listSpecFilterParams,
allowMatching,
contactSupporterIdsParam,
includeUnassignedContactSupporter,
@@ -331,7 +365,7 @@ export default function ConsignmentInventoryPanel() {
fetchAdminConsignmentInventories({
status: status === 'all' ? undefined : status,
categoryId: categoryId ?? undefined,
specFilters: specFilterParams,
specFilters: listSpecFilterParams,
allowMatching: allowMatching === 'yes' ? true : allowMatching === 'no' ? false : undefined,
contactSupporterIds: contactSupporterIdsParam,
contactSupporterUnassigned: includeUnassignedContactSupporter || undefined,
@@ -364,6 +398,42 @@ export default function ConsignmentInventoryPanel() {
const items = inventoriesQuery.data?.data.items || []
const total = inventoriesQuery.data?.data.total || 0
const stats = statsQuery.data?.data
const stockSpecMatrixRows = useMemo(
() => buildConsignmentStockSpecMatrix(stats?.byStockSpec),
[stats],
)
const stockSpecMatrixGroups = useMemo(() => {
const groups = new Map<string, typeof stockSpecMatrixRows>()
for (const row of stockSpecMatrixRows) {
const group = groups.get(row.system) || []
group.push(row)
groups.set(row.system, group)
}
return [...groups.entries()].map(([system, rows]) => ({ system, rows }))
}, [stockSpecMatrixRows])
function resolveStockSpecSystemPalette(system: string) {
if (system === '苹果') {
return { background: '#e6f4ff', border: '#91caff', color: '#0958d9' }
}
if (system === '安卓') {
return { background: '#f6ffed', border: '#b7eb8f', color: '#389e0d' }
}
return { background: '#f9f0ff', border: '#d3adf7', color: '#531dab' }
}
function resolveStockSpecSeriesPalette(series: string) {
if (series === '暗潮') {
return { background: '#e6f4ff', color: '#0958d9' }
}
if (series === '怒嚎') {
return { background: '#fff7e6', color: '#d46b08' }
}
if (series === '血宴') {
return { background: '#fff0f6', color: '#c41d7f' }
}
return { background: '#f9f0ff', color: '#531dab' }
}
async function refresh() {
await Promise.all([inventoriesQuery.refetch(), statsQuery.refetch()])
@@ -956,7 +1026,7 @@ export default function ConsignmentInventoryPanel() {
<div style={{ marginTop: 4, display: 'flex', flexWrap: 'wrap', gap: 6 }}>
{(stats?.byBuyer || []).map((b) => (
<Tag key={b.buyer_name} color={BUYER_COLORS[b.buyer_name] || 'blue'}>
{b.buyer_name}: {b.count}件 (在库) / ¥{(b.total_cost_fen / 100).toFixed(0)}
{b.buyer_name}: {b.count}件 (在库) / ¥{(b.total_cost_fen / 100).toFixed(2)}
</Tag>
))}
</div>
@@ -965,6 +1035,209 @@ export default function ConsignmentInventoryPanel() {
</Row>
</Card>
{/* 现货分布:只统计在库剩余数量;璀璨数合并计入,不单独拆分。 */}
<Card
size="small"
bordered={false}
className="platform-summary-strip-card"
styles={{ body: { padding: '6px 10px' } }}
>
<Space direction="vertical" size={4} style={{ width: '100%' }}>
<Space size={6} wrap style={{ width: '100%', justifyContent: 'space-between' }}>
<Space size={8} wrap>
<Text strong>现货库存</Text>
<Text type="secondary" style={{ fontSize: 12 }}>
仅统计在库且允许匹配的剩余数量,璀璨已合并计入,不单独拆分
</Text>
{stockSpecFilter ? (
<Tag
color="orange"
closable
onClose={(event) => {
event.preventDefault()
setStockSpecFilter(null)
setPage(1)
}}
>
列表筛选:{formatConsignmentStockSpecLabel(stockSpecFilter)}(在库可匹配)
</Tag>
) : null}
</Space>
<Button
size="small"
icon={<ReloadOutlined />}
loading={statsQuery.isFetching}
onClick={() => void refresh()}
>
刷新
</Button>
</Space>
{stockSpecMatrixGroups.length > 0 ? (
<div style={{ width: '100%', overflowX: 'auto' }}>
<table
style={{
width: '100%',
minWidth: 1220,
borderCollapse: 'separate',
borderSpacing: 0,
tableLayout: 'fixed',
}}
>
<colgroup>
<col style={{ width: 66 }} />
<col style={{ width: 90 }} />
{Array.from({ length: 7 }, (_, index) => (
<col key={index} style={{ width: 150 }} />
))}
</colgroup>
<thead>
<tr>
{['系统', '系列', '1钻', '2钻', '3钻', '4钻', '5钻', '6钻', '7钻'].map(
(label, index) => (
<th
key={label}
style={{
padding: '3px 6px',
textAlign: 'center',
fontSize: 12,
color: '#595959',
fontWeight: 600,
background: '#fafafa',
borderTop: '1px solid #f0f0f0',
borderBottom: '1px solid #f0f0f0',
borderRight: index < 8 ? '1px solid #f0f0f0' : undefined,
}}
>
{label}
</th>
),
)}
</tr>
</thead>
<tbody>
{stockSpecMatrixGroups.map((group, groupIndex) => {
const systemPalette = resolveStockSpecSystemPalette(group.system)
return group.rows.map((row, rowIndex) => {
const seriesPalette = resolveStockSpecSeriesPalette(row.series)
return (
<tr key={`${row.system}-${row.series}`}>
{rowIndex === 0 ? (
<td
rowSpan={group.rows.length}
style={{
padding: '3px 6px',
textAlign: 'center',
fontWeight: 600,
color: systemPalette.color,
background: systemPalette.background,
borderTop: groupIndex > 0 ? '4px solid #f5f7fb' : undefined,
borderRight: '1px solid #f0f0f0',
borderBottom: '1px solid #f0f0f0',
}}
>
{group.system}
</td>
) : null}
<td
style={{
padding: '3px 6px',
textAlign: 'center',
fontWeight: 600,
color: seriesPalette.color,
background: seriesPalette.background,
borderTop:
rowIndex === 0 && groupIndex > 0 ? '4px solid #f5f7fb' : undefined,
borderRight: '1px solid #f0f0f0',
borderBottom: '1px solid #f0f0f0',
}}
>
{row.series}
</td>
{row.cells.map((cell, cellIndex) => {
const item = cell.item
const selected = isSameConsignmentStockSpec(stockSpecFilter, item)
const displayItem = item || {
system: row.system,
series: row.series,
diamond_level: cell.diamond_level,
quantity: 0,
}
const displayLabel = formatConsignmentStockSpecSummary(displayItem)
return (
<td
key={cell.diamond_level}
style={{
padding: 2,
textAlign: 'center',
borderTop:
rowIndex === 0 && groupIndex > 0
? '4px solid #f5f7fb'
: undefined,
borderRight:
cellIndex < row.cells.length - 1
? '1px solid #f0f0f0'
: undefined,
borderBottom: '1px solid #f0f0f0',
}}
>
{item ? (
<button
type="button"
title={`点击筛选:${displayLabel}`}
onClick={() => handleStockSpecClick(item)}
style={{
width: '100%',
minHeight: 20,
padding: '0 4px',
borderRadius: 4,
cursor: 'pointer',
fontSize: 12,
lineHeight: '20px',
textAlign: 'center',
whiteSpace: 'nowrap',
fontWeight: selected ? 700 : 500,
color: selected ? '#ad4e00' : systemPalette.color,
background: selected ? '#fff7e6' : systemPalette.background,
border: `1px solid ${selected ? '#fa8c16' : systemPalette.border}`,
}}
>
{displayLabel}
</button>
) : (
<span
style={{
display: 'block',
minHeight: 20,
padding: '0 4px',
borderRadius: 4,
color: '#bfbfbf',
background: '#fafafa',
border: '1px solid #f0f0f0',
fontSize: 12,
lineHeight: '20px',
textAlign: 'center',
whiteSpace: 'nowrap',
}}
>
{displayLabel}
</span>
)}
</td>
)
})}
</tr>
)
})
})}
</tbody>
</table>
</div>
) : (
<Text type="secondary">暂无在库现货</Text>
)}
</Space>
</Card>
{/* 筛选过滤工具条 */}
<Card size="small">
<Space direction="vertical" size={12} style={{ width: '100%' }}>
@@ -1031,6 +1304,7 @@ export default function ConsignmentInventoryPanel() {
if (typeof value !== 'number' || value <= 0) return
setCategoryId(value)
setSpecFilters({})
setStockSpecFilter(null)
setPage(1)
}}
/>
@@ -1112,6 +1386,7 @@ export default function ConsignmentInventoryPanel() {
? [dates[0].format(ADMIN_DATE_FORMAT), dates[1].format(ADMIN_DATE_FORMAT)]
: null,
)
setStockSpecFilter(null)
setPage(1)
}}
/>
@@ -1664,13 +1939,16 @@ export default function ConsignmentInventoryPanel() {
inventoryId={manualMatchItem?.id ?? null}
inventoryLabel={manualMatchItem?.itemName}
onClose={() => setManualMatchItem(null)}
onMatched={() => void inventoriesQuery.refetch()}
onMatched={() => void refresh()}
/>
{/* 一键查询待匹配订单:简单只读的待抢单手枪 × 在库手枪看板 */}
<ConsignmentPendingMatchModal
open={pendingMatchOpen}
onClose={() => setPendingMatchOpen(false)}
onClose={() => {
setPendingMatchOpen(false)
void refresh()
}}
/>
<ConsignmentMatchLogsModal open={matchLogsOpen} onClose={() => setMatchLogsOpen(false)} />
+7
View File
@@ -279,6 +279,13 @@ export type ConsignmentStatsSummary = {
byShop: Array<{ shop_name: string; count: number }>
byBatch: Array<{ inbound_batch: string; count: number; total_cost_fen: number }>
bySeries: Array<{ series: string; diamond_level: number; count: number }>
/** 现货分布:系统 + 系列 + 钻级 -> 剩余可匹配件数;璀璨数不参与分组。 */
byStockSpec: Array<{
system: string
series: string
diamond_level: number
quantity: number
}>
}
export type ConsignmentMatchResult = {
@@ -0,0 +1,129 @@
export type ConsignmentStockSpecSummaryItem = {
system: string
series: string
diamond_level: number
quantity: number
}
export type ConsignmentStockSpecMatrixCell = {
diamond_level: number
item?: ConsignmentStockSpecSummaryItem
}
export type ConsignmentStockSpecMatrixRow = {
system: string
series: string
cells: ConsignmentStockSpecMatrixCell[]
}
export const CONSIGNMENT_STOCK_SERIES_ORDER = ['暗潮', '怒嚎', '血宴'] as const
export const CONSIGNMENT_STOCK_SYSTEM_ORDER = ['苹果', '安卓'] as const
export const CONSIGNMENT_STOCK_DIAMOND_LEVELS = [1, 2, 3, 4, 5, 6, 7] as const
const UNKNOWN_SPEC_LABEL = '未注明'
function normalizeText(value: unknown) {
const text = String(value ?? '').trim()
return text || UNKNOWN_SPEC_LABEL
}
function formatDiamondLevel(value: unknown) {
const level = Number(value)
return Number.isFinite(level) && level > 0 ? `${Math.round(level)}钻` : '未知钻级'
}
/** 现货汇总标签:系统 + 系列 + 钻级;璀璨数和区服不参与。 */
export function formatConsignmentStockSpecLabel(item: ConsignmentStockSpecSummaryItem) {
return `${normalizeText(item.system)}${normalizeText(item.series)}${formatDiamondLevel(
item.diamond_level,
)}`
}
/** 页面展示格式,例如「安卓怒嚎3钻-2件」。 */
export function formatConsignmentStockSpecSummary(item: ConsignmentStockSpecSummaryItem) {
const quantity = Math.max(0, Math.round(Number(item.quantity) || 0))
return `${formatConsignmentStockSpecLabel(item)}-${quantity}件`
}
/** 汇总总件数,用于与顶部「在库数量」做同口径校验。 */
export function sumConsignmentStockSpecQuantity(
items: ConsignmentStockSpecSummaryItem[] | undefined,
) {
return (items || []).reduce(
(total, item) => total + Math.max(0, Math.round(Number(item.quantity) || 0)),
0,
)
}
export function isSameConsignmentStockSpec(
left: ConsignmentStockSpecSummaryItem | null | undefined,
right: ConsignmentStockSpecSummaryItem | null | undefined,
) {
if (!left || !right) return false
return (
normalizeText(left.system) === normalizeText(right.system) &&
normalizeText(left.series) === normalizeText(right.series) &&
Number(left.diamond_level) === Number(right.diamond_level)
)
}
/** 点击现货汇总后用于过滤下方列表;璀璨数和区服不进入筛选条件。 */
export function buildConsignmentStockSpecFilter(item: ConsignmentStockSpecSummaryItem) {
return {
system: { value: normalizeText(item.system), match: 'exact' as const },
series: { value: normalizeText(item.series), match: 'exact' as const },
diamondLevel: {
value: String(Math.round(Number(item.diamond_level) || 0)),
match: 'exact' as const,
},
}
}
function sortByKnownOrder(values: string[], order: readonly string[]) {
const rank = new Map(order.map((value, index) => [value, index]))
return values.sort((left, right) => {
const leftRank = rank.get(left)
const rightRank = rank.get(right)
if (leftRank !== undefined || rightRank !== undefined) {
return (leftRank ?? Number.MAX_SAFE_INTEGER) - (rightRank ?? Number.MAX_SAFE_INTEGER)
}
return left.localeCompare(right, 'zh-CN')
})
}
/** 按图片结构生成矩阵:系统分组(苹果在前)→ 系列(暗潮/怒嚎/血宴)→ 1~7 钻。 */
export function buildConsignmentStockSpecMatrix(
items: ConsignmentStockSpecSummaryItem[] | undefined,
): ConsignmentStockSpecMatrixRow[] {
const normalizedItems = (items || []).map((item) => ({
...item,
system: normalizeText(item.system),
series: normalizeText(item.series),
diamond_level: Math.round(Number(item.diamond_level) || 0),
}))
const systems = sortByKnownOrder(
[...new Set(normalizedItems.map((item) => item.system))],
CONSIGNMENT_STOCK_SYSTEM_ORDER,
)
const seriesList = sortByKnownOrder(
[...new Set(normalizedItems.map((item) => item.series))],
CONSIGNMENT_STOCK_SERIES_ORDER,
)
const itemByKey = new Map(
normalizedItems.map((item) => [
`${item.system}\u0000${item.series}\u0000${item.diamond_level}`,
item,
]),
)
return systems.flatMap((system) =>
seriesList.map((series) => ({
system,
series,
cells: CONSIGNMENT_STOCK_DIAMOND_LEVELS.map((diamondLevel) => ({
diamond_level: diamondLevel,
item: itemByKey.get(`${system}\u0000${series}\u0000${diamondLevel}`),
})),
})),
)
}
@@ -0,0 +1,166 @@
import assert from 'node:assert/strict'
import { readFileSync } from 'node:fs'
import { fileURLToPath } from 'node:url'
import test from 'node:test'
import {
buildConsignmentStockSpecFilter,
buildConsignmentStockSpecMatrix,
formatConsignmentStockSpecLabel,
formatConsignmentStockSpecSummary,
isSameConsignmentStockSpec,
sumConsignmentStockSpecQuantity,
} from '../src/utils/consignment-stock-summary.ts'
test('现货汇总标签按 系统+系列+钻级 输出,不包含璀璨和区服', () => {
assert.equal(
formatConsignmentStockSpecSummary({
system: '安卓',
series: '怒嚎',
diamond_level: 3,
quantity: 2,
}),
'安卓怒嚎3钻-2件',
)
assert.equal(
formatConsignmentStockSpecLabel({
system: '苹果',
series: '暗潮',
diamond_level: 2,
quantity: 3,
}),
'苹果暗潮2钻',
)
})
test('现货汇总对缺失规格和异常数量做安全展示', () => {
assert.equal(
formatConsignmentStockSpecSummary({
system: '',
series: ' ',
diamond_level: 0,
quantity: -2,
}),
'未注明未注明未知钻级-0件',
)
assert.equal(
formatConsignmentStockSpecSummary({
system: '苹果',
series: '怒嚎',
diamond_level: 2,
quantity: 0,
}),
'苹果怒嚎2钻-0件',
)
})
test('现货汇总总件数按数量相加,不按行数相加', () => {
assert.equal(
sumConsignmentStockSpecQuantity([
{ system: '苹果', series: '暗潮', diamond_level: 2, quantity: 3 },
{ system: '安卓', series: '怒嚎', diamond_level: 3, quantity: 2 },
]),
5,
)
})
test('点击现货汇总只生成系统+系列+钻级三个精确筛选条件', () => {
assert.deepEqual(
buildConsignmentStockSpecFilter({
system: '安卓',
series: '怒嚎',
diamond_level: 3,
quantity: 2,
}),
{
system: { value: '安卓', match: 'exact' },
series: { value: '怒嚎', match: 'exact' },
diamondLevel: { value: '3', match: 'exact' },
},
)
})
test('现货汇总筛选只比较系统、系列和钻级,忽略数量和璀璨差异', () => {
assert.equal(
isSameConsignmentStockSpec(
{ system: '苹果', series: '暗潮', diamond_level: 2, quantity: 3 },
{ system: '苹果', series: '暗潮', diamond_level: 2, quantity: 8 },
),
true,
)
assert.equal(
isSameConsignmentStockSpec(
{ system: '苹果', series: '暗潮', diamond_level: 2, quantity: 3 },
{ system: '安卓', series: '暗潮', diamond_level: 2, quantity: 3 },
),
false,
)
})
test('现货矩阵按苹果在前、安卓在后,系列按 暗潮 → 怒嚎 → 血宴 排列', () => {
const rows = buildConsignmentStockSpecMatrix([
{ system: '苹果', series: '血宴', diamond_level: 1, quantity: 4 },
{ system: '安卓', series: '怒嚎', diamond_level: 5, quantity: 13 },
{ system: '安卓', series: '暗潮', diamond_level: 3, quantity: 1 },
{ system: '苹果', series: '暗潮', diamond_level: 2, quantity: 9 },
{ system: '安卓', series: '暗潮', diamond_level: 1, quantity: 3 },
{ system: '苹果', series: '暗潮', diamond_level: 1, quantity: 3 },
])
assert.deepEqual(
rows.map((row) => `${row.system}/${row.series}`),
['苹果/暗潮', '苹果/怒嚎', '苹果/血宴', '安卓/暗潮', '安卓/怒嚎', '安卓/血宴'],
)
assert.ok(
rows.every((row) => row.cells.length === 7),
'每行必须固定 1~7 钻七列',
)
const appleDarkTide = rows.find((row) => row.system === '苹果' && row.series === '暗潮')
assert.equal(appleDarkTide?.cells[0]?.item?.quantity, 3)
assert.equal(appleDarkTide?.cells[1]?.item?.quantity, 9)
const androidRage = rows.find((row) => row.system === '安卓' && row.series === '怒嚎')
assert.equal(androidRage?.cells[4]?.item?.quantity, 13)
})
test('寄售仓库页面必须渲染后端现货汇总并展示口径提示', () => {
const source = readFileSync(
fileURLToPath(
new URL('../src/pages/admin/panels/ConsignmentInventoryPanel.tsx', import.meta.url),
),
'utf8',
).replace(/\r\n/g, '\n')
assert.ok(source.includes('stats?.byStockSpec'), '页面必须读取服务端现货汇总')
assert.ok(source.includes('formatConsignmentStockSpecSummary'), '页面必须使用统一汇总格式')
assert.ok(source.includes('璀璨已合并计入'), '页面必须说明璀璨不单独拆分')
assert.ok(source.includes('loading={statsQuery.isFetching}'), '现货库存必须提供手动刷新状态')
assert.ok(!source.includes('refetchInterval'), '现货库存不得自动轮询,只保留手动刷新')
assert.ok(
source.includes('onClick={() => handleStockSpecClick(item)}'),
'点击现货标签必须筛选列表',
)
assert.ok(source.includes("setAllowMatching('yes')"), '点击矩阵必须同时筛选允许匹配库存')
assert.ok(source.includes("setStatus('in_stock')"), '点击矩阵必须回到在库列表')
assert.ok(source.includes('stockSpecFilter'), '页面必须维护现货标签筛选状态')
assert.ok(source.includes('buildConsignmentStockSpecMatrix'), '现货汇总必须按图片生成矩阵')
assert.ok(source.includes('systemPalette.background'), '矩阵必须用颜色区分系统')
assert.ok(source.includes('seriesPalette.background'), '枪系颜色只能标记系列列')
assert.ok(
source.includes("background: selected ? '#fff7e6' : systemPalette.background"),
'钻级库存格必须继续跟随系统颜色,不受枪系颜色影响',
)
assert.ok(source.includes('#fff7e6'), '矩阵必须用颜色区分选中状态')
assert.ok(
!source.includes("textAlign: index < 2 ? 'left' : 'center'"),
'列头和所有表格内容必须统一居中',
)
assert.ok(
source.includes('{displayLabel}'),
'每个矩阵格子必须显示完整规格和数量,例如 苹果怒嚎2钻-9件',
)
assert.ok(
source.includes('const displayItem = item || {'),
'无库存格子也必须生成对应规格的 0 件展示',
)
assert.ok(!source.includes(": '无'"), '无库存不能只显示“无”,必须显示对应规格的 -0件')
})
@@ -3,14 +3,14 @@ type: 权威架构与实施计划
description: 订单、内部 SKU、履约路由、履约执行、商品、成本与财务的唯一权威口径及重构计划。
tags: [订单, 内部SKU, 履约, 商品, 成本, 财务, 迁移]
status: authoritative
version: 2.36
updated_at: 2026-11-20
version: 2.37
updated_at: 2026-11-22
---
# 统一订单、履约与财务模型
> 状态:**唯一权威文档**。
> 最后校准:2026-11-20。
> 最后校准:2026-11-22。
> 生产基线:迁移 `175`(2026-11-19 核对)。
> 开发基线:迁移 `179`(仅本地,尚未部署生产)。
>
@@ -1189,7 +1189,7 @@ docs/archive/
## 十三、当前下一步
截至 2026-11-20,生产基线为 `175`,当前开发基线为 `179`。迁移 `152` 保护订单来源快照,
截至 2026-11-22,生产基线为 `175`,当前开发基线为 `179`。迁移 `152` 保护订单来源快照,
迁移 `158–160` 收口寄卖登记人同步、寄卖平台与自动匹配设置;
迁移 `161` 一次建立人工渠道半自动任务、内置 Connector 默认值、账号级 Cookie JSON 凭证、
任务凭证引用和最终约束;迁移 `162` 建立履约待办四桶只读投影、补载体专用索引和新单优先扫描口径。
@@ -1233,6 +1233,11 @@ pending 角色快照、`role_identity_source` 与 `verification_basis`。
迁移 `172` 将 order_site → live-hub 订单事件升级为订单项快照契约,增加配置停用/订单关闭收敛、
稳定去重指纹和 `live_state_version`;live-hub 同步增加 `next_allocate_at`、即时选号唤醒与
`state_version`,删除正常链路上的 500 条回查窗口。
寄售仓库顶部统计保持全部在库口径:按 `status = in_stock` 的 `remaining_quantity` 汇总件数,
成本按 `cost_price_fen × 数量` 计算。现货矩阵只读取 `status = in_stock AND allow_matching = TRUE`
的库存,点击矩阵筛选时也同时限定在库且允许匹配;
现货汇总按「系统 + 系列 + 钻级」分组,璀璨数合并计入不单独拆分。仓库是否展示某个规格筛选项,
仍由寄卖配置的 `filterable` 开关决定,不新增迁移、不删除规格字段。
迁移中保留的 `semi_auto.credential.export` 权限仅作兼容记录,
不再作为 CK 导出门禁。