fix(finished-progress): exclude historical JST entries

This commit is contained in:
WuYongJie 2026-09-15 10:58:04 +08:00
parent b63b2fe974
commit 79f34971d6
7 changed files with 159 additions and 13 deletions

View File

@ -1,6 +1,7 @@
jest.mock('@/lib/prisma', () => ({ prisma: {
$transaction: jest.fn(),
sampleProgressItem: { findMany: jest.fn(), findUnique: jest.fn() },
intakeNonIntegratedProduct: { findFirst: jest.fn() },
} }))
import { prisma } from '@/lib/prisma'
@ -8,7 +9,11 @@ import { finishedProductFactoryIntakeRepository as repository } from '../finishe
import type { FinishedProductFactoryAutoRowInput } from '@/server/services/finished-product-factory-intake.types'
type StoredRow = Record<string, unknown>
const mockPrisma = prisma as unknown as { $transaction: jest.Mock; sampleProgressItem: { findMany: jest.Mock; findUnique: jest.Mock } }
const mockPrisma = prisma as unknown as {
$transaction: jest.Mock
sampleProgressItem: { findMany: jest.Mock; findUnique: jest.Mock }
intakeNonIntegratedProduct: { findFirst: jest.Mock }
}
function row(skuId: string, overrides: Partial<FinishedProductFactoryAutoRowInput> = {}): FinishedProductFactoryAutoRowInput {
return {
@ -51,6 +56,22 @@ function mockTransaction(initial: StoredRow[] = []) {
describe('finished product factory intake persistence', () => {
beforeEach(() => jest.clearAllMocks())
it('loads SKU codes and structured entry timestamps for automatic intake eligibility', async () => {
const product = { id: 'prod-1', brand: '', payload: {},
skuItems: [{ skuItemId: 'sku-1', skuCode: 'SKU-001', model: 'SPU1', barcode: '' }],
pricingRows: [{ skuItemId: 'sku-1', systemEnteredAt: new Date('2026-09-14T00:00:00Z') }],
}
mockPrisma.intakeNonIntegratedProduct.findFirst.mockResolvedValue(product)
await expect(repository.loadProduct('prod-1')).resolves.toBe(product)
expect(mockPrisma.intakeNonIntegratedProduct.findFirst).toHaveBeenCalledWith({
where: { id: 'prod-1', deletedAt: null },
select: expect.objectContaining({
skuItems: { select: expect.objectContaining({ skuItemId: true, skuCode: true, barcode: true }) },
pricingRows: { select: { skuItemId: true, systemEnteredAt: true } },
}),
})
})
it('allocates one factory contract and legacy order sequence per source group, even across later catches', async () => {
const { records, tx } = mockTransaction()
await expect(repository.createAutoRows([row('1'), row('2')], '20260914')).resolves.toEqual({ created: 2, skipped: 0 })

View File

@ -100,9 +100,11 @@ export const finishedProductFactoryIntakeRepository: FinishedProductFactoryIntak
skuItems: {
select: {
skuItemId: true, sortOrder: true, model: true, barcode: true, specName: true,
skuCode: true,
manufacturer: true, manufacturerCode: true, minimumOrderQuantity: true, leadTime: true,
},
},
pricingRows: { select: { skuItemId: true, systemEnteredAt: true } },
},
})
},

View File

@ -1,4 +1,4 @@
import { factoryIntakeDate, parseFactoryLeadTime, parseFactoryMinimumOrderQuantity } from '../finished-product-factory-intake.helpers'
import { factoryIntakeDate, hasFactoryIntakePricingEntered, parseFactoryLeadTime, parseFactoryMinimumOrderQuantity } from '../finished-product-factory-intake.helpers'
describe('factory intake field normalization', () => {
it.each(['2026年10月5日', '2026-10-05', '2026/10/5', '2026.10.5', '10/5/26', '10/5/2026'])(
@ -25,4 +25,25 @@ describe('factory intake field normalization', () => {
expect(factoryIntakeDate(new Date('2026-09-14T15:59:59Z'))).toBe('2026-09-14')
expect(factoryIntakeDate(new Date('2026-09-14T16:00:00Z'))).toBe('2026-09-15')
})
it('prefers structured pricing entry state and falls back per SKU to legacy payload', () => {
const product = {
id: 'p1', brand: '', skuItems: [], pricingRows: [
{ skuItemId: 'structured', systemEnteredAt: new Date('2026-09-14T00:00:00Z') },
{ skuItemId: 'structured-empty', systemEnteredAt: null },
], payload: { pricingRows: [
{ skuId: 'structured-empty', systemEnteredAt: '2026-09-14T00:00:00Z' },
{ skuId: 'legacy', systemEnteredAt: '2026-09-14T00:00:00Z' },
{ skuId: 'legacy-empty', systemEnteredAt: ' ' },
{ skuId: 'legacy-missing' },
] },
}
expect(hasFactoryIntakePricingEntered(product, 'structured')).toBe(true)
expect(hasFactoryIntakePricingEntered(product, 'structured-empty')).toBe(false)
expect(hasFactoryIntakePricingEntered(product, 'legacy')).toBe(true)
expect(hasFactoryIntakePricingEntered(product, 'legacy-empty')).toBe(false)
expect(hasFactoryIntakePricingEntered(product, 'legacy-missing')).toBe(false)
expect(hasFactoryIntakePricingEntered(product, 'unknown')).toBe(false)
expect(hasFactoryIntakePricingEntered(product, '')).toBe(false)
})
})

View File

@ -15,6 +15,7 @@ const SAMPLE = { openingCode: 'XP2026071000000310', productDevelopmentFlowUrl: F
function makeDeps() {
const product = {
id: 'prod-1', brand: '品牌甲', purchaser: '采购员',
pricingRows: [] as Array<{ skuItemId: string; systemEnteredAt: Date | null }>,
payload: {
uploadFiles: [{ category: '设计卖点', mimeType: 'image/png', dataUrl: '/api/storage/object?key=design.png' }],
factoryRows: [
@ -26,11 +27,11 @@ function makeDeps() {
],
},
skuItems: [
{ skuItemId: 'sku-1', sortOrder: 0, model: 'SPU1', barcode: 'BAR-1', specName: '白色', manufacturer: '定厂甲', manufacturerCode: 'F1', minimumOrderQuantity: '120', leadTime: '2026年10月15日' },
{ skuItemId: 'sku-2', sortOrder: 1, model: 'SPU1', barcode: 'BAR-2', manufacturer: '定厂甲', manufacturerCode: 'F1' },
{ skuItemId: 'sku-1', sortOrder: 0, model: 'SPU1', skuCode: 'SKU-001', barcode: 'BAR-1', specName: '白色', manufacturer: '定厂甲', manufacturerCode: 'F1', minimumOrderQuantity: '120', leadTime: '2026年10月15日' },
{ skuItemId: 'sku-2', sortOrder: 1, model: 'SPU1', skuCode: 'SKU-002', barcode: 'BAR-2', manufacturer: '定厂甲', manufacturerCode: 'F1' },
{ skuItemId: 'sku-3', sortOrder: 2, model: '', barcode: '', manufacturer: '定厂甲' },
{ skuItemId: 'sku-4', sortOrder: 3, model: 'SPU1', barcode: 'BAR-4', manufacturer: '定厂甲', manufacturerCode: 'F1', minimumOrderQuantity: 'invalid', leadTime: '30天' },
{ skuItemId: 'sku-5', sortOrder: 4, model: 'SPU1', barcode: 'BAR-5', manufacturer: '定厂乙', manufacturerCode: 'F2', minimumOrderQuantity: '20', leadTime: '10/16/26' },
{ skuItemId: 'sku-4', sortOrder: 3, model: 'SPU1', skuCode: 'SKU-004', barcode: 'BAR-4', manufacturer: '定厂甲', manufacturerCode: 'F1', minimumOrderQuantity: 'invalid', leadTime: '30天' },
{ skuItemId: 'sku-5', sortOrder: 4, model: 'SPU1', skuCode: 'SKU-005', barcode: 'BAR-5', manufacturer: '定厂乙', manufacturerCode: 'F2', minimumOrderQuantity: '20', leadTime: '10/16/26' },
],
}
const loadProduct = jest.fn().mockResolvedValue(product)
@ -57,7 +58,7 @@ describe('FinishedProductFactoryIntakeService', () => {
expect(rows[0]).toMatchObject({
sourceOpeningCode: SAMPLE.openingCode, sourceProductId: 'prod-1', sourceSkuId: 'sku-1',
sourceImportedAt: importedAt, sourceSupplierCode: 'F1', supplierCode: 'F1',
itemNumber: 'SPU1', barcode: 'BAR-1', productName: '白色', brand: '品牌甲',
itemNumber: 'SKU-001', barcode: 'BAR-1', productName: '白色', brand: '品牌甲',
supplier: '定厂甲', followUpOwner: '打样跟单', orderedQuantity: 120,
firstDueDate: new Date('2026-10-15T00:00:00Z'),
imageUrl: '/api/storage/object?key=design.png', createdById: 'u1', createdByName: '操作员',
@ -88,6 +89,81 @@ describe('FinishedProductFactoryIntakeService', () => {
})
})
it('skips SKUs already entered into Jushuitan while importing the remaining SKUs', async () => {
const { deps, product, createAutoRows } = makeDeps()
product.pricingRows = [{ skuItemId: 'sku-1', systemEnteredAt: new Date('2026-09-14T00:00:00Z') }]
await expect(new FinishedProductFactoryIntakeService(deps).syncCompletedSampleToFinishedProgress(SAMPLE))
.resolves.toEqual({ created: 2, skipped: 1 })
expect(createAutoRows.mock.calls[0][0].map((row: { sourceSkuId: string }) => row.sourceSkuId))
.toEqual(['sku-4', 'sku-5'])
})
it('uses per-SKU structured entry state over payload and combines entry skips with duplicate skips', async () => {
const { deps, product, loadProduct, createAutoRows } = makeDeps()
loadProduct.mockResolvedValue({ ...product,
pricingRows: [
{ skuItemId: 'sku-1', systemEnteredAt: null },
{ skuItemId: 'sku-4', systemEnteredAt: new Date('2026-09-14T00:00:00Z') },
],
payload: { ...product.payload, pricingRows: [
{ skuId: 'sku-1', systemEnteredAt: '2026-09-14T00:00:00Z' },
{ skuId: 'sku-4', systemEnteredAt: '' },
{ skuId: 'sku-5', systemEnteredAt: '2026-09-14T00:00:00Z' },
] },
})
createAutoRows.mockResolvedValue({ created: 0, skipped: 1 })
await expect(new FinishedProductFactoryIntakeService(deps).syncCompletedSampleToFinishedProgress(SAMPLE))
.resolves.toEqual({ created: 0, skipped: 3 })
expect(createAutoRows.mock.calls[0][0].map((row: { sourceSkuId: string }) => row.sourceSkuId)).toEqual(['sku-1'])
})
it('imports only unentered confirmed legacy SKUs and retains the legacy SKU code', async () => {
const { deps, loadProduct, createAutoRows } = makeDeps()
loadProduct.mockResolvedValue({ id: 'prod-1', brand: '', skuItems: [], pricingRows: [], payload: {
factoryRows: [
{ skuId: 'entered', confirmed: true, model: 'SPU', skuCode: 'OLD-SKU', barcode: 'OLD-BAR' },
{ skuId: 'new', confirmed: true, model: 'SPU', skuCode: ' NEW-SKU ', barcode: '' },
{ skuId: 'model-only', confirmed: true, model: 'SPU', skuCode: '', barcode: '' },
],
pricingRows: [
{ skuId: 'entered', systemEnteredAt: '2026-09-14T00:00:00Z' },
{ skuId: 'new', systemEnteredAt: '' },
],
} })
await expect(new FinishedProductFactoryIntakeService(deps).syncCompletedSampleToFinishedProgress(SAMPLE))
.resolves.toEqual({ created: 1, skipped: 1 })
expect(createAutoRows.mock.calls[0][0]).toEqual([expect.objectContaining({
sourceSkuId: 'new', itemNumber: 'NEW-SKU', barcode: null,
})])
})
it('allows SKU-only or barcode-only rows but never falls back to model for itemNumber', async () => {
const { deps, product, createAutoRows } = makeDeps()
product.skuItems[0].skuCode = ''
product.skuItems[0].barcode = 'BARCODE-ONLY'
product.skuItems[3].skuCode = ''
product.skuItems[3].barcode = ''
product.skuItems[4].skuCode = ' SKU-ONLY '
product.skuItems[4].barcode = ''
await expect(new FinishedProductFactoryIntakeService(deps).syncCompletedSampleToFinishedProgress(SAMPLE))
.resolves.toEqual({ created: 2, skipped: 0 })
expect(createAutoRows.mock.calls[0][0][0]).toMatchObject({ itemNumber: '', barcode: 'BARCODE-ONLY' })
expect(createAutoRows.mock.calls[0][0][1]).toMatchObject({ itemNumber: 'SKU-ONLY', barcode: null })
expect(createAutoRows.mock.calls[0][0].some((row: { sourceSkuId: string }) => row.sourceSkuId === 'sku-4')).toBe(false)
})
it.each([
{ completedAt: '2026-09-03T15:59:59.999Z', expected: { created: 0, skipped: 0 } },
{ completedAt: '2026-09-03T16:00:00.000Z', expected: { created: 3, skipped: 0 } },
{ completedAt: '2026-09-03T16:00:00.001Z', expected: { created: 3, skipped: 0 } },
])('applies the Beijing cutoff at $completedAt', async ({ completedAt, expected }) => {
const { deps, completedSample, createAutoRows } = makeDeps()
completedSample.actualSampleCompletedAt = new Date(completedAt)
await expect(new FinishedProductFactoryIntakeService(deps).syncCompletedSampleToFinishedProgress(SAMPLE))
.resolves.toEqual(expected)
if (expected.created === 0) expect(createAutoRows).not.toHaveBeenCalled()
})
it('can consume an entirely legacy product but requires a stable SKU source key', async () => {
const { deps, loadProduct, createAutoRows } = makeDeps()
loadProduct.mockResolvedValueOnce({

View File

@ -59,6 +59,22 @@ export function factoryRowsForIntake(product: FinishedProductFactorySourceProduc
return buildStructuredFactoryRowOverlay(legacyRows, product.skuItems)
}
// A structured row, including its empty entry date, overrides that SKU's legacy payload.
export function hasFactoryIntakePricingEntered(
product: FinishedProductFactorySourceProduct,
skuItemId: string,
) {
if (!skuItemId) return false
const structured = product.pricingRows?.find((row) => readFactoryIntakeText(row.skuItemId) === skuItemId)
if (structured) return Boolean(structured.systemEnteredAt)
if (!isRecord(product.payload) || !Array.isArray(product.payload.pricingRows)) return false
return product.payload.pricingRows.some((value) =>
isRecord(value) && readFactoryIntakeText(value.skuId) === skuItemId
&& readFactoryIntakeText(value.systemEnteredAt).length > 0,
)
}
export function extractFactoryIntakeImage(payload: unknown) {
if (!isRecord(payload)) return null
const files = Array.isArray(payload.uploadFiles) ? payload.uploadFiles : []

View File

@ -4,6 +4,7 @@ import {
factoryIntakeDate,
factoryRowsForIntake,
completedFactorySampleAt,
hasFactoryIntakePricingEntered,
parseFactoryLeadTime,
parseFactoryMinimumOrderQuantity,
readFactoryIntakeText,
@ -23,7 +24,7 @@ export type {
FinishedProductFactoryIntakeDeps,
} from './finished-product-factory-intake.types'
/** 功能上线日:打样完结时间早于该日的属于历史数据,每日补抓不扫描。 */
/** 功能上线日(北京时间):所有自动带入入口排除此前完结的历史数据。 */
export const FACTORY_INTAKE_LAUNCH_CUTOFF = '2026-09-04'
/** 由壹点链接 → 产品开发记录 ID(/non-integrated/<productId>) */
@ -50,14 +51,13 @@ export class FinishedProductFactoryIntakeService {
async syncCompletedSampleToFinishedProgress(
input: FinishedProductCompletedSampleInput,
actor: FinishedProductFactoryIntakeActor = {},
completedSince?: Date,
): Promise<FinishedProductFactoryIntakeResult> {
const openingCode = readFactoryIntakeText(input.openingCode).toUpperCase()
const productId = linkedProductIdFromFlowUrl(input.productDevelopmentFlowUrl)
if (!openingCode || !productId) return { created: 0, skipped: 0 }
const sample = await this.deps.loadSample(openingCode)
const completedAt = sample ? completedFactorySampleAt(sample) : null
if (!sample || !completedAt || (completedSince && completedAt < completedSince)
if (!sample || !completedAt || completedAt < new Date(`${FACTORY_INTAKE_LAUNCH_CUTOFF}T00:00:00+08:00`)
|| linkedProductIdFromFlowUrl(sample.productDevelopmentFlowUrl) !== productId) {
return { created: 0, skipped: 0 }
}
@ -68,10 +68,15 @@ export class FinishedProductFactoryIntakeService {
const today = factoryIntakeDate(importedAt)
const imageUrl = extractFactoryIntakeImage(product.payload)
const rows: FinishedProductFactoryAutoRowInput[] = []
let skipped = 0
for (const row of factoryRowsForIntake(product)) {
if (row.confirmed !== true) continue
const sourceSkuId = readFactoryIntakeText(row.skuId)
const itemNumber = readFactoryIntakeText(row.model)
if (hasFactoryIntakePricingEntered(product, sourceSkuId)) {
skipped += 1
continue
}
const itemNumber = readFactoryIntakeText(row.skuCode)
const barcode = readFactoryIntakeText(row.barcode)
if (!sourceSkuId || (!itemNumber && !barcode)) continue
const supplier = readFactoryIntakeText(row.supplierName)
@ -98,7 +103,8 @@ export class FinishedProductFactoryIntakeService {
createdByName: actor.name || '系统',
})
}
return this.deps.createAutoRows(rows, today.replaceAll('-', ''))
const result = await this.deps.createAutoRows(rows, today.replaceAll('-', ''))
return { created: result.created, skipped: result.skipped + skipped }
}
/** 每日补抓上线后完结、后来才确认定厂的 SKU;重复来源只跳过。 */
@ -111,7 +117,7 @@ export class FinishedProductFactoryIntakeService {
for (const sample of samples) {
if (!sample.openingCode) continue
scanned += 1
const result = await this.syncCompletedSampleToFinishedProgress(sample, actor, new Date(`${FACTORY_INTAKE_LAUNCH_CUTOFF}T00:00:00+08:00`))
const result = await this.syncCompletedSampleToFinishedProgress(sample, actor)
created += result.created
skipped += result.skipped
}

View File

@ -19,6 +19,10 @@ export type FinishedProductFactorySourceProduct = {
brand: string
payload: unknown
skuItems: Array<Record<string, unknown>>
pricingRows?: Array<{
skuItemId: string
systemEnteredAt: Date | null
}>
}
export type FinishedProductFactorySourceSample = FinishedProductCompletedSampleInput & {