diff --git a/components/upload/file-upload-handlers.ts b/components/upload/file-upload-handlers.ts
index e2e6e60..4273ca6 100644
--- a/components/upload/file-upload-handlers.ts
+++ b/components/upload/file-upload-handlers.ts
@@ -23,6 +23,7 @@ export function buildFormData(params: {
productCategoryName: string
renderer: string
taskNo?: string
+ dingtalkApprovalNo?: string
}): FormData {
const {
previewImages,
@@ -37,6 +38,7 @@ export function buildFormData(params: {
productCategoryName,
renderer,
taskNo,
+ dingtalkApprovalNo,
} = params
const formData = new FormData()
@@ -72,6 +74,9 @@ export function buildFormData(params: {
if (taskNo) {
formData.append('taskNo', taskNo)
}
+ if (dingtalkApprovalNo) {
+ formData.append('dingtalkApprovalNo', dingtalkApprovalNo)
+ }
// 统一处理renderer字段：根据素材类型判断是否需要传递
const rendererInfo = shouldPassRenderer(materialType, renderer)
diff --git a/lib/__tests__/dingtalk-approval-no.test.ts b/lib/__tests__/dingtalk-approval-no.test.ts
new file mode 100644
index 0000000..738c1f9
--- /dev/null
+++ b/lib/__tests__/dingtalk-approval-no.test.ts
@@ -0,0 +1,39 @@
+import {
+ DINGTALK_APPROVAL_NO_MAX_LENGTH,
+ getDingtalkApprovalNoError,
+ normalizeDingtalkApprovalNo,
+ validateDingtalkApprovalNo,
+} from '@/lib/dingtalk-approval-no'
+
+describe('dingtalk approval number', () => {
+ test('允许不填写', () => {
+ expect(normalizeDingtalkApprovalNo(' ')).toBeNull()
+ expect(validateDingtalkApprovalNo('')).toBe(true)
+ expect(validateDingtalkApprovalNo(null)).toBe(true)
+ })
+
+ test('接受日期前缀加任意长度数字后缀', () => {
+ expect(validateDingtalkApprovalNo('202508211445000157693')).toBe(true)
+ expect(validateDingtalkApprovalNo('202402291')).toBe(true)
+ expect(validateDingtalkApprovalNo(' 20250821123 ')).toBe(true)
+ })
+
+ test('拒绝非数字内容和缺少后续编号', () => {
+ expect(getDingtalkApprovalNoError('20250821A1')).toBe('钉钉审批编号只能输入数字')
+ expect(getDingtalkApprovalNoError('20250821')).toBe('钉钉审批编号需包含8位日期和后续编号')
+ })
+
+ test('拒绝无效日期前缀', () => {
+ expect(getDingtalkApprovalNoError('20250230123')).toBe('钉钉审批编号前8位不是有效日期')
+ expect(getDingtalkApprovalNoError('20230229123')).toBe('钉钉审批编号前8位不是有效日期')
+ expect(getDingtalkApprovalNoError('20251301123')).toBe('钉钉审批编号前8位不是有效日期')
+ })
+
+ test('限制异常超长输入', () => {
+ const value = `20250821${'1'.repeat(DINGTALK_APPROVAL_NO_MAX_LENGTH - 7)}`
+ expect(value).toHaveLength(DINGTALK_APPROVAL_NO_MAX_LENGTH + 1)
+ expect(getDingtalkApprovalNoError(value)).toBe(
+ `钉钉审批编号不能超过${DINGTALK_APPROVAL_NO_MAX_LENGTH}位`,
+ )
+ })
+})
diff --git a/lib/__tests__/material-update.test.ts b/lib/__tests__/material-update.test.ts
index 291d7d2..9dff4e6 100644
--- a/lib/__tests__/material-update.test.ts
+++ b/lib/__tests__/material-update.test.ts
@@ -63,6 +63,7 @@ describe('material-update shared rules', () => {
renderer: 'CR',
authorName: '旧作者',
taskNo: 'TASK202601141713525624',
+ dingtalkApprovalNo: null,
taskDetailRequesterUserId: null,
taskDetailRequesterName: null,
isFullSet: true,
@@ -684,6 +685,7 @@ describe('material-update shared rules', () => {
authorName: '任务作者',
userId: 'user-1',
taskNo: 'task202603310001',
+ dingtalkApprovalNo: '202508211445000157693',
},
})
@@ -695,11 +697,65 @@ describe('material-update shared rules', () => {
categoryName: '通用',
sceneName: '通用',
taskNo: 'TASK202603310001',
+ dingtalkApprovalNo: '202508211445000157693',
materialType: '任务-其他',
}),
})
})
+ test('任务素材编辑时应拒绝无效的钉钉审批编号', async () => {
+ ;(prisma.material.findFirst as jest.Mock).mockResolvedValue({
+ ...baseMaterial,
+ materialType: '任务-页面',
+ })
+
+ const result = await updateMaterialWithSharedRules({
+ materialId: 'material-1',
+ operatorUserId: 'user-1',
+ operatorRole: 'USER',
+ input: {
+ productModel: 'SPU-001',
+ categoryName: '店铺A',
+ sceneName: '场景A',
+ materialType: '任务-页面',
+ renderer: '',
+ authorName: '任务作者',
+ dingtalkApprovalNo: '20250230123',
+ },
+ })
+
+ expect(result).toEqual({
+ error: '钉钉审批编号前8位不是有效日期',
+ status: 400,
+ })
+ expect(prisma.material.update).not.toHaveBeenCalled()
+ })
+
+ test('非任务素材不能写入钉钉审批编号', async () => {
+ ;(prisma.material.findFirst as jest.Mock).mockResolvedValue(baseMaterial)
+
+ const result = await updateMaterialWithSharedRules({
+ materialId: 'material-1',
+ operatorUserId: 'user-1',
+ operatorRole: 'USER',
+ input: {
+ productModel: 'SPU-001',
+ categoryName: '店铺A',
+ sceneName: '场景A',
+ materialType: '3D场景',
+ renderer: 'CR',
+ authorName: '作者',
+ dingtalkApprovalNo: '202508211445000157693',
+ },
+ })
+
+ expect(result).toEqual({
+ error: '钉钉审批编号仅适用于“任务-”素材',
+ status: 400,
+ })
+ expect(prisma.material.update).not.toHaveBeenCalled()
+ })
+
test('任务-详情编辑时应按已有资产自动回写 isFullSet', async () => {
;(prisma.material.findFirst as jest.Mock).mockResolvedValue({
...baseMaterial,
diff --git a/lib/__tests__/materials-upload-task-other-route.test.ts b/lib/__tests__/materials-upload-task-other-route.test.ts
index a9b1ec3..dd38903 100644
--- a/lib/__tests__/materials-upload-task-other-route.test.ts
+++ b/lib/__tests__/materials-upload-task-other-route.test.ts
@@ -7,6 +7,7 @@ import { compressImage, sanitizeFileName } from '@/lib/image-processor'
import { createMaterialLog } from '@/lib/material-log'
import { prisma } from '@/lib/prisma'
import { uploadPublicDisplayToS3 } from '@/lib/public-display'
+import { assignTaskNoOnComplete } from '@/lib/product-package'
jest.mock('next-auth', () => ({
getServerSession: jest.fn(),
@@ -83,6 +84,7 @@ jest.mock('@/lib/public-display', () => ({
jest.mock('@/lib/product-package', () => ({
validateTaskNo: jest.fn(() => true),
isTaskNoExists: jest.fn().mockResolvedValue(false),
+ assignTaskNoOnComplete: jest.fn().mockResolvedValue(null),
purgeDeletedMaterialsByTaskNo: jest.fn().mockResolvedValue({
deletedMaterials: 0,
deletedFiles: 0,
@@ -143,6 +145,7 @@ describe('materials upload route - 任务-其他', () => {
const formData = new FormData()
formData.append('materialType', '任务-其他')
formData.append('taskNo', 'TASK202603310001')
+ formData.append('dingtalkApprovalNo', '202508211445000157693')
formData.append('productModel', '')
formData.append('categoryName', '')
formData.append('sceneName', '')
@@ -193,6 +196,18 @@ describe('materials upload route - 任务-其他', () => {
expect(prisma.material.create).not.toHaveBeenCalled()
})
+ test('钉钉审批编号日期无效时应在创建素材前返回失败', async () => {
+ const formData = buildTaskOtherFormData()
+ formData.set('dingtalkApprovalNo', '20250230123')
+
+ const response = await POST(createRequest(formData))
+ const body = await response.json()
+
+ expect(response.status).toBe(400)
+ expect(body.error).toBe('钉钉审批编号前8位不是有效日期')
+ expect(prisma.material.create).not.toHaveBeenCalled()
+ })
+
test('正常上传时应自动补通用店铺和场景，并保留原始压缩包文件名', async () => {
const formData = buildTaskOtherFormData()
@@ -226,14 +241,10 @@ describe('materials upload route - 任务-其他', () => {
]),
}),
)
- expect(prisma.material.update).toHaveBeenCalledWith(
- expect.objectContaining({
- where: { id: 'material-task-other-1' },
- data: expect.objectContaining({
- taskNo: 'TASK202603310001',
- taskStatus: 'completed',
- }),
- }),
+ expect(assignTaskNoOnComplete).toHaveBeenCalledWith(
+ 'material-task-other-1',
+ 'TASK202603310001',
+ '202508211445000157693',
)
expect(createMaterialLog).toHaveBeenCalledWith(
expect.objectContaining({
diff --git a/lib/__tests__/product-package-completion.test.ts b/lib/__tests__/product-package-completion.test.ts
index 809f89e..e7c5dd6 100644
--- a/lib/__tests__/product-package-completion.test.ts
+++ b/lib/__tests__/product-package-completion.test.ts
@@ -12,6 +12,7 @@ import {
import { createMaterialLog } from '@/lib/material-log'
import { createZipFromFiles } from '@/lib/task-material-processor'
import { getOwnedUploadSession } from '@/lib/upload-sessions'
+import { assignTaskNoOnComplete } from '@/lib/product-package'
jest.mock('@/lib/prisma', () => ({
prisma: {
@@ -114,6 +115,7 @@ describe('product-package-completion', () => {
const result = await completeProductPackageUpload({
materialId: 'material-1',
taskNo: null,
+ dingtalkApprovalNo: '202508211445000157693',
operatorUserId: 'user-1',
assets: {
main: [
@@ -148,8 +150,14 @@ describe('product-package-completion', () => {
expect(result).toEqual({
materialId: 'material-1',
taskNo: null,
+ dingtalkApprovalNo: '202508211445000157693',
isFullSet: true,
})
+ expect(assignTaskNoOnComplete).toHaveBeenCalledWith(
+ 'material-1',
+ null,
+ '202508211445000157693',
+ )
expect(queueTaskDetailFullSetNotification).toHaveBeenCalledWith('material-1')
expect(queueTaskDetailBarcodeImagesUpdatedNotification).toHaveBeenCalledWith('material-1', [
'sku-preview-1',
@@ -231,6 +239,7 @@ describe('product-package-completion', () => {
).resolves.toEqual({
materialId: 'material-1',
taskNo: null,
+ dingtalkApprovalNo: null,
isFullSet: true,
})
})
diff --git a/lib/dingtalk-approval-no.ts b/lib/dingtalk-approval-no.ts
new file mode 100644
index 0000000..209c905
--- /dev/null
+++ b/lib/dingtalk-approval-no.ts
@@ -0,0 +1,69 @@
+export const DINGTALK_APPROVAL_NO_MAX_LENGTH = 64
+
+function isLeapYear(year: number): boolean {
+ return year % 400 === 0 || (year % 4 === 0 && year % 100 !== 0)
+}
+
+function getDaysInMonth(year: number, month: number): number {
+ if (month === 2) {
+ return isLeapYear(year) ? 29 : 28
+ }
+
+ return [4, 6, 9, 11].includes(month) ? 30 : 31
+}
+
+function hasValidDatePrefix(value: string): boolean {
+ const year = Number.parseInt(value.slice(0, 4), 10)
+ const month = Number.parseInt(value.slice(4, 6), 10)
+ const day = Number.parseInt(value.slice(6, 8), 10)
+
+ if (year < 1000 || year > 9999 || month < 1 || month > 12 || day < 1) {
+ return false
+ }
+
+ return day <= getDaysInMonth(year, month)
+}
+
+export function normalizeDingtalkApprovalNo(
+ value: string | null | undefined,
+): string | null {
+ if (typeof value !== 'string') {
+ return null
+ }
+
+ const normalized = value.trim()
+ return normalized || null
+}
+
+export function getDingtalkApprovalNoError(
+ value: string | null | undefined,
+): string | null {
+ const normalized = normalizeDingtalkApprovalNo(value)
+ if (!normalized) {
+ return null
+ }
+
+ if (!/^\d+$/.test(normalized)) {
+ return '钉钉审批编号只能输入数字'
+ }
+
+ if (normalized.length < 9) {
+ return '钉钉审批编号需包含8位日期和后续编号'
+ }
+
+ if (normalized.length > DINGTALK_APPROVAL_NO_MAX_LENGTH) {
+ return `钉钉审批编号不能超过${DINGTALK_APPROVAL_NO_MAX_LENGTH}位`
+ }
+
+ if (!hasValidDatePrefix(normalized)) {
+ return '钉钉审批编号前8位不是有效日期'
+ }
+
+ return null
+}
+
+export function validateDingtalkApprovalNo(
+ value: string | null | undefined,
+): boolean {
+ return getDingtalkApprovalNoError(value) === null
+}
diff --git a/lib/material-query.ts b/lib/material-query.ts
index 00639a2..015d470 100644
--- a/lib/material-query.ts
+++ b/lib/material-query.ts
@@ -169,6 +169,7 @@ export async function buildMaterialSearchOrConditions(search: string): Promise
{
const normalizedTaskNo = taskNo?.trim();
+ const hasDingtalkApprovalNo = dingtalkApprovalNo !== undefined;
+ const normalizedDingtalkApprovalNo = normalizeDingtalkApprovalNo(dingtalkApprovalNo);
+ const dingtalkApprovalNoError = getDingtalkApprovalNoError(normalizedDingtalkApprovalNo);
+ if (dingtalkApprovalNoError) {
+ throw new Error(dingtalkApprovalNoError);
+ }
+
if (!normalizedTaskNo) {
await prisma.material.update({
where: { id: materialId },
data: {
+ ...(hasDingtalkApprovalNo
+ ? { dingtalkApprovalNo: normalizedDingtalkApprovalNo }
+ : {}),
taskStatus: TASK_STATUS.COMPLETED,
} as any,
});
@@ -368,6 +383,9 @@ export async function assignTaskNoOnComplete(
where: { id: materialId },
data: {
taskNo: normalizedTaskNo,
+ ...(hasDingtalkApprovalNo
+ ? { dingtalkApprovalNo: normalizedDingtalkApprovalNo }
+ : {}),
taskStatus: TASK_STATUS.COMPLETED,
} as any,
});
diff --git a/prisma/migrations/20260729_add_material_dingtalk_approval_no/migration.sql b/prisma/migrations/20260729_add_material_dingtalk_approval_no/migration.sql
new file mode 100644
index 0000000..80201f2
--- /dev/null
+++ b/prisma/migrations/20260729_add_material_dingtalk_approval_no/migration.sql
@@ -0,0 +1,5 @@
+ALTER TABLE "materials"
+ADD COLUMN "dingtalk_approval_no" TEXT;
+
+CREATE INDEX "materials_dingtalk_approval_no_idx"
+ON "materials"("dingtalk_approval_no");
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index e6ae35f..6124963 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -98,6 +98,7 @@ model Material {
transferredBy String?
transferNote String?
taskNo String? @map("task_no")
+ dingtalkApprovalNo String? @map("dingtalk_approval_no")
taskStatus String? @map("task_status")
taskFetchedAt DateTime? @map("task_fetched_at")
isFullSet Boolean @default(false) @map("is_full_set")
@@ -130,6 +131,7 @@ model Material {
@@index([originalOwnerId])
@@index([transferredAt])
@@index([taskNo])
+ @@index([dingtalkApprovalNo])
@@index([taskStatus])
@@index([isFullSet])
@@index([productModel])