From 13dd73069e004adfe6045ea26ba0babff0b8c590 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Fri, 4 Sep 2026 10:28:58 +0800
Subject: [PATCH 01/16] fix: align sofia certificate print fields

---
 .../barcodePrintCertificate.test.ts           | 46 +++++++++++++++++++
 .../barcode-print/barcodePrintCertificate.ts  |  5 +-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.test.ts b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.test.ts
index 4b85070a..523d11c6 100644
--- a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.test.ts
+++ b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.test.ts
@@ -1,6 +1,52 @@
 import { __barcodePrintCertificateTestUtils } from "./barcodePrintCertificate";
 import { SOFIA_CARTON_BARCODE_QR_LAYOUT } from "./barcodePrintSofiaCartonLayout";
 
+describe("Sofia certificate field positioning", () => {
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  it("moves all six values upward by three rows without changing their data or horizontal layout", () => {
+    jest.useFakeTimers().setSystemTime(new Date("2026-09-04T12:00:00.000Z"));
+    const element = __barcodePrintCertificateTestUtils.renderSofiaCertificate(
+      {
+        barcode: "GBSFY-SJ038036N1410V01",
+        productCategory: "书架",
+        color: "经典北美黑胡桃色",
+        procode: "SFY-001",
+        brandProcode: "SFY-BRAND-001",
+        size: "100*40*180",
+        productSpec: "100*40*180",
+        hangtagMaterial: "人造板",
+        qualifiedCertMainMaterial: "人造板",
+        executionStandard: "GB/T 3324-2017",
+      },
+      "",
+      {},
+      "data:image/png;base64,background",
+    );
+    const values = Array.from(element.querySelectorAll<HTMLElement>(".item"));
+
+    expect(values.map((value) => value.style.top)).toEqual([
+      "200px",
+      "266px",
+      "332px",
+      "398px",
+      "464px",
+      "530px",
+    ]);
+    expect(values.map((value) => value.style.left)).toEqual(Array(6).fill("310px"));
+    expect(values.map((value) => value.textContent)).toEqual([
+      "书架-经典北美黑胡桃色",
+      "SFY-001",
+      "100*40*180",
+      "GB/T 3324-2017",
+      "QC01",
+      "2026-08-25",
+    ]);
+  });
+});
+
 describe("Sofia carton certificate rendering", () => {
   it("renders the current barcode QR code to the left of the fixed official-account QR code", () => {
     const qrCodeDataUrl = "data:image/png;base64,barcode-qr";
diff --git a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.ts b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.ts
index 60f24249..07e5f46b 100644
--- a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.ts
+++ b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.ts
@@ -110,6 +110,8 @@ const PORTRAIT_FIELD_TOP = 883;
 const PORTRAIT_FIELD_ROW_GAP = 68;
 const PORTRAIT_RIGHT_FIRST_ROW_TOP_OFFSET = 0;
 const PORTRAIT_VALUE_VISUAL_OFFSET = -8;
+const SOFIA_CERTIFICATE_FIELD_TOP = 200;
+const SOFIA_CERTIFICATE_FIELD_ROW_GAP = 66;
 
 function trimText(value: unknown) {
   return String(value ?? "").trim();
@@ -524,7 +526,7 @@ function renderSofiaCertificate(
       color: "#000000",
       lineHeight: "32px",
       left: "310px",
-      top: `${398 + index * 66}px`,
+      top: `${SOFIA_CERTIFICATE_FIELD_TOP + index * SOFIA_CERTIFICATE_FIELD_ROW_GAP}px`,
     });
   });
 
@@ -641,6 +643,7 @@ export const __barcodePrintCertificateTestUtils = {
   getLandscapeProductNameFontSize,
   renderCommonWithMaker,
   renderCommonWithoutMaker,
+  renderSofiaCertificate,
   renderSofiaCarton,
 };
 

From 99f004a59350812028bf280857f89f7c2f822eb2 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Fri, 4 Sep 2026 10:55:55 +0800
Subject: [PATCH 02/16] fix(finished-product-progress): enforce first-due-date
 protection on import updates

Import rows must not bypass the confirmed-first-due-date protection. Drop the allowDueDateChanges flag from the import update path so first-due-date changes are rejected and weekly due-date changes still require a reason, matching manual edits. Legacy rows without an order-placed date keep their free-correction path.
---
 .../src/server/services/finished-product-progress.service.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/furniture-3d-system/src/server/services/finished-product-progress.service.ts b/furniture-3d-system/src/server/services/finished-product-progress.service.ts
index 3fcfb5f4..780bd85a 100644
--- a/furniture-3d-system/src/server/services/finished-product-progress.service.ts
+++ b/furniture-3d-system/src/server/services/finished-product-progress.service.ts
@@ -357,7 +357,7 @@ export class FinishedProductProgressService {
         previous = await this.repository.findByLegacyOrderKey(importedValues.contractNumber, itemNumber, barcode)
       }
       const prepared = previous
-        ? prepareUpdateValues(previous, importedValues, index + 2, { allowDueDateChanges: true })
+        ? prepareUpdateValues(previous, importedValues, index + 2, { allowDueDateChanges: previous.orderPlacedDate == null })
         : { values: initializeDueDates(importedValues), orderDueDateChanged: false }
       const values = prepared.values
       const changes = changeSet(previous, values)

From d08a244fcbe45dca266946d41b961b33097e826d Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Fri, 4 Sep 2026 11:23:54 +0800
Subject: [PATCH 03/16] fix(supply-chain): default batch selection operator

---
 ...rRecommendedProductOperatorDialog.test.tsx | 21 +++++++++++++++++-
 ...pplierRecommendedProductOperatorDialog.tsx | 14 ++++++++----
 ...plier-recommended-products.service.test.ts | 22 +++++++++++++++++++
 .../supplier-recommended-products.service.ts  | 18 +++++++++------
 4 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductOperatorDialog.test.tsx b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductOperatorDialog.test.tsx
index d564a8af..2f3aeac3 100644
--- a/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductOperatorDialog.test.tsx
+++ b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductOperatorDialog.test.tsx
@@ -4,6 +4,25 @@ import { SupplierRecommendedProductOperatorDialog } from './SupplierRecommendedP
 describe('SupplierRecommendedProductOperatorDialog', () => {
   afterEach(() => jest.restoreAllMocks())
 
+  it('pins and selects the current operator even when the search result does not include them', async () => {
+    Object.defineProperty(global, 'fetch', {
+      configurable: true,
+      value: jest.fn().mockResolvedValue({
+        ok: true,
+        json: async () => ({ success: true, data: { operators: [{ id: 'operator-2', name: '运营乙', departmentName: '运营中心' }] } }),
+      } as Response),
+    })
+    const onConfirm = jest.fn()
+    render(<SupplierRecommendedProductOperatorDialog open selectedCount={2} busy={false} currentOperator={{ id: 'leader-1', name: '子龙' }} onCancel={jest.fn()} onConfirm={onConfirm} />)
+
+    expect(screen.getByRole('radio', { name: /子龙/ })).toBeChecked()
+    expect(screen.getByText('当前操作人')).toBeInTheDocument()
+    expect(await screen.findByText('运营乙')).toBeInTheDocument()
+    fireEvent.click(screen.getByRole('button', { name: '确认选款' }))
+
+    expect(onConfirm).toHaveBeenCalledWith({ id: 'leader-1', name: '子龙', departmentName: '当前操作人' })
+  })
+
   it('searches and confirms the operator for a batch selection', async () => {
     Object.defineProperty(global, 'fetch', {
       configurable: true,
@@ -13,7 +32,7 @@ describe('SupplierRecommendedProductOperatorDialog', () => {
       } as Response),
     })
     const onConfirm = jest.fn()
-    render(<SupplierRecommendedProductOperatorDialog open selectedCount={3} busy={false} onCancel={jest.fn()} onConfirm={onConfirm} />)
+    render(<SupplierRecommendedProductOperatorDialog open selectedCount={3} busy={false} currentOperator={{ id: 'operator-1', name: '运营甲' }} onCancel={jest.fn()} onConfirm={onConfirm} />)
 
     expect(await screen.findByText('运营乙')).toBeInTheDocument()
     fireEvent.click(screen.getByRole('radio', { name: /运营乙/ }))
diff --git a/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductOperatorDialog.tsx b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductOperatorDialog.tsx
index 870d0dc3..fb618e36 100644
--- a/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductOperatorDialog.tsx
+++ b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductOperatorDialog.tsx
@@ -50,7 +50,13 @@ export function SupplierRecommendedProductOperatorDialog({ open, selectedCount,
   if (!open) return null
 
   const nameOf = (operator?: { id: string; name: string }) => operator?.name || ''
-  const selectedOperator = operators.find((operator) => operator.id === selectedId)
+  const operatorOptions = currentOperator
+    ? [
+        { ...currentOperator, departmentName: '当前操作人' },
+        ...operators.filter((operator) => operator.id !== currentOperator.id),
+      ]
+    : operators
+  const selectedOperator = operatorOptions.find((operator) => operator.id === selectedId)
   return <div className="recommended-operator-overlay" role="presentation" onMouseDown={(event) => { if (event.target === event.currentTarget && !busy) onCancel() }}>
     <section className="recommended-operator-dialog" role="dialog" aria-modal="true" aria-labelledby="recommended-operator-dialog-title">
       <header className="recommended-operator-header">
@@ -67,10 +73,10 @@ export function SupplierRecommendedProductOperatorDialog({ open, selectedCount,
         <button type="submit" disabled={loading} className="recommended-control-button">{loading ? <LoaderCircle size={14} className="recommended-spin" /> : <Search size={14} />}搜索</button>
       </form>
       <div className="recommended-operator-list" aria-live="polite">
-        {loading && operators.length === 0 && <div className="recommended-operator-state"><LoaderCircle size={16} className="recommended-spin" />加载中</div>}
+        {loading && operatorOptions.length === 0 && <div className="recommended-operator-state"><LoaderCircle size={16} className="recommended-spin" />加载中</div>}
         {!loading && error && <div className="recommended-operator-state recommended-operator-state-error">{error}</div>}
-        {!loading && !error && operators.length === 0 && <div className="recommended-operator-state">没有匹配的运营人员</div>}
-        {operators.map((operator) => <label key={operator.id} className={`recommended-operator-option${selectedId === operator.id ? ' recommended-operator-option-selected' : ''}`}>
+        {!loading && !error && operatorOptions.length === 0 && <div className="recommended-operator-state">没有匹配的运营人员</div>}
+        {operatorOptions.map((operator) => <label key={operator.id} className={`recommended-operator-option${selectedId === operator.id ? ' recommended-operator-option-selected' : ''}`}>
           <input type="radio" name="recommended-operator" value={operator.id} checked={selectedId === operator.id} onChange={() => setSelectedId(operator.id)} />
           <span className="recommended-operator-option-copy"><strong>{operator.name}</strong><small>{operator.departmentName || '未填写部门'}</small></span>
           {selectedId === operator.id && <Check size={16} aria-hidden="true" />}
diff --git a/furniture-3d-system/src/server/services/__tests__/supplier-recommended-products.service.test.ts b/furniture-3d-system/src/server/services/__tests__/supplier-recommended-products.service.test.ts
index 188e164d..3189f6ec 100644
--- a/furniture-3d-system/src/server/services/__tests__/supplier-recommended-products.service.test.ts
+++ b/furniture-3d-system/src/server/services/__tests__/supplier-recommended-products.service.test.ts
@@ -218,6 +218,28 @@ describe('SupplierRecommendedProductsService', () => {
     expect(updateSelection).toHaveBeenCalledWith(['recommended-1', 'recommended-2'], true, operatorUser, { id: 'operator-2', name: '运营乙' })
   })
 
+  it('allows the current administrator to assign the selection to themselves', async () => {
+    const updateSelection = jest.fn().mockResolvedValue({ foundCount: 1, updatedCount: 1 })
+    const repository = { updateSelection } as unknown as SupplierRecommendedProductsRepository
+    const service = new SupplierRecommendedProductsService(repository)
+    const administrator = { id: 'admin-1', name: '子龙', role: 'ADMIN' as const, businessRoles: [] }
+
+    await expect(service.updateSelection({ ids: ['recommended-1'], action: 'select', selectedOperatorId: 'admin-1' }, administrator)).resolves.toEqual({
+      action: 'select', requestedCount: 1, updatedCount: 1,
+    })
+    expect(mockGetUserById).not.toHaveBeenCalled()
+    expect(updateSelection).toHaveBeenCalledWith(['recommended-1'], true, administrator, { id: 'admin-1', name: '子龙' })
+  })
+
+  it('still rejects another active account that is not an operator', async () => {
+    const repository = { updateSelection: jest.fn() } as unknown as SupplierRecommendedProductsRepository
+    const service = new SupplierRecommendedProductsService(repository)
+    const administrator = { id: 'admin-1', name: '子龙', role: 'ADMIN' as const, businessRoles: [] }
+    mockGetUserById.mockResolvedValue({ id: 'user-2', name: '普通员工', status: 'ACTIVE', businessRoles: [] })
+
+    await expect(service.updateSelection({ ids: ['recommended-1'], action: 'select', selectedOperatorId: 'user-2' }, administrator)).rejects.toThrow('请选择有效的运营人员')
+  })
+
   it('rejects selection when no operator is confirmed', async () => {
     const repository = { updateSelection: jest.fn() } as unknown as SupplierRecommendedProductsRepository
     const service = new SupplierRecommendedProductsService(repository)
diff --git a/furniture-3d-system/src/server/services/supplier-recommended-products.service.ts b/furniture-3d-system/src/server/services/supplier-recommended-products.service.ts
index 4a8b0de3..c44d34ec 100644
--- a/furniture-3d-system/src/server/services/supplier-recommended-products.service.ts
+++ b/furniture-3d-system/src/server/services/supplier-recommended-products.service.ts
@@ -207,14 +207,18 @@ export class SupplierRecommendedProductsService {
     if (action === 'select') {
       const selectedOperatorId = typeof inputRecord.selectedOperatorId === 'string' ? inputRecord.selectedOperatorId.trim() : ''
       if (!selectedOperatorId) throw new AppError(ErrorCode.VALIDATION_REQUIRED_FIELD, '请选择对应的运营人员')
-      try {
-        const operator = await userService.getById(selectedOperatorId)
-        if (operator.status !== 'ACTIVE' || !operator.businessRoles.includes('OPERATIONS')) {
-          throw new Error('invalid operator')
+      if (selectedOperatorId === user.id) {
+        selectedOperator = { id: user.id, name: user.name }
+      } else {
+        try {
+          const operator = await userService.getById(selectedOperatorId)
+          if (operator.status !== 'ACTIVE' || !operator.businessRoles.includes('OPERATIONS')) {
+            throw new Error('invalid operator')
+          }
+          selectedOperator = { id: operator.id, name: operator.name }
+        } catch {
+          throw new AppError(ErrorCode.VALIDATION_FAILED, '请选择有效的运营人员')
         }
-        selectedOperator = { id: operator.id, name: operator.name }
-      } catch {
-        throw new AppError(ErrorCode.VALIDATION_FAILED, '请选择有效的运营人员')
       }
     }
     const result = await this.repository.updateSelection(ids, action === 'select', user, selectedOperator)

From 3df9bf08b11abec5fbd622741fcc1826ff768021 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Fri, 4 Sep 2026 11:25:31 +0800
Subject: [PATCH 04/16] fix(supply-chain): show feedback as timed toast

---
 .../SupplierRecommendedProductsClient.tsx     | 10 ++--
 ...upplierRecommendedProductFeedback.test.tsx | 51 +++++++++++++++++++
 .../SupplierRecommendedProductFeedback.tsx    | 40 +++++++++++++++
 .../supplier-recommended-products.css         |  4 +-
 4 files changed, 97 insertions(+), 8 deletions(-)
 create mode 100644 furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductFeedback.test.tsx
 create mode 100644 furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductFeedback.tsx

diff --git a/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/SupplierRecommendedProductsClient.tsx b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/SupplierRecommendedProductsClient.tsx
index 41af5f03..6cdf3699 100644
--- a/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/SupplierRecommendedProductsClient.tsx
+++ b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/SupplierRecommendedProductsClient.tsx
@@ -9,6 +9,7 @@ import { SupplierRecommendedProductCardGrid } from './components/SupplierRecomme
 import { SupplierRecommendedProductDeleteDialog } from './components/SupplierRecommendedProductDeleteDialog'
 import { SupplierRecommendedProductDetailDialog } from './components/SupplierRecommendedProductDetailDialog'
 import { SupplierRecommendedProductEditor } from './components/SupplierRecommendedProductEditor'
+import { SupplierRecommendedProductFeedback, type SupplierRecommendedProductFeedbackMessage } from './components/SupplierRecommendedProductFeedback'
 import { SupplierRecommendedProductHistoryDialog } from './components/SupplierRecommendedProductHistoryDialog'
 import { SupplierRecommendedProductImportProgress } from './components/SupplierRecommendedProductImportProgress'
 import { SupplierRecommendedProductPagination } from './components/SupplierRecommendedProductPagination'
@@ -25,7 +26,6 @@ type DeleteRequest =
   | { mode: 'single'; row: SupplierRecommendedProductRow }
   | { mode: 'batch'; ids: string[] }
 
-type Feedback = { tone: 'success' | 'error' | 'info'; message: string }
 type ViewMode = 'table' | 'cards'
 const VIEW_MODE_STORAGE_KEY = 'supply-chain:supplier-recommended-products:view-mode'
 
@@ -44,7 +44,7 @@ export function SupplierRecommendedProductsClient({ initialData, canEdit, canDow
   const [preview, setPreview] = useState<SupplierRecommendedProductRow | null>(null)
   const [detail, setDetail] = useState<SupplierRecommendedProductRow | null>(null)
   const [viewMode, setViewMode] = useState<ViewMode>('table')
-  const [feedback, setFeedback] = useState<Feedback | null>(null)
+  const [feedback, setFeedback] = useState<SupplierRecommendedProductFeedbackMessage | null>(null)
   const [deleteRequest, setDeleteRequest] = useState<DeleteRequest | null>(null)
   const [loading, setLoading] = useState(false)
   const [deletingId, setDeletingId] = useState<string | null>(null)
@@ -56,6 +56,7 @@ export function SupplierRecommendedProductsClient({ initialData, canEdit, canDow
   const [pageInput, setPageInput] = useState(String(initialData.pageInfo.page))
   const fileRef = useRef<HTMLInputElement>(null)
   const columns = useSupplierRecommendedProductColumns()
+  const dismissFeedback = useCallback(() => setFeedback(null), [])
 
   /* Browser-only preferences hydrate after SSR to keep the initial render stable. */
   useEffect(() => {
@@ -232,10 +233,7 @@ export function SupplierRecommendedProductsClient({ initialData, canEdit, canDow
         {canDownload && filters.selection === 'selected' && <button type="button" disabled={exportingSelected || loading} onClick={() => void exportSelected()} className="recommended-control-button"><FileDown size={15} />{exportingSelected ? '导出中…' : '导出'}</button>}
       </div>
     </header>
-    {feedback && <div role="status" aria-live="polite" className={`recommended-feedback recommended-feedback-${feedback.tone}`}>
-      <span>{feedback.message}</span>
-      <button type="button" title="关闭提示" aria-label="关闭提示" onClick={() => setFeedback(null)}><X size={14} /></button>
-    </div>}
+    <SupplierRecommendedProductFeedback feedback={feedback} onDismiss={dismissFeedback} />
     <form className="recommended-products-filters" onSubmit={(event) => { event.preventDefault(); void load(filters, 1, data.pageInfo.pageSize) }}>
       <input value={filters.search} onChange={(event) => setFilters({ ...filters, search: event.target.value })} placeholder="搜索供应商、采购、产品代码、材质或发货模式" />
       <SupplierRecommendedProductMultiSelect label="类目" options={data.options.categories} values={filters.category} onChange={(category) => setFilters({ ...filters, category })} />
diff --git a/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductFeedback.test.tsx b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductFeedback.test.tsx
new file mode 100644
index 00000000..0b323245
--- /dev/null
+++ b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductFeedback.test.tsx
@@ -0,0 +1,51 @@
+import { act, fireEvent, render, screen } from '@testing-library/react'
+import { useState } from 'react'
+import { SupplierRecommendedProductFeedback, type SupplierRecommendedProductFeedbackMessage } from './SupplierRecommendedProductFeedback'
+
+function FeedbackHarness({ initialFeedback }: { initialFeedback: SupplierRecommendedProductFeedbackMessage }) {
+  const [feedback, setFeedback] = useState<SupplierRecommendedProductFeedbackMessage | null>(initialFeedback)
+  return <SupplierRecommendedProductFeedback feedback={feedback} onDismiss={() => setFeedback(null)} />
+}
+
+describe('SupplierRecommendedProductFeedback', () => {
+  afterEach(() => {
+    jest.useRealTimers()
+  })
+
+  it('在右下角提示显示满 5 秒后自动关闭', () => {
+    jest.useFakeTimers()
+    render(<FeedbackHarness initialFeedback={{ tone: 'success', message: '已选款2条' }} />)
+
+    expect(screen.getByRole('status')).toHaveClass('recommended-feedback-success')
+    expect(screen.getByText('已选款2条')).toBeInTheDocument()
+
+    act(() => jest.advanceTimersByTime(4_999))
+    expect(screen.getByRole('status')).toBeInTheDocument()
+
+    act(() => jest.advanceTimersByTime(1))
+    expect(screen.queryByRole('status')).not.toBeInTheDocument()
+  })
+
+  it('支持手动关闭提示', () => {
+    render(<FeedbackHarness initialFeedback={{ tone: 'error', message: '操作失败' }} />)
+
+    fireEvent.click(screen.getByRole('button', { name: '关闭提示' }))
+
+    expect(screen.queryByRole('status')).not.toBeInTheDocument()
+  })
+
+  it('收到新提示时重新计算 5 秒显示时间', () => {
+    jest.useFakeTimers()
+    const onDismiss = jest.fn()
+    const firstFeedback = { tone: 'info', message: '请先勾选记录' } as const
+    const { rerender } = render(<SupplierRecommendedProductFeedback feedback={firstFeedback} onDismiss={onDismiss} />)
+
+    act(() => jest.advanceTimersByTime(4_000))
+    rerender(<SupplierRecommendedProductFeedback feedback={{ ...firstFeedback }} onDismiss={onDismiss} />)
+    act(() => jest.advanceTimersByTime(4_000))
+    expect(onDismiss).not.toHaveBeenCalled()
+
+    act(() => jest.advanceTimersByTime(1_000))
+    expect(onDismiss).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductFeedback.tsx b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductFeedback.tsx
new file mode 100644
index 00000000..97568d81
--- /dev/null
+++ b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductFeedback.tsx
@@ -0,0 +1,40 @@
+'use client'
+
+import { CircleAlert, CircleCheck, Info, X } from 'lucide-react'
+import { useEffect } from 'react'
+
+export type SupplierRecommendedProductFeedbackMessage = {
+  tone: 'success' | 'error' | 'info'
+  message: string
+}
+
+const FEEDBACK_DURATION_MS = 5_000
+
+export function SupplierRecommendedProductFeedback({
+  feedback,
+  onDismiss,
+}: {
+  feedback: SupplierRecommendedProductFeedbackMessage | null
+  onDismiss: () => void
+}) {
+  useEffect(() => {
+    if (!feedback) return
+
+    const timeoutId = window.setTimeout(onDismiss, FEEDBACK_DURATION_MS)
+    return () => window.clearTimeout(timeoutId)
+  }, [feedback, onDismiss])
+
+  if (!feedback) return null
+
+  const StatusIcon = feedback.tone === 'success'
+    ? CircleCheck
+    : feedback.tone === 'error'
+      ? CircleAlert
+      : Info
+
+  return <div role="status" aria-live="polite" className={`recommended-feedback recommended-feedback-${feedback.tone}`}>
+    <StatusIcon className="recommended-feedback-icon" size={17} aria-hidden="true" />
+    <span className="recommended-feedback-message">{feedback.message}</span>
+    <button type="button" title="关闭提示" aria-label="关闭提示" onClick={onDismiss}><X size={15} /></button>
+  </div>
+}
diff --git a/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/supplier-recommended-products.css b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/supplier-recommended-products.css
index d8772c49..8017bda6 100644
--- a/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/supplier-recommended-products.css
+++ b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/supplier-recommended-products.css
@@ -1,6 +1,6 @@
   .recommended-products-page{height:100%;min-height:0;display:flex;flex-direction:column;overflow:hidden;background:#f5f6f6;color:#27272a}
   .recommended-products-toolbar{display:flex;flex-wrap:wrap;align-items:center;justify-content:space-between;gap:16px;padding:18px 24px;border-bottom:1px solid #e4e4e7;background:#fff}
-  .recommended-feedback{display:flex;align-items:center;justify-content:space-between;gap:12px;margin:10px 24px 0;border:1px solid;border-radius:5px;padding:9px 12px;font-size:12px}.recommended-feedback button{display:inline-flex;height:22px;width:22px;align-items:center;justify-content:center;border:0;border-radius:4px;background:transparent;color:inherit;cursor:pointer}.recommended-feedback button:hover{background:rgba(24,24,27,.08)}.recommended-feedback-success{border-color:#b7dec8;background:#f0faf4;color:#166534}.recommended-feedback-error{border-color:#efc0ba;background:#fff5f4;color:#b42318}.recommended-feedback-info{border-color:#c6d4e5;background:#f4f8fc;color:#28527a}
+  .recommended-feedback{position:fixed;right:24px;bottom:24px;z-index:110;display:flex;width:min(360px,calc(100vw - 32px));box-sizing:border-box;align-items:flex-start;gap:10px;border:1px solid;border-radius:7px;padding:11px 12px;font-size:12px;line-height:1.5;box-shadow:0 14px 36px rgba(24,24,27,.16);animation:recommended-feedback-in .18s ease-out}.recommended-feedback-icon{margin-top:1px;flex:0 0 auto}.recommended-feedback-message{min-width:0;flex:1;overflow-wrap:anywhere}.recommended-feedback button{display:inline-flex;height:22px;width:22px;flex:0 0 auto;align-items:center;justify-content:center;border:0;border-radius:4px;background:transparent;color:inherit;cursor:pointer}.recommended-feedback button:hover{background:rgba(24,24,27,.08)}.recommended-feedback-success{border-color:#b7dec8;background:#f0faf4;color:#166534}.recommended-feedback-error{border-color:#efc0ba;background:#fff5f4;color:#b42318}.recommended-feedback-info{border-color:#c6d4e5;background:#f4f8fc;color:#28527a}@keyframes recommended-feedback-in{from{opacity:0;transform:translateY(8px)}to{opacity:1;transform:translateY(0)}}
   .recommended-products-toolbar h1{margin:0;font-size:18px;font-weight:750}.recommended-products-toolbar p{margin:4px 0 0;color:#71717a;font-size:12px}.recommended-products-actions{display:flex;flex-wrap:wrap;align-items:center;justify-content:flex-end;gap:8px}.recommended-view-switch{display:inline-flex;height:38px;align-items:stretch;border:1px solid #d4d4d8;border-radius:5px;background:#fff;overflow:hidden}.recommended-view-switch button{display:inline-flex;align-items:center;gap:5px;border:0;border-right:1px solid #e4e4e7;background:#fff;padding:0 10px;color:#71717a;font-size:12px;font-weight:600;cursor:pointer}.recommended-view-switch button:last-child{border-right:0}.recommended-view-switch button:hover{background:#f4f4f5;color:#3f3f46}.recommended-view-switch button.recommended-view-switch-active{background:#27272a;color:#fff}
   .recommended-selection-switch{display:inline-flex;height:38px;align-items:stretch;border:1px solid #d4d4d8;border-radius:5px;background:#fff;overflow:hidden}.recommended-selection-switch button{border:0;border-right:1px solid #e4e4e7;background:#fff;padding:0 11px;color:#71717a;font-size:12px;font-weight:650;cursor:pointer}.recommended-selection-switch button:last-child{border-right:0}.recommended-selection-switch button:hover{background:#f4f4f5;color:#3f3f46}.recommended-selection-switch button.recommended-selection-switch-active{background:#27272a;color:#fff}
   .recommended-control-button,.recommended-primary-button,.recommended-secondary-button,.recommended-page-button,.recommended-row-button,.recommended-icon-button{display:inline-flex;align-items:center;justify-content:center;gap:6px;border:1px solid #d4d4d8;border-radius:5px;background:#fff;color:#3f3f46;font-size:12px;font-weight:600;cursor:pointer;transition:background .15s,border-color .15s,color .15s}.recommended-control-button,.recommended-primary-button,.recommended-secondary-button{height:38px;padding:0 13px}.recommended-primary-button{border-color:#27272a;background:#27272a;color:#fff}.recommended-primary-button:hover{background:#18181b}.recommended-secondary-button:hover,.recommended-control-button:hover,.recommended-row-button:hover,.recommended-page-button:hover{background:#f4f4f5;border-color:#a1a1aa}.recommended-control-button:disabled,.recommended-primary-button:disabled,.recommended-secondary-button:disabled,.recommended-row-button:disabled,.recommended-page-button:disabled{cursor:not-allowed;opacity:.45}.recommended-icon-button{width:30px;height:30px;padding:0;border:0;background:transparent}.recommended-icon-button:hover{background:#f4f4f5}.recommended-row-button{height:29px;padding:0 8px;font-size:11px}.recommended-page-button{height:30px;padding:0 12px}.recommended-danger-button{color:#b42318;border-color:#f2c5c0}.recommended-danger-button:hover{background:#fff1f0;border-color:#d92d20;color:#b42318}
@@ -14,4 +14,4 @@
   .recommended-selection-person-button{display:inline-flex;height:30px;max-width:132px;align-items:center;gap:4px;overflow:hidden;border:1px solid #d4d4d8;border-radius:5px;background:#fff;padding:0 7px;color:#52525b;font-size:11px;cursor:pointer}.recommended-selection-person-button:hover{border-color:#a1a1aa;background:#f4f4f5;color:#27272a}.recommended-selection-person-button svg{flex:0 0 auto}.recommended-selection-person-button{white-space:nowrap;text-overflow:ellipsis}.recommended-product-card-selection-person{overflow:hidden;color:#71717a;font-size:11px;font-weight:650;text-overflow:ellipsis;white-space:nowrap}
   .recommended-operator-overlay{position:fixed;inset:0;z-index:100;display:flex;align-items:center;justify-content:center;background:rgba(24,24,27,.3);padding:16px}.recommended-operator-dialog{display:flex;width:min(520px,100%);max-height:min(82vh,680px);flex-direction:column;overflow:hidden;border:1px solid #e4e4e7;border-radius:9px;background:#f8f9f8;box-shadow:0 24px 70px rgba(24,24,27,.2)}.recommended-operator-header{display:flex;align-items:flex-start;justify-content:space-between;border-bottom:1px solid #e4e4e7;background:#fff;padding:20px 22px 16px}.recommended-operator-eyebrow{color:#a1a1aa;font-size:11px;font-weight:650}.recommended-operator-header h2{margin:3px 0 0;color:#27272a;font-size:19px;font-weight:750}.recommended-operator-header p{margin:5px 0 0;color:#71717a;font-size:12px}.recommended-operator-search{display:flex;align-items:center;gap:8px;border-bottom:1px solid #e4e4e7;background:#fff;padding:14px 22px}.recommended-operator-search>input{min-width:0;flex:1;height:36px;border:1px solid #d4d4d8;border-radius:5px;padding:0 10px;color:#27272a;font-size:12px;outline:none}.recommended-operator-search>input:focus{border-color:#71717a;box-shadow:0 0 0 2px rgba(82,82,91,.08)}.recommended-operator-search .recommended-control-button{height:36px;padding:0 11px}.recommended-operator-list{min-height:180px;flex:1;overflow-y:auto;padding:10px 14px}.recommended-operator-option{display:flex;align-items:center;gap:10px;margin:2px 0;border:1px solid transparent;border-radius:6px;background:#fff;padding:11px 12px;color:#3f3f46;cursor:pointer}.recommended-operator-option:hover,.recommended-operator-option-selected{border-color:#d4d4d8;background:#fff;box-shadow:0 2px 8px rgba(24,24,27,.06)}.recommended-operator-option input{height:16px;width:16px;accent-color:#27272a}.recommended-operator-option-copy{display:flex;min-width:0;flex:1;flex-direction:column;gap:3px}.recommended-operator-option-copy strong{font-size:13px}.recommended-operator-option-copy small{color:#71717a;font-size:11px}.recommended-operator-state{display:flex;align-items:center;justify-content:center;gap:7px;min-height:180px;color:#71717a;font-size:12px}.recommended-operator-state-error{color:#b42318}.recommended-operator-footer{display:flex;justify-content:flex-end;gap:8px;border-top:1px solid #e4e4e7;background:#fff;padding:14px 22px}.recommended-operator-footer .recommended-primary-button,.recommended-operator-footer .recommended-secondary-button{height:36px}
   .recommended-delete-overlay{position:fixed;inset:0;z-index:100;display:flex;width:100vw;min-height:100dvh;align-items:center;justify-content:center;background:rgba(24,24,27,.28);padding:16px;box-sizing:border-box}.recommended-delete-dialog{width:min(440px,100%);box-sizing:border-box;border:1px solid #e4e4e7;border-radius:8px;background:#fff;box-shadow:0 20px 50px rgba(24,24,27,.2)}.recommended-delete-dialog-header{display:flex;align-items:flex-start;gap:11px;padding:20px 20px 14px}.recommended-delete-dialog-header h2{margin:0;color:#27272a;font-size:15px;font-weight:700}.recommended-delete-dialog-header p{margin:6px 0 0;color:#71717a;font-size:12px;line-height:1.6}.recommended-delete-dialog-icon{display:flex;height:30px;width:30px;flex:0 0 auto;align-items:center;justify-content:center;border-radius:50%;background:#fff1f0;color:#b42318}.recommended-delete-dialog-header .recommended-column-close{margin-left:auto;flex:0 0 auto}.recommended-delete-dialog-actions{display:flex;justify-content:flex-end;gap:8px;border-top:1px solid #f4f4f5;padding:14px 20px}.recommended-delete-dialog-actions .recommended-primary-button{border-color:#b42318;background:#b42318}.recommended-delete-dialog-actions .recommended-primary-button:hover{border-color:#912018;background:#912018}.recommended-spin{animation:recommended-spin .9s linear infinite}@keyframes recommended-spin{to{transform:rotate(360deg)}}
-  @media(max-width:1280px){.recommended-products-filters{grid-template-columns:repeat(4,minmax(140px,1fr))}.recommended-products-filters>input:first-child{grid-column:span 2}}@media(max-width:760px){.recommended-products-toolbar{align-items:flex-start;padding:14px}.recommended-products-actions{justify-content:flex-start}.recommended-products-filters{grid-template-columns:1fr 1fr;padding:10px 14px}.recommended-products-filters>input:first-child{grid-column:1/-1}.recommended-products-table-shell{margin:10px 0 10px 10px}.recommended-products-table-shell>div:first-child{padding-bottom:72px}.recommended-products-card-grid{padding:12px}.recommended-product-card-list{grid-template-columns:1fr}.recommended-product-card-image{height:220px}.recommended-detail-overlay{padding:0}.recommended-detail-dialog{max-height:100dvh;border-radius:0}.recommended-detail-header,.recommended-detail-content,.recommended-detail-footer{padding-left:14px;padding-right:14px}.recommended-detail-grid{grid-template-columns:1fr}.recommended-page-button{padding:0 7px}.recommended-products-toolbar p{display:none}}
+  @media(max-width:1280px){.recommended-products-filters{grid-template-columns:repeat(4,minmax(140px,1fr))}.recommended-products-filters>input:first-child{grid-column:span 2}}@media(max-width:760px){.recommended-products-toolbar{align-items:flex-start;padding:14px}.recommended-products-actions{justify-content:flex-start}.recommended-products-filters{grid-template-columns:1fr 1fr;padding:10px 14px}.recommended-products-filters>input:first-child{grid-column:1/-1}.recommended-products-table-shell{margin:10px 0 10px 10px}.recommended-products-table-shell>div:first-child{padding-bottom:72px}.recommended-products-card-grid{padding:12px}.recommended-product-card-list{grid-template-columns:1fr}.recommended-product-card-image{height:220px}.recommended-detail-overlay{padding:0}.recommended-detail-dialog{max-height:100dvh;border-radius:0}.recommended-detail-header,.recommended-detail-content,.recommended-detail-footer{padding-left:14px;padding-right:14px}.recommended-detail-grid{grid-template-columns:1fr}.recommended-page-button{padding:0 7px}.recommended-products-toolbar p{display:none}.recommended-feedback{right:14px;bottom:calc(76px + env(safe-area-inset-bottom));width:calc(100vw - 28px)}}

From bbb35a44f32e0d14db6a6dd7a047ab803f1376ca Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Fri, 4 Sep 2026 12:25:32 +0800
Subject: [PATCH 05/16] fix(barcode-print): tune Sofia certificate field
 positions

---
 .../barcode-print/barcodePrintCertificate.test.ts  | 14 +++++++-------
 .../barcode-print/barcodePrintCertificate.ts       |  5 ++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.test.ts b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.test.ts
index 523d11c6..674919cd 100644
--- a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.test.ts
+++ b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.test.ts
@@ -6,7 +6,7 @@ describe("Sofia certificate field positioning", () => {
     jest.useRealTimers();
   });
 
-  it("moves all six values upward by three rows without changing their data or horizontal layout", () => {
+  it("uses the warehouse second-pass vertical positions without changing data or horizontal layout", () => {
     jest.useFakeTimers().setSystemTime(new Date("2026-09-04T12:00:00.000Z"));
     const element = __barcodePrintCertificateTestUtils.renderSofiaCertificate(
       {
@@ -28,12 +28,12 @@ describe("Sofia certificate field positioning", () => {
     const values = Array.from(element.querySelectorAll<HTMLElement>(".item"));
 
     expect(values.map((value) => value.style.top)).toEqual([
-      "200px",
-      "266px",
-      "332px",
-      "398px",
-      "464px",
-      "530px",
+      "260px",
+      "340px",
+      "380px",
+      "420px",
+      "460px",
+      "525px",
     ]);
     expect(values.map((value) => value.style.left)).toEqual(Array(6).fill("310px"));
     expect(values.map((value) => value.textContent)).toEqual([
diff --git a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.ts b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.ts
index 07e5f46b..fd4cef7b 100644
--- a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.ts
+++ b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.ts
@@ -110,8 +110,7 @@ const PORTRAIT_FIELD_TOP = 883;
 const PORTRAIT_FIELD_ROW_GAP = 68;
 const PORTRAIT_RIGHT_FIRST_ROW_TOP_OFFSET = 0;
 const PORTRAIT_VALUE_VISUAL_OFFSET = -8;
-const SOFIA_CERTIFICATE_FIELD_TOP = 200;
-const SOFIA_CERTIFICATE_FIELD_ROW_GAP = 66;
+const SOFIA_CERTIFICATE_FIELD_TOPS = [260, 340, 380, 420, 460, 525] as const;
 
 function trimText(value: unknown) {
   return String(value ?? "").trim();
@@ -526,7 +525,7 @@ function renderSofiaCertificate(
       color: "#000000",
       lineHeight: "32px",
       left: "310px",
-      top: `${SOFIA_CERTIFICATE_FIELD_TOP + index * SOFIA_CERTIFICATE_FIELD_ROW_GAP}px`,
+      top: `${SOFIA_CERTIFICATE_FIELD_TOPS[index]}px`,
     });
   });
 

From d32988dde6b5802e114f86410a77c01bc6fe23ae Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Fri, 4 Sep 2026 15:26:23 +0800
Subject: [PATCH 06/16] fix(barcode-print): normalize Sofia certificate row
 spacing

---
 .../barcodePrintCertificate.test.ts           | 23 ++++---
 .../barcode-print/barcodePrintCertificate.ts  | 13 ++--
 .../barcode-print/barcodePrintLodop.test.ts   | 65 ++++++++++++++++++-
 .../intake/barcode-print/barcodePrintLodop.ts | 12 +++-
 .../barcodePrintSofiaCertificateLayout.ts     | 23 +++++++
 5 files changed, 119 insertions(+), 17 deletions(-)
 create mode 100644 furniture-3d-system/src/app/intake/barcode-print/barcodePrintSofiaCertificateLayout.ts

diff --git a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.test.ts b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.test.ts
index 674919cd..b91986b7 100644
--- a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.test.ts
+++ b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.test.ts
@@ -1,12 +1,16 @@
 import { __barcodePrintCertificateTestUtils } from "./barcodePrintCertificate";
 import { SOFIA_CARTON_BARCODE_QR_LAYOUT } from "./barcodePrintSofiaCartonLayout";
+import {
+  SOFIA_CERTIFICATE_FIELD_LINE_TOPS,
+  SOFIA_CERTIFICATE_FIELD_TOPS,
+} from "./barcodePrintSofiaCertificateLayout";
 
 describe("Sofia certificate field positioning", () => {
   afterEach(() => {
     jest.useRealTimers();
   });
 
-  it("uses the warehouse second-pass vertical positions without changing data or horizontal layout", () => {
+  it("uses the pre-printed line positions without changing data or horizontal layout", () => {
     jest.useFakeTimers().setSystemTime(new Date("2026-09-04T12:00:00.000Z"));
     const element = __barcodePrintCertificateTestUtils.renderSofiaCertificate(
       {
@@ -27,14 +31,15 @@ describe("Sofia certificate field positioning", () => {
     );
     const values = Array.from(element.querySelectorAll<HTMLElement>(".item"));
 
-    expect(values.map((value) => value.style.top)).toEqual([
-      "260px",
-      "340px",
-      "380px",
-      "420px",
-      "460px",
-      "525px",
-    ]);
+    expect(values.map((value) => value.style.top)).toEqual(
+      SOFIA_CERTIFICATE_FIELD_TOPS.map((top) => `${top}px`),
+    );
+    expect(SOFIA_CERTIFICATE_FIELD_LINE_TOPS).toEqual([260, 313, 366, 419, 472, 525]);
+    expect(
+      SOFIA_CERTIFICATE_FIELD_LINE_TOPS.slice(1).map(
+        (top, index) => top - SOFIA_CERTIFICATE_FIELD_LINE_TOPS[index],
+      ),
+    ).toEqual(Array(5).fill(53));
     expect(values.map((value) => value.style.left)).toEqual(Array(6).fill("310px"));
     expect(values.map((value) => value.textContent)).toEqual([
       "书架-经典北美黑胡桃色",
diff --git a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.ts b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.ts
index fd4cef7b..1a676988 100644
--- a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.ts
+++ b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.ts
@@ -16,6 +16,12 @@ import {
   SOFIA_CARTON_CANVAS,
   SOFIA_CARTON_LINE_ART_LAYOUT,
 } from "./barcodePrintSofiaCartonLayout";
+import {
+  SOFIA_CERTIFICATE_FIELD_FONT_SIZE,
+  SOFIA_CERTIFICATE_FIELD_LEFT,
+  SOFIA_CERTIFICATE_FIELD_LINE_HEIGHT,
+  SOFIA_CERTIFICATE_FIELD_TOPS,
+} from "./barcodePrintSofiaCertificateLayout";
 import type { BarcodePrintRow } from "./barcodePrintRows";
 
 type CertificateTemplate = {
@@ -110,7 +116,6 @@ const PORTRAIT_FIELD_TOP = 883;
 const PORTRAIT_FIELD_ROW_GAP = 68;
 const PORTRAIT_RIGHT_FIRST_ROW_TOP_OFFSET = 0;
 const PORTRAIT_VALUE_VISUAL_OFFSET = -8;
-const SOFIA_CERTIFICATE_FIELD_TOPS = [260, 340, 380, 420, 460, 525] as const;
 
 function trimText(value: unknown) {
   return String(value ?? "").trim();
@@ -521,10 +526,10 @@ function renderSofiaCertificate(
   ].forEach((text, index) => {
     appendItem(container, `item_${index + 1} item`, text, {
       position: "absolute",
-      fontSize: "26px",
+      fontSize: `${SOFIA_CERTIFICATE_FIELD_FONT_SIZE}px`,
       color: "#000000",
-      lineHeight: "32px",
-      left: "310px",
+      lineHeight: `${SOFIA_CERTIFICATE_FIELD_LINE_HEIGHT}px`,
+      left: `${SOFIA_CERTIFICATE_FIELD_LEFT}px`,
       top: `${SOFIA_CERTIFICATE_FIELD_TOPS[index]}px`,
     });
   });
diff --git a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintLodop.test.ts b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintLodop.test.ts
index 0e38cf58..ba87ec58 100644
--- a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintLodop.test.ts
+++ b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintLodop.test.ts
@@ -1,5 +1,10 @@
 import type { BarcodePrintRow } from "./barcodePrintRows";
-import { __barcodePrintTestUtils, printBarcodeRow } from "./barcodePrintLodop";
+import {
+  __barcodePrintTestUtils,
+  printBarcodeRow,
+} from "./barcodePrintLodop";
+import { printCertificateRow } from "./barcodePrintLodop";
+import { SOFIA_CERTIFICATE_FIELD_TOPS } from "./barcodePrintSofiaCertificateLayout";
 
 describe("splitBarcodeParts", () => {
   it("splits second-template barcodes at N suffix blocks", () => {
@@ -164,3 +169,61 @@ describe("second barcode template", () => {
     ]);
   });
 });
+
+describe("Sofia certificate template", () => {
+  it("uses the same pre-printed line positions as the browser preview", async () => {
+    jest.useFakeTimers().setSystemTime(new Date("2026-09-04T12:00:00.000Z"));
+    const lodop = {
+      PRINT_INIT: jest.fn(),
+      SET_PRINT_PAGESIZE: jest.fn(),
+      NEWPAGE: jest.fn(),
+      ADD_PRINT_BARCODE: jest.fn(),
+      ADD_PRINT_TEXT: jest.fn(),
+      ADD_PRINT_IMAGE: jest.fn(),
+      SET_PRINT_STYLEA: jest.fn(),
+      PREVIEW: jest.fn(),
+    };
+    const originalGetCLodop = window.getCLodop;
+    window.getCLodop = () => lodop as never;
+
+    const row = {
+      barcode: "MKHDNZ04092607000240",
+      skuCode: "MKHDNZ04092607000240",
+      brandSkuCode: "",
+      factoryModel: "",
+      productCategory: "电脑桌",
+      color: "经典北美黑胡桃色++黑架",
+      size: "100/76/75",
+      specification: "100/76/75",
+      tagMaterial: "",
+      material: "",
+      executeStandard: "T/CZFA 0002-2025",
+      supplierName: "索菲亚",
+    } as BarcodePrintRow;
+
+    try {
+      await printCertificateRow(row, "索菲亚合格证卡片（7.4cm*10cm）");
+    } finally {
+      window.getCLodop = originalGetCLodop;
+      jest.useRealTimers();
+    }
+
+    const values = [
+      "电脑桌-经典北美黑胡桃色++黑架",
+      "MKHDNZ04092607000240",
+      "100*76*75",
+      "T/CZFA 0002-2025",
+      "QC01",
+      "2026-08-25",
+    ];
+    const textCalls = lodop.ADD_PRINT_TEXT.mock.calls.filter((call) => values.includes(call[4]));
+
+    expect(textCalls).toHaveLength(values.length);
+    expect(textCalls.map((call) => call[0])).toEqual(
+      SOFIA_CERTIFICATE_FIELD_TOPS.map((top) => `${(top / 1181) * 100}mm`),
+    );
+    expect(textCalls.map((call) => call[1])).toEqual(
+      SOFIA_CERTIFICATE_FIELD_TOPS.map(() => `${(310 / 874) * 74}mm`),
+    );
+  });
+});
diff --git a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintLodop.ts b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintLodop.ts
index b8e20026..18aac025 100644
--- a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintLodop.ts
+++ b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintLodop.ts
@@ -3,6 +3,12 @@
 import { pinyin } from "pinyin-pro";
 import type { BarcodePrintRow } from "./barcodePrintRows";
 import { splitGujiaBarcodeParts } from "./barcodePrintGujia";
+import {
+  SOFIA_CERTIFICATE_FIELD_FONT_SIZE,
+  SOFIA_CERTIFICATE_FIELD_LEFT,
+  SOFIA_CERTIFICATE_FIELD_LINE_HEIGHT,
+  SOFIA_CERTIFICATE_FIELD_TOPS,
+} from "./barcodePrintSofiaCertificateLayout";
 
 type LodopValue = string | number;
 
@@ -721,9 +727,9 @@ function getCertificateCanvasTexts(
   if (template.layout === "sofiaCertificate") {
     return [productLabel, record.skuCode, specification, standard, "QC01", last10Day].map(
       (text, index) =>
-        createCertificateText(text, 310, 398 + index * 66, {
-          fontSize: 26,
-          lineHeight: 32,
+        createCertificateText(text, SOFIA_CERTIFICATE_FIELD_LEFT, SOFIA_CERTIFICATE_FIELD_TOPS[index], {
+          fontSize: SOFIA_CERTIFICATE_FIELD_FONT_SIZE,
+          lineHeight: SOFIA_CERTIFICATE_FIELD_LINE_HEIGHT,
         }),
     );
   }
diff --git a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintSofiaCertificateLayout.ts b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintSofiaCertificateLayout.ts
new file mode 100644
index 00000000..2460771b
--- /dev/null
+++ b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintSofiaCertificateLayout.ts
@@ -0,0 +1,23 @@
+/**
+ * Coordinates for the dynamic values printed over the pre-printed Sofia
+ * certificate card. These are canvas pixels on the 874 × 1181 template.
+ *
+ * Keep this as the single source of truth for both the browser preview and
+ * the Lodop print path; otherwise a print can silently fall back to a stale
+ * set of coordinates even when the preview looks correct.
+ */
+export const SOFIA_CERTIFICATE_FIELD_LEFT = 310 as const;
+export const SOFIA_CERTIFICATE_FIELD_FONT_SIZE = 26 as const;
+export const SOFIA_CERTIFICATE_FIELD_LINE_HEIGHT = 32 as const;
+
+/** The y-coordinate of each pre-printed underline in canvas pixels. */
+export const SOFIA_CERTIFICATE_FIELD_LINE_TOPS = [260, 313, 366, 419, 472, 525] as const;
+
+/**
+ * Dynamic values sit above the underline. The line-height is the text box
+ * height, so placing its bottom edge at the underline keeps the glyphs clear
+ * of the pre-printed stroke.
+ */
+export const SOFIA_CERTIFICATE_FIELD_TOPS = SOFIA_CERTIFICATE_FIELD_LINE_TOPS.map(
+  (lineTop) => lineTop - SOFIA_CERTIFICATE_FIELD_LINE_HEIGHT,
+);

From 4843e161243a114a954dab6595f85108e1b8f506 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Fri, 4 Sep 2026 16:14:51 +0800
Subject: [PATCH 07/16] feat(sample-progress): add daily due-date reminder
 notifications

---
 .../sample-progress/reminders/run/route.ts    |  29 ++
 .../sample-progress/reminders/test/route.ts   |  20 +
 .../sample-progress-reminder.service.test.ts  | 181 ++++++++
 .../sample-progress-reminder.service.ts       | 419 ++++++++++++++++++
 4 files changed, 649 insertions(+)
 create mode 100644 furniture-3d-system/src/app/api/intake/sample-progress/reminders/run/route.ts
 create mode 100644 furniture-3d-system/src/app/api/intake/sample-progress/reminders/test/route.ts
 create mode 100644 furniture-3d-system/src/server/services/__tests__/sample-progress-reminder.service.test.ts
 create mode 100644 furniture-3d-system/src/server/services/sample-progress-reminder.service.ts

diff --git a/furniture-3d-system/src/app/api/intake/sample-progress/reminders/run/route.ts b/furniture-3d-system/src/app/api/intake/sample-progress/reminders/run/route.ts
new file mode 100644
index 00000000..49750984
--- /dev/null
+++ b/furniture-3d-system/src/app/api/intake/sample-progress/reminders/run/route.ts
@@ -0,0 +1,29 @@
+import { NextRequest } from 'next/server'
+import { handleRequest, jsonError, jsonSuccess } from '@/server/core/response'
+import { ErrorCode } from '@/server/core/errors'
+import { SampleProgressReminderService } from '@/server/services/sample-progress-reminder.service'
+
+async function runScan() {
+  const service = new SampleProgressReminderService()
+  const result = await service.scanAndNotify()
+  return jsonSuccess(result, 200)
+}
+
+// 定时进程：携带 worker 密钥触发；管理员（徐霞客）：会话触发
+export async function POST(request: NextRequest) {
+  const expectedSecret = process.env.BOM_COSTING_WORKER_SECRET || ''
+  const providedSecret = request.headers.get('x-worker-secret') || ''
+  if (expectedSecret && providedSecret === expectedSecret) {
+    return runScan()
+  }
+  return handleRequest(
+    request,
+    async (ctx) => {
+      if (ctx.user?.name !== '徐霞客') {
+        return jsonError(ErrorCode.AUTH_PERMISSION_DENIED, '仅徐霞客可手动触发扫描', 403, ctx.requestId)
+      }
+      return runScan()
+    },
+    { requireAuth: true },
+  )
+}
diff --git a/furniture-3d-system/src/app/api/intake/sample-progress/reminders/test/route.ts b/furniture-3d-system/src/app/api/intake/sample-progress/reminders/test/route.ts
new file mode 100644
index 00000000..acdf0011
--- /dev/null
+++ b/furniture-3d-system/src/app/api/intake/sample-progress/reminders/test/route.ts
@@ -0,0 +1,20 @@
+import { NextRequest } from 'next/server'
+import { handleRequest, jsonError, jsonSuccess } from '@/server/core/response'
+import { ErrorCode } from '@/server/core/errors'
+import { SampleProgressReminderService } from '@/server/services/sample-progress-reminder.service'
+
+// 测试入口：把「未填交期 / 3天内到期 / 已超期」三种提醒的测试消息发给徐霞客
+export async function POST(request: NextRequest) {
+  return handleRequest(
+    request,
+    async (ctx) => {
+      if (ctx.user?.name !== '徐霞客') {
+        return jsonError(ErrorCode.AUTH_PERMISSION_DENIED, '仅徐霞客可触发测试消息', 403, ctx.requestId)
+      }
+      const service = new SampleProgressReminderService()
+      const results = await service.sendTestNotifications('徐霞客')
+      return jsonSuccess(results, 200, ctx.requestId)
+    },
+    { requireAuth: true },
+  )
+}
diff --git a/furniture-3d-system/src/server/services/__tests__/sample-progress-reminder.service.test.ts b/furniture-3d-system/src/server/services/__tests__/sample-progress-reminder.service.test.ts
new file mode 100644
index 00000000..55f0882b
--- /dev/null
+++ b/furniture-3d-system/src/server/services/__tests__/sample-progress-reminder.service.test.ts
@@ -0,0 +1,181 @@
+import { SampleProgressReminderService, type SampleProgressReminderDeps, type SampleProgressItemRow } from '@/server/services/sample-progress-reminder.service'
+
+type SentRecord = { key: string; recipientUserId: string; title: string; content: string }
+
+const FIXED_NOW = new Date('2026-09-04T05:30:00Z') // 北京时间 13:30
+
+function supplierRow(overrides: Partial<SampleProgressItemRow['suppliers'][number]>): SampleProgressItemRow['suppliers'][number] {
+  return {
+    id: 'sup-1',
+    supplier: '测试供应商',
+    sampleDueDate: null,
+    status: 'BARE_WOOD',
+    ...overrides,
+  }
+}
+
+function itemRow(suppliers: SampleProgressItemRow['suppliers'], overrides: Partial<SampleProgressItemRow> = {}): SampleProgressItemRow {
+  return {
+    id: 'item-1',
+    openingCode: 'KA-001',
+    flowStatus: '进行中',
+    status: 'BARE_WOOD',
+    merchandiserOwner: '徐霞客',
+    suppliers,
+    createdAt: new Date('2026-09-01T00:00:00Z'),
+    ...overrides,
+  }
+}
+
+function baseDeps() {
+  const sent: SentRecord[] = []
+  const undeliverable: string[] = []
+  const items: SampleProgressItemRow[] = []
+  const users = [
+    { id: 'user-xu', name: '徐霞客', status: 'ACTIVE', dingtalkUserId: 'ding-xu', email: null, businessRoles: [] },
+  ]
+  const deps: SampleProgressReminderDeps = {
+    listItems: async () => items,
+    findUsersByNames: async (names) => names.map((name) => users.find((u) => u.name === name) || {
+      id: 'user-' + name,
+      name,
+      status: 'INACTIVE',
+      dingtalkUserId: null,
+      email: '',
+      businessRoles: [],
+    }),
+    sendToEmployee: async (input) => {
+      sent.push({ key: input.idempotencyKey, recipientUserId: input.recipientUserId, title: input.title, content: input.content })
+      return { id: 'delivery-' + sent.length }
+    },
+    recordUndeliverable: async (input) => {
+      undeliverable.push(input.recipient.name)
+      return null
+    },
+  }
+  return {
+    deps,
+    items,
+    sent,
+    undeliverable,
+    addItem: (row: SampleProgressItemRow) => { items.push(row) },
+  }
+}
+
+function serviceWith(deps: ReturnType<typeof baseDeps>['deps'], now = FIXED_NOW) {
+  return new SampleProgressReminderService(deps, () => now)
+}
+
+describe('SampleProgressReminderService', () => {
+  it('为三类场景分别发送提醒：未填交期 / 3天内到期 / 已超期', async () => {
+    const env = baseDeps()
+    env.addItem(itemRow([supplierRow({ id: 'sup-missing', sampleDueDate: null })]))
+    env.addItem(itemRow([supplierRow({ id: 'sup-soon', sampleDueDate: new Date('2026-09-06T00:00:00Z') })])) // 距 9/4 还有 2 天
+    env.addItem(itemRow([supplierRow({ id: 'sup-overdue', sampleDueDate: new Date('2026-08-25T00:00:00Z') })])) // 已超期
+    const service = serviceWith(env.deps)
+
+    const result = await service.scanAndNotify()
+
+    expect(result.missingCount).toBe(1)
+    expect(result.dueSoonCount).toBe(1)
+    expect(result.overdueCount).toBe(1)
+    expect(env.sent).toHaveLength(3)
+    const titles = env.sent.map((s) => s.title)
+    expect(titles.some((t) => t.startsWith('打样进度未填写：KA-001'))).toBe(true)
+    expect(titles.some((t) => t.startsWith('打样任务即将到期：KA-001'))).toBe(true)
+    expect(titles.some((t) => t.startsWith('打样任务已超期：KA-001'))).toBe(true)
+    // 幂等键按 类别+供应商+交期日期 稳定生成
+    expect(env.sent.every((s) => s.key.startsWith('sample-progress-reminder:'))).toBe(true)
+  })
+
+  it('消息正文按模板逐行渲染（字段清单 + 尾行动词）', async () => {
+    const env = baseDeps()
+    env.addItem(itemRow([supplierRow({ id: 'sup-soon', supplier: '贝格迪派', sampleDueDate: new Date('2026-09-05T00:00:00Z') })])) // 明天到期
+    const service = serviceWith(env.deps)
+
+    await service.scanAndNotify()
+
+    expect(env.sent).toHaveLength(1)
+    expect(env.sent[0].title).toBe('打样任务即将到期：KA-001')
+    expect(env.sent[0].content).toBe([
+      '监控对象：打样进度明细',
+      '开款编号：KA-001',
+      '工厂：贝格迪派',
+      '异常级别：预警',
+      '提醒时间：2026年9月4日 13:30',
+      '任务负责人：徐霞客',
+      '当前进度：白茬',
+      '目标完成日：2026-09-05',
+      '任务将在明天（2026-09-05）到期，请及时完成或更新实际排期。',
+    ].join('\n\n'))
+  })
+
+  it('超期消息带真实超期天数，未填交期场景按未填写口径渲染', async () => {
+    const env = baseDeps()
+    env.addItem(itemRow([supplierRow({ id: 'sup-overdue', sampleDueDate: new Date('2026-08-25T00:00:00Z') })]))
+    env.addItem(itemRow([supplierRow({ id: 'sup-missing', sampleDueDate: null })]))
+    const service = serviceWith(env.deps)
+
+    await service.scanAndNotify()
+
+    const overdue = env.sent.find((s) => s.title.startsWith('打样任务已超期'))
+    expect(overdue?.content).toContain('异常级别：超期')
+    expect(overdue?.content).toContain('目标完成日：2026-08-25')
+    expect(overdue?.content).toContain('任务已在（2026-08-25）到期，已超期 10 天，请及时跟进并填写超期原因。')
+    const missing = env.sent.find((s) => s.title.startsWith('打样进度未填写'))
+    expect(missing?.content).toContain('异常级别：未填写打样进度')
+    expect(missing?.content).toContain('当前进度：未填写打样进度')
+    expect(missing?.content).toContain('目标完成日：未填写打样进度')
+    expect(missing?.content).toContain('尚未填写打样交期，请及时在打样进度明细中补充。')
+  })
+
+  it('多条超期按打样单分开发送，互不合并', async () => {
+    const env = baseDeps()
+    env.addItem(itemRow([supplierRow({ id: 'sup-a', sampleDueDate: new Date('2026-08-25T00:00:00Z') })]))
+    env.addItem(itemRow([supplierRow({ id: 'sup-b', sampleDueDate: new Date('2026-08-20T00:00:00Z') })], { openingCode: 'KA-002', id: 'item-2' }))
+    const service = serviceWith(env.deps)
+
+    const result = await service.scanAndNotify()
+
+    expect(result.overdueCount).toBe(2)
+    const overdueMessages = env.sent.filter((s) => s.title.startsWith('打样任务已超期'))
+    expect(overdueMessages).toHaveLength(2)
+    expect(overdueMessages.map((s) => s.title)).toEqual(['打样任务已超期：KA-001', '打样任务已超期：KA-002'])
+    expect(new Set(overdueMessages.map((s) => s.key)).size).toBe(2)
+  })
+
+  it('已完成与已终止的供应商不产生提醒', async () => {
+    const env = baseDeps()
+    env.addItem(itemRow([
+      supplierRow({ id: 'sup-done', sampleDueDate: new Date('2026-08-20T00:00:00Z'), status: 'COMPLETED' }),
+      supplierRow({ id: 'sup-term', sampleDueDate: null, status: 'TERMINATED' }),
+    ]))
+    const service = serviceWith(env.deps)
+
+    const result = await service.scanAndNotify()
+
+    expect(result.results).toHaveLength(0)
+  })
+
+  it('重复扫描同一天时幂等键稳定（由通知中心去重）', async () => {
+    const env = baseDeps()
+    env.addItem(itemRow([supplierRow({ id: 'sup-overdue', sampleDueDate: new Date('2026-08-25T00:00:00Z') })]))
+    const service = serviceWith(env.deps)
+
+    await service.scanAndNotify()
+    const firstKeys = env.sent.map((s) => s.key)
+    await service.scanAndNotify()
+    const secondKeys = env.sent.slice(firstKeys.length).map((s) => s.key)
+
+    expect(secondKeys).toEqual(firstKeys)
+  })
+
+  it('已拒绝的打样单不产生提醒', async () => {
+    const env = baseDeps()
+    env.addItem(itemRow([supplierRow({ id: 'sup-x', sampleDueDate: new Date('2026-08-20T00:00:00Z') })], { flowStatus: '已拒绝' }))
+    const service = serviceWith(env.deps)
+
+    const result = await service.scanAndNotify()
+    expect(result.results).toHaveLength(0)
+  })
+})
diff --git a/furniture-3d-system/src/server/services/sample-progress-reminder.service.ts b/furniture-3d-system/src/server/services/sample-progress-reminder.service.ts
new file mode 100644
index 00000000..8d0ea456
--- /dev/null
+++ b/furniture-3d-system/src/server/services/sample-progress-reminder.service.ts
@@ -0,0 +1,419 @@
+import { sampleProgressRepository } from '@/server/repositories/sample-progress.repository'
+import { storeAccountNotificationRepository } from '@/server/repositories/store-account-notification.repository'
+import { SAMPLE_PROGRESS_STATUS_LABELS } from '@/lib/sample-progress'
+import {
+  notificationDeliveryService,
+  NotificationDeliveryError,
+} from './notification-delivery.service'
+
+export type SampleProgressReminderCategory = 'missing-due-date' | 'due-soon' | 'overdue'
+
+export type SampleProgressSupplierRow = {
+  id: string
+  supplier: string
+  sampleDueDate: Date | string | null
+  status: string
+}
+
+export type SampleProgressItemRow = {
+  id: string
+  openingCode: string
+  flowStatus: string
+  status: string
+  merchandiserOwner: string | null
+  suppliers?: SampleProgressSupplierRow[]
+  createdAt: Date
+}
+
+export type SampleProgressSystemUser = {
+  id: string
+  name: string
+  status?: string
+  dingtalkUserId?: string | null
+  email?: string | null
+  businessRoles?: unknown[]
+}
+
+export type SampleProgressReminderDeps = {
+  listItems(): Promise<SampleProgressItemRow[]>
+  findUsersByNames(names: string[]): Promise<SampleProgressSystemUser[]>
+  sendToEmployee(input: {
+    idempotencyKey: string
+    businessEvent: string
+    businessRecordId?: string
+    source: 'USER' | 'SYSTEM'
+    recipientUserId: string
+    title: string
+    content: string
+    retryExisting: boolean
+  }): Promise<{ id: string }>
+  recordUndeliverable(input: {
+    idempotencyKey: string
+    businessEvent: string
+    businessRecordId?: string
+    source: 'USER' | 'SYSTEM'
+    recipient: {
+      id: string
+      name: string
+      email: string
+      status: string
+      businessRoles: unknown[]
+      dingtalkUserId: string
+    }
+    title: string
+    content: string
+    errorCode: string
+    errorMessage: string
+  }): Promise<unknown>
+}
+
+export type SampleProgressReminderTarget = {
+  supplierId: string
+  itemId: string
+  openingCode: string
+  supplierName: string
+  merchandiserOwner: string | null
+  sampleDueDate: string | null
+  daysOverdue: number | null
+  daysUntilDue: number | null
+  category: SampleProgressReminderCategory
+  statusLabel: string
+}
+
+export type SampleProgressReminderResult = {
+  category: SampleProgressReminderCategory
+  recipientName: string
+  recipientUserId: string | null
+  status: 'sent' | 'failed' | 'undeliverable'
+  errorCode: string | null
+  errorMessage: string | null
+  idempotencyKey: string
+}
+
+const DAY_MS = 86_400_000
+const EXCLUDED_SUPPLIER_STATUSES = new Set(['COMPLETED', 'TERMINATED'])
+const EXCLUDED_FLOW_STATUSES = new Set(['已终止', '已拒绝'])
+
+function toDateOnly(value: Date | string | null | undefined) {
+  if (!value) return null
+  const date = value instanceof Date ? value : new Date(value)
+  return Number.isNaN(date.getTime()) ? null : date.toISOString().slice(0, 10)
+}
+
+function daysBetween(fromIso: string, toIso: string) {
+  return Math.round(
+    (new Date(`${toIso}T00:00:00Z`).getTime() - new Date(`${fromIso}T00:00:00Z`).getTime()) / DAY_MS,
+  )
+}
+
+const REMINDER_LEVEL_LABELS: Record<SampleProgressReminderCategory, string> = {
+  'missing-due-date': '未填写打样进度',
+  'due-soon': '预警',
+  overdue: '超期',
+}
+
+function formatRemindAt(date: Date) {
+  const hh = String(date.getHours()).padStart(2, '0')
+  const mm = String(date.getMinutes()).padStart(2, '0')
+  return `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日 ${hh}:${mm}`
+}
+
+function describeReminder(input: {
+  category: SampleProgressReminderCategory
+  openingCode: string
+  supplierName: string
+  ownerName: string
+  statusLabel: string
+  dueDate: string | null
+  days: number | null
+  remindAt: Date
+}) {
+  const level = REMINDER_LEVEL_LABELS[input.category]
+  const title =
+    input.category === 'missing-due-date'
+      ? `打样进度未填写：${input.openingCode}`
+      : input.category === 'due-soon'
+        ? `打样任务即将到期：${input.openingCode}`
+        : `打样任务已超期：${input.openingCode}`
+  const currentProgress = input.category === 'missing-due-date' ? '未填写打样进度' : input.statusLabel
+  const targetDate = input.category === 'missing-due-date' ? '未填写打样进度' : input.dueDate
+  let trailing: string
+  if (input.category === 'missing-due-date') {
+    trailing = '尚未填写打样交期，请及时在打样进度明细中补充。'
+  } else if (input.category === 'due-soon') {
+    const relative = input.days === 0 ? '今天' : input.days === 1 ? '明天' : `${input.days ?? 0} 天后`
+    trailing = `任务将在${relative}（${input.dueDate}）到期，请及时完成或更新实际排期。`
+  } else {
+    trailing = `任务已在（${input.dueDate}）到期，已超期 ${Math.abs(input.days ?? 0)} 天，请及时跟进并填写超期原因。`
+  }
+  const content = [
+    '监控对象：打样进度明细',
+    `开款编号：${input.openingCode}`,
+    `工厂：${input.supplierName}`,
+    `异常级别：${level}`,
+    `提醒时间：${formatRemindAt(input.remindAt)}`,
+    `任务负责人：${input.ownerName || '未填写'}`,
+    `当前进度：${currentProgress}`,
+    `目标完成日：${targetDate}`,
+    trailing,
+  ].join('\n\n')
+  return { title, content }
+}
+
+function statusLabelOf(status: string | null | undefined) {
+  if (!status) return '未填写'
+  return SAMPLE_PROGRESS_STATUS_LABELS[status as keyof typeof SAMPLE_PROGRESS_STATUS_LABELS] || status
+}
+
+function buildIdempotencyKey(
+  category: SampleProgressReminderCategory,
+  supplierId: string,
+  dueDate: string | null,
+  today: string,
+) {
+  if (category === 'missing-due-date') return `sample-progress-reminder:missing:${supplierId}`
+  if (category === 'due-soon') return `sample-progress-reminder:due-soon:${supplierId}:${dueDate}`
+  return `sample-progress-reminder:overdue:${supplierId}:${today}`
+}
+
+export class SampleProgressReminderService {
+  constructor(
+    private readonly deps: SampleProgressReminderDeps = {
+      listItems: () => sampleProgressRepository.list(),
+      findUsersByNames: (names) => storeAccountNotificationRepository.findUsersByNames(names),
+      sendToEmployee: (input) => notificationDeliveryService.sendToEmployee(input),
+      recordUndeliverable: (input) => notificationDeliveryService.recordUndeliverable(input),
+    },
+    private readonly now: () => Date = () => new Date(),
+  ) {}
+
+  async scanAndNotify(): Promise<{
+    missingCount: number
+    dueSoonCount: number
+    overdueCount: number
+    results: SampleProgressReminderResult[]
+  }> {
+    const now = this.now()
+    const today = now.toISOString().slice(0, 10)
+    const items = await this.deps.listItems()
+    const targets: SampleProgressReminderTarget[] = []
+
+    for (const item of items) {
+      if (EXCLUDED_FLOW_STATUSES.has(item.flowStatus || '')) continue
+      for (const supplier of item.suppliers ?? []) {
+        if (EXCLUDED_SUPPLIER_STATUSES.has(supplier.status || '')) continue
+        const dueDate = toDateOnly(supplier.sampleDueDate)
+        let category: SampleProgressReminderCategory | null = null
+        let daysUntilDue: number | null = null
+        let daysOverdue: number | null = null
+        if (!dueDate) {
+          category = 'missing-due-date'
+        } else {
+          const diff = daysBetween(today, dueDate)
+          if (diff < 0) {
+            category = 'overdue'
+            daysOverdue = Math.abs(diff)
+          } else if (diff <= 3) {
+            category = 'due-soon'
+            daysUntilDue = diff
+          }
+        }
+        if (!category) continue
+        targets.push({
+          supplierId: supplier.id,
+          itemId: item.id,
+          openingCode: item.openingCode,
+          supplierName: supplier.supplier || '(未填写供应商)',
+          merchandiserOwner: item.merchandiserOwner || null,
+          sampleDueDate: dueDate,
+          daysOverdue,
+          daysUntilDue,
+          category,
+          statusLabel: statusLabelOf(supplier.status),
+        })
+      }
+    }
+
+    const userCache = new Map<string, SampleProgressSystemUser | null>()
+    const results: SampleProgressReminderResult[] = []
+    for (const target of targets) {
+      const ownerName = target.merchandiserOwner || ''
+      let user = userCache.get(ownerName) ?? null
+      if (!userCache.has(ownerName)) {
+        const users = await this.deps.findUsersByNames([ownerName].filter(Boolean))
+        user = users[0] ?? null
+        userCache.set(ownerName, user)
+      }
+      const { title, content } = describeReminder({
+        category: target.category,
+        openingCode: target.openingCode,
+        supplierName: target.supplierName,
+        ownerName: target.merchandiserOwner || '',
+        statusLabel: target.statusLabel,
+        dueDate: target.sampleDueDate,
+        days: target.category === 'due-soon' ? target.daysUntilDue : target.daysOverdue,
+        remindAt: now,
+      })
+      const idempotencyKey = buildIdempotencyKey(
+        target.category,
+        target.supplierId,
+        target.sampleDueDate,
+        today,
+      )
+      if (!user) {
+        try {
+          await this.deps.recordUndeliverable({
+        idempotencyKey: buildIdempotencyKey(target.category, target.supplierId, target.sampleDueDate, today),
+            businessEvent: 'sample_progress_reminder',
+            businessRecordId: target.supplierId,
+            source: 'SYSTEM',
+            recipient: {
+              id: ownerName || target.supplierId,
+              name: ownerName || '未分配跟单负责人',
+              email: '',
+              status: 'INACTIVE',
+              businessRoles: [],
+              dingtalkUserId: '',
+            },
+            title,
+            content,
+            errorCode: 'RECIPIENT_NOT_FOUND',
+            errorMessage: `按跟单负责人姓名 ${ownerName || '(未填写)'} 未匹配到系统用户`,
+          })
+          results.push({
+            category: target.category,
+            recipientName: ownerName || '(未填写)',
+            recipientUserId: null,
+            status: 'undeliverable',
+            errorCode: 'RECIPIENT_NOT_FOUND',
+            errorMessage: '未匹配到系统用户',
+            idempotencyKey,
+          })
+        } catch (error) {
+          results.push({
+            category: target.category,
+            recipientName: ownerName || '(未填写)',
+            recipientUserId: null,
+            status: 'failed',
+            errorCode: 'RECORD_UNDELIVERABLE_FAILED',
+            errorMessage: error instanceof Error ? error.message : String(error),
+            idempotencyKey,
+          })
+        }
+        continue
+      }
+      try {
+        await this.deps.sendToEmployee({
+          idempotencyKey,
+          businessEvent: 'sample_progress_reminder',
+          businessRecordId: target.supplierId,
+          source: 'SYSTEM',
+          recipientUserId: user.id,
+          title,
+          content,
+          retryExisting: false,
+        })
+        results.push({
+          category: target.category,
+          recipientName: user.name,
+          recipientUserId: user.id,
+          status: 'sent',
+          errorCode: null,
+          errorMessage: null,
+          idempotencyKey,
+        })
+      } catch (error) {
+        const deliveryError = error as NotificationDeliveryError
+        results.push({
+          category: target.category,
+          recipientName: user.name,
+          recipientUserId: user.id,
+          status: 'failed',
+          errorCode: deliveryError.code || 'SEND_FAILED',
+          errorMessage: deliveryError.message,
+          idempotencyKey,
+        })
+      }
+    }
+
+    return {
+      missingCount: targets.filter(t => t.category === 'missing-due-date').length,
+      dueSoonCount: targets.filter(t => t.category === 'due-soon').length,
+      overdueCount: targets.filter(t => t.category === 'overdue').length,
+      results,
+    }
+  }
+
+  /** 测试入口：未填交期 / 预警 / 超期×2（模拟多条超期分开发）全部发给指定用户（如 徐霞客）。 */
+  async sendTestNotifications(recipientName: string): Promise<SampleProgressReminderResult[]> {
+    const now = this.now()
+    const users = await this.deps.findUsersByNames([recipientName])
+    const recipient = users[0] || null
+    if (!recipient) throw new NotificationDeliveryError(`未找到系统用户：${recipientName}`, 'RECIPIENT_NOT_FOUND')
+
+    const dueSoonDate = new Date(now.getTime() + 1 * DAY_MS).toISOString().slice(0, 10)
+    const overdueDate = new Date(now.getTime() - 3 * DAY_MS).toISOString().slice(0, 10)
+    const overdueDate2 = new Date(now.getTime() - 5 * DAY_MS).toISOString().slice(0, 10)
+    const demos: Array<{
+      category: SampleProgressReminderCategory
+      openingCode: string
+      supplier: string
+      statusLabel: string
+      dueDate: string | null
+      days: number | null
+    }> = [
+      { category: 'missing-due-date', openingCode: 'XP2026062500000226', supplier: '贝格迪派', statusLabel: '未填写打样进度', dueDate: null, days: null },
+      { category: 'due-soon', openingCode: 'XP2026062500000226', supplier: '贝格迪派', statusLabel: '白茬', dueDate: dueSoonDate, days: 1 },
+      { category: 'overdue', openingCode: 'XP2026062500000226', supplier: '贝格迪派', statusLabel: '白茬', dueDate: overdueDate, days: 3 },
+      { category: 'overdue', openingCode: 'XP2026061200000142', supplier: '瑞敏家居', statusLabel: '油漆', dueDate: overdueDate2, days: 5 },
+    ]
+
+    const results: SampleProgressReminderResult[] = []
+    for (const [index, demo] of demos.entries()) {
+      const { title, content } = describeReminder({
+        category: demo.category,
+        openingCode: demo.openingCode,
+        supplierName: demo.supplier,
+        ownerName: recipientName,
+        statusLabel: demo.statusLabel,
+        dueDate: demo.dueDate,
+        days: demo.days,
+        remindAt: now,
+      })
+      const idempotencyKey = `sample-progress-reminder-test:${demo.category}:${index}:${now.getTime()}`
+      try {
+        await this.deps.sendToEmployee({
+          idempotencyKey,
+          businessEvent: 'sample_progress_reminder_test',
+          businessRecordId: undefined,
+          source: 'SYSTEM',
+          recipientUserId: recipient.id,
+          title: `（测试）${title}`,
+          content,
+          retryExisting: false,
+        })
+        results.push({
+          category: demo.category,
+          recipientName: recipientName,
+          recipientUserId: recipient.id,
+          status: 'sent',
+          errorCode: null,
+          errorMessage: null,
+          idempotencyKey,
+        })
+      } catch (error) {
+        const deliveryError = error as NotificationDeliveryError
+        results.push({
+          category: demo.category,
+          recipientName: recipientName,
+          recipientUserId: recipient.id,
+          status: 'failed',
+          errorCode: deliveryError.code || 'SEND_FAILED',
+          errorMessage: deliveryError.message,
+          idempotencyKey,
+        })
+      }
+    }
+    return results
+  }
+}

From f4712cd1a286a657eab75db25eba54d06051b5b6 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Fri, 4 Sep 2026 17:39:35 +0800
Subject: [PATCH 08/16] feat(intake): validate sku import skuCode spu prefix

standard sku workbook import now rejects rows whose skuCode does not start with the product spu in uppercase (lowercase codes are reported as needing uppercase); rows with an empty skuCode still pass and get auto-generated on save; the whole import is rejected with per-row line numbers and reasons. barcodes are skipped since they derive from the sku code.
---
 .../basic-info/useSkuWorkbookController.ts    | 16 ++++-
 .../src/lib/non-integrated-sku-export.test.ts | 59 +++++++++++++++++++
 .../src/lib/non-integrated-sku-export.ts      | 30 +++++++++-
 3 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/basic-info/useSkuWorkbookController.ts b/furniture-3d-system/src/app/intake/non-integrated/workspaces/basic-info/useSkuWorkbookController.ts
index ddaaf4b3..322bcb79 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/basic-info/useSkuWorkbookController.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/basic-info/useSkuWorkbookController.ts
@@ -4,7 +4,10 @@ import {
   type SetStateAction,
 } from "react";
 
-import { parseNonIntegratedSkuWorkbook } from "@/lib/non-integrated-sku-export";
+import {
+  findSkuImportSpuPrefixErrors,
+  parseNonIntegratedSkuWorkbook,
+} from "@/lib/non-integrated-sku-export";
 
 import type { NonIntegratedSkuItem } from "../../nonIntegratedStorage";
 import type {
@@ -154,6 +157,17 @@ export function useSkuWorkbookController({
       if (rows.length === 0) {
         throw new Error("上传资料中没有可导入的 SKU 行");
       }
+      if (mode === "standard") {
+        const spuPrefixErrors = findSkuImportSpuPrefixErrors(
+          rows,
+          formValues.spu,
+        );
+        if (spuPrefixErrors.length > 0) {
+          throw new Error(
+            `导入已取消：货号/条码必须以 ${formValues.spu} 开头。${spuPrefixErrors.join(" ")}`,
+          );
+        }
+      }
       if (mode === "fuzzy") {
         const supplierErrors = getFuzzyImportSupplierErrors(
           rows,
diff --git a/furniture-3d-system/src/lib/non-integrated-sku-export.test.ts b/furniture-3d-system/src/lib/non-integrated-sku-export.test.ts
index 5ae6f039..70444eb2 100644
--- a/furniture-3d-system/src/lib/non-integrated-sku-export.test.ts
+++ b/furniture-3d-system/src/lib/non-integrated-sku-export.test.ts
@@ -1,6 +1,7 @@
 import * as XLSX from "xlsx";
 
 import {
+  findSkuImportSpuPrefixErrors,
   NON_INTEGRATED_SKU_TEMPLATE_COLUMNS,
   parseNonIntegratedSkuWorkbook,
 } from "@/lib/non-integrated-sku-export";
@@ -109,3 +110,61 @@ describe("parseNonIntegratedSkuWorkbook", () => {
     );
   });
 });
+
+describe("findSkuImportSpuPrefixErrors", () => {
+  it("rejects non-empty sku codes that miss the spu prefix", () => {
+    const errors = findSkuImportSpuPrefixErrors(
+      [
+        {
+          skuCode: "LRSF009601",
+          barcode: "LRSF009601V01",
+          rowNumber: 2,
+        },
+      ],
+      "LRSF0095",
+    );
+
+    expect(errors).toEqual([
+      "第2行：货号「LRSF009601」未以 LRSF0095 开头",
+    ]);
+  });
+
+  it("ignores barcodes entirely since they are auto-derived from the sku code", () => {
+    const errors = findSkuImportSpuPrefixErrors(
+      [{ skuCode: "LRSF009501", barcode: "WHATEVER-BARCODE", rowNumber: 2 }],
+      "LRSF0095",
+    );
+
+    expect(errors).toEqual([]);
+  });
+
+  it("requires uppercase and rejects lowercase sku codes", () => {
+    const errors = findSkuImportSpuPrefixErrors(
+      [{ skuCode: "lrsf009501", barcode: "LRSF009501V01", rowNumber: 2 }],
+      "LRSF0095",
+    );
+
+    expect(errors).toEqual(["第2行：货号「lrsf009501」需为大写"]);
+  });
+
+  it("skips validation when the spu is empty", () => {
+    const errors = findSkuImportSpuPrefixErrors(
+      [{ skuCode: "ANY", barcode: "ANY01", rowNumber: 2 }],
+      "",
+    );
+
+    expect(errors).toEqual([]);
+  });
+
+  it("falls back to positional row labels when rowNumber is missing", () => {
+    const errors = findSkuImportSpuPrefixErrors(
+      [
+        { skuCode: "", barcode: "" },
+        { skuCode: "OTHER01", barcode: "" },
+      ],
+      "LRSF0095",
+    );
+
+    expect(errors).toEqual(["第3行：货号「OTHER01」未以 LRSF0095 开头"]);
+  });
+});
diff --git a/furniture-3d-system/src/lib/non-integrated-sku-export.ts b/furniture-3d-system/src/lib/non-integrated-sku-export.ts
index 67f72316..1361955e 100644
--- a/furniture-3d-system/src/lib/non-integrated-sku-export.ts
+++ b/furniture-3d-system/src/lib/non-integrated-sku-export.ts
@@ -24,6 +24,33 @@ export type NonIntegratedSkuExportRow = {
   batchNo: string
   batchChangeType: string
   dingTalkFlowNo: string
+  rowNumber?: number
+}
+
+export function findSkuImportSpuPrefixErrors(
+  rows: ReadonlyArray<
+    Pick<NonIntegratedSkuExportRow, 'skuCode'> & { rowNumber?: number }
+  >,
+  spu: string,
+) {
+  const normalizedSpu = spu.trim().toUpperCase()
+  if (!normalizedSpu) return []
+
+  const errors: string[] = []
+  rows.forEach((row, index) => {
+    const rowLabel = row.rowNumber ?? index + 2
+    const skuCode = row.skuCode.trim()
+    if (!skuCode || skuCode.startsWith(normalizedSpu)) return
+
+    if (skuCode.toUpperCase().startsWith(normalizedSpu)) {
+      errors.push(`第${rowLabel}行：货号「${skuCode}」需为大写`)
+    } else {
+      errors.push(
+        `第${rowLabel}行：货号「${skuCode}」未以 ${normalizedSpu} 开头`,
+      )
+    }
+  })
+  return errors
 }
 
 export type NonIntegratedSkuFuzzyImportRow = {
@@ -340,7 +367,7 @@ export async function parseNonIntegratedSkuWorkbook(
   if (missingLabels.length === 0) {
     const rows = sheetRows
       .slice(headerRowIndex + 1)
-      .map((row) => {
+      .map((row, index) => {
         const importRow = createEmptyImportRow()
         for (const column of NON_INTEGRATED_SKU_TEMPLATE_COLUMNS) {
           const cellIndex = headerIndexByLabel.get(column.label)
@@ -349,6 +376,7 @@ export async function parseNonIntegratedSkuWorkbook(
               ? ''
               : normalizeWorkbookCellValue(row[cellIndex])
         }
+        importRow.rowNumber = headerRowIndex + index + 2
         return importRow
       })
       .filter((row) =>

From 4f6510271f9440bce460d633156642d357d40881 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Fri, 4 Sep 2026 17:49:31 +0800
Subject: [PATCH 09/16] fix(intake): replace unsafe cast in sku export empty
 row builder

adding the optional rowNumber field to NonIntegratedSkuExportRow made the Object.fromEntries cast insufficient for the production build type check; build the empty import row explicitly instead.
---
 .../src/lib/non-integrated-sku-export.ts      | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/furniture-3d-system/src/lib/non-integrated-sku-export.ts b/furniture-3d-system/src/lib/non-integrated-sku-export.ts
index 1361955e..f75a8af6 100644
--- a/furniture-3d-system/src/lib/non-integrated-sku-export.ts
+++ b/furniture-3d-system/src/lib/non-integrated-sku-export.ts
@@ -309,9 +309,31 @@ function getFuzzyImportColumnKey(value: string) {
 }
 
 function createEmptyImportRow(): NonIntegratedSkuExportRow {
-  return Object.fromEntries(
-    NON_INTEGRATED_SKU_TEMPLATE_COLUMNS.map((column) => [column.key, '']),
-  ) as NonIntegratedSkuExportRow
+  return {
+    spu: '',
+    model: '',
+    skuCode: '',
+    barcode: '',
+    setCount: '',
+    specName: '',
+    size: '',
+    color: '',
+    material: '',
+    boardMaterialType: '',
+    versionNo: '',
+    attributeCode: '',
+    drawingId: '',
+    installMethod: '',
+    executeStandard: '',
+    nationalStandardCompliant: '',
+    manufacturer: '',
+    manufacturerCode: '',
+    minimumOrderQuantity: '',
+    salesStatus: '',
+    batchNo: '',
+    batchChangeType: '',
+    dingTalkFlowNo: '',
+  }
 }
 
 export async function parseNonIntegratedSkuWorkbook(

From 2dbb2140068fedd188df527f1c4620fe5ea1187b Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Fri, 4 Sep 2026 17:59:40 +0800
Subject: [PATCH 10/16] fix(intake): move import rowNumber off the shared sku
 export row type

the optional numeric rowNumber on NonIntegratedSkuExportRow broke the dynamic template column writes (string vs never) in the production build type check; import rows now use a dedicated NonIntegratedSkuImportRow type that extends the export row with a required rowNumber.
---
 .../src/lib/non-integrated-sku-export.ts           | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/furniture-3d-system/src/lib/non-integrated-sku-export.ts b/furniture-3d-system/src/lib/non-integrated-sku-export.ts
index f75a8af6..60a20baa 100644
--- a/furniture-3d-system/src/lib/non-integrated-sku-export.ts
+++ b/furniture-3d-system/src/lib/non-integrated-sku-export.ts
@@ -24,12 +24,15 @@ export type NonIntegratedSkuExportRow = {
   batchNo: string
   batchChangeType: string
   dingTalkFlowNo: string
-  rowNumber?: number
+}
+
+export type NonIntegratedSkuImportRow = NonIntegratedSkuExportRow & {
+  rowNumber: number
 }
 
 export function findSkuImportSpuPrefixErrors(
   rows: ReadonlyArray<
-    Pick<NonIntegratedSkuExportRow, 'skuCode'> & { rowNumber?: number }
+    Pick<NonIntegratedSkuImportRow, 'skuCode' | 'rowNumber'>
   >,
   spu: string,
 ) {
@@ -65,7 +68,7 @@ export type NonIntegratedSkuFuzzyImportRow = {
 export type NonIntegratedSkuWorkbookImport =
   | {
       mode: "standard"
-      rows: NonIntegratedSkuExportRow[]
+      rows: NonIntegratedSkuImportRow[]
       sheetName: string
     }
   | {
@@ -389,7 +392,7 @@ export async function parseNonIntegratedSkuWorkbook(
   if (missingLabels.length === 0) {
     const rows = sheetRows
       .slice(headerRowIndex + 1)
-      .map((row, index) => {
+      .map((row, index): NonIntegratedSkuImportRow => {
         const importRow = createEmptyImportRow()
         for (const column of NON_INTEGRATED_SKU_TEMPLATE_COLUMNS) {
           const cellIndex = headerIndexByLabel.get(column.label)
@@ -398,8 +401,7 @@ export async function parseNonIntegratedSkuWorkbook(
               ? ''
               : normalizeWorkbookCellValue(row[cellIndex])
         }
-        importRow.rowNumber = headerRowIndex + index + 2
-        return importRow
+        return { ...importRow, rowNumber: headerRowIndex + index + 2 }
       })
       .filter((row) =>
         NON_INTEGRATED_SKU_TEMPLATE_COLUMNS.some(

From 4a574041a91a06718fa17cf5cf18c0b1c51ae282 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Sat, 5 Sep 2026 11:53:55 +0800
Subject: [PATCH 11/16] fix(barcode-print): restore Sofia certificate row pitch

---
 .../barcode-print/barcodePrintCertificate.test.ts      |  4 ++--
 .../barcodePrintSofiaCertificateLayout.ts              | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.test.ts b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.test.ts
index b91986b7..fd5f3ac7 100644
--- a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.test.ts
+++ b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintCertificate.test.ts
@@ -34,12 +34,12 @@ describe("Sofia certificate field positioning", () => {
     expect(values.map((value) => value.style.top)).toEqual(
       SOFIA_CERTIFICATE_FIELD_TOPS.map((top) => `${top}px`),
     );
-    expect(SOFIA_CERTIFICATE_FIELD_LINE_TOPS).toEqual([260, 313, 366, 419, 472, 525]);
+    expect(SOFIA_CERTIFICATE_FIELD_LINE_TOPS).toEqual([260, 326, 392, 458, 524, 590]);
     expect(
       SOFIA_CERTIFICATE_FIELD_LINE_TOPS.slice(1).map(
         (top, index) => top - SOFIA_CERTIFICATE_FIELD_LINE_TOPS[index],
       ),
-    ).toEqual(Array(5).fill(53));
+    ).toEqual(Array(5).fill(66));
     expect(values.map((value) => value.style.left)).toEqual(Array(6).fill("310px"));
     expect(values.map((value) => value.textContent)).toEqual([
       "书架-经典北美黑胡桃色",
diff --git a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintSofiaCertificateLayout.ts b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintSofiaCertificateLayout.ts
index 2460771b..74e9808c 100644
--- a/furniture-3d-system/src/app/intake/barcode-print/barcodePrintSofiaCertificateLayout.ts
+++ b/furniture-3d-system/src/app/intake/barcode-print/barcodePrintSofiaCertificateLayout.ts
@@ -10,8 +10,14 @@ export const SOFIA_CERTIFICATE_FIELD_LEFT = 310 as const;
 export const SOFIA_CERTIFICATE_FIELD_FONT_SIZE = 26 as const;
 export const SOFIA_CERTIFICATE_FIELD_LINE_HEIGHT = 32 as const;
 
-/** The y-coordinate of each pre-printed underline in canvas pixels. */
-export const SOFIA_CERTIFICATE_FIELD_LINE_TOPS = [260, 313, 366, 419, 472, 525] as const;
+/**
+ * The y-coordinate of each pre-printed underline in canvas pixels.
+ *
+ * Warehouse print feedback confirmed the first row at 260px and a 66px
+ * physical row pitch. Keep the pitch intact so later values do not drift
+ * progressively above their pre-printed labels.
+ */
+export const SOFIA_CERTIFICATE_FIELD_LINE_TOPS = [260, 326, 392, 458, 524, 590] as const;
 
 /**
  * Dynamic values sit above the underline. The line-height is the text box

From 8ea6a54eaa6b980b3bb0a84708e0cebf40467ce6 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Mon, 7 Sep 2026 11:15:01 +0800
Subject: [PATCH 12/16] feat(finished-product-progress): auto-import
 factory-confirmed SKUs on sample completion

---
 .../src/lib/finished-product-progress.ts      |   7 +-
 ...nished-product-progress-list-order.test.ts |  66 ++++++
 .../finished-product-progress.repository.ts   |  55 ++++-
 ...hed-product-factory-intake.service.test.ts | 158 +++++++++++++
 ...finished-product-factory-intake.service.ts | 207 ++++++++++++++++++
 .../services/sample-progress.service.ts       |  45 +++-
 6 files changed, 531 insertions(+), 7 deletions(-)
 create mode 100644 furniture-3d-system/src/server/repositories/__tests__/finished-product-progress-list-order.test.ts
 create mode 100644 furniture-3d-system/src/server/services/__tests__/finished-product-factory-intake.service.test.ts
 create mode 100644 furniture-3d-system/src/server/services/finished-product-factory-intake.service.ts

diff --git a/furniture-3d-system/src/lib/finished-product-progress.ts b/furniture-3d-system/src/lib/finished-product-progress.ts
index e5636989..39bdcb17 100644
--- a/furniture-3d-system/src/lib/finished-product-progress.ts
+++ b/furniture-3d-system/src/lib/finished-product-progress.ts
@@ -94,7 +94,12 @@ export function calculateFinishedProductInTransitQuantity(orderedQuantity: numbe
   return Math.trunc(orderedQuantity) - Math.trunc(deliveryQuantity)
 }
 
-export const FINISHED_PRODUCT_CURRENT_NODE_OPTIONS = ['合同签订', '采购在途', '送货中', '已完结'] as const
+export const FINISHED_PRODUCT_CURRENT_NODE_OPTIONS = ['合同待签', '合同签订', '采购在途', '送货中', '已完结'] as const
+
+/** 同一 SPU 基号聚组排序用：去掉货号前缀字母（GBSFY1234/GBPM1234/1234 → 1234），前缀不同不影响归组。 */
+export function finishedProductSpuBase(itemNumber: string) {
+  return String(itemNumber ?? '').trim().replace(/^[A-Za-z]+/, '')
+}
 
 export function resolveFinishedProductCurrentNode(contractNumber: string, orderedQuantity: number, deliveryQuantity: number) {
   if (!String(contractNumber ?? '').trim()) return '合同签订'
diff --git a/furniture-3d-system/src/server/repositories/__tests__/finished-product-progress-list-order.test.ts b/furniture-3d-system/src/server/repositories/__tests__/finished-product-progress-list-order.test.ts
new file mode 100644
index 00000000..4a294703
--- /dev/null
+++ b/furniture-3d-system/src/server/repositories/__tests__/finished-product-progress-list-order.test.ts
@@ -0,0 +1,66 @@
+import { sortFinishedProductRowsForList } from '@/server/repositories/finished-product-progress.repository'
+
+type Row = {
+  id: string
+  orderPlacedDate: Date | null
+  orderSequenceNo: string
+  createdAt: Date
+  itemNumber: string
+  barcode: string | null
+}
+
+function row(id: string, overrides: Partial<Row> = {}): Row {
+  return {
+    id,
+    orderPlacedDate: null,
+    orderSequenceNo: '',
+    createdAt: new Date('2026-09-01T00:00:00Z'),
+    itemNumber: id,
+    barcode: null,
+    ...overrides,
+  }
+}
+
+describe('sortFinishedProductRowsForList（成品进度列表聚组排序）', () => {
+  it('有下单日期的订单在前且保持原序，无日期的按 SPU 基号聚组', () => {
+    const rows = [
+      row('undated-gbsfy', { itemNumber: 'GBSFY1234' }),
+      row('dated-a', { orderPlacedDate: new Date('2026-09-01T00:00:00Z'), orderSequenceNo: 'SH003' }),
+      row('undated-plain', { itemNumber: '1234' }),
+      row('undated-gbpm', { itemNumber: 'GBPM1234' }),
+      row('dated-b', { orderPlacedDate: new Date('2026-08-01T00:00:00Z'), orderSequenceNo: 'SH002' }),
+      row('undated-other', { itemNumber: 'GBSFY999' }),
+    ]
+
+    const sorted = sortFinishedProductRowsForList(rows)
+
+    expect(sorted.map((r) => r.id)).toEqual([
+      'dated-a',        // 有下单日期，最近的在前
+      'dated-b',
+      'undated-other',  // 基号 999 < 1234，组在前
+      'undated-plain',  // 基号 1234 组：GBPM1234 / 1234 / GBSFY1234 按货号排序聚在一起
+      'undated-gbpm',
+      'undated-gbsfy',
+    ])
+  })
+
+  it('同组内条码作为次级排序，创建时间兜底', () => {
+    const rows = [
+      row('x-b', { itemNumber: 'GBSFY1234', barcode: 'BBB' }),
+      row('x-a', { itemNumber: 'GBSFY1234', barcode: 'AAA' }),
+      row('x-c', { itemNumber: 'GBSFY1234', barcode: 'AAA', createdAt: new Date('2026-08-01T00:00:00Z') }),
+    ]
+
+    const sorted = sortFinishedProductRowsForList(rows)
+
+    expect(sorted.map((r) => r.id)).toEqual(['x-a', 'x-c', 'x-b'])
+  })
+
+  it('无非日期行时保持原序不变', () => {
+    const rows = [
+      row('d1', { orderPlacedDate: new Date('2026-09-01T00:00:00Z') }),
+      row('d2', { orderPlacedDate: new Date('2026-08-01T00:00:00Z') }),
+    ]
+    expect(sortFinishedProductRowsForList(rows).map((r) => r.id)).toEqual(['d1', 'd2'])
+  })
+})
diff --git a/furniture-3d-system/src/server/repositories/finished-product-progress.repository.ts b/furniture-3d-system/src/server/repositories/finished-product-progress.repository.ts
index 20bfba9c..c09e8518 100644
--- a/furniture-3d-system/src/server/repositories/finished-product-progress.repository.ts
+++ b/furniture-3d-system/src/server/repositories/finished-product-progress.repository.ts
@@ -4,6 +4,7 @@ import {
   FINISHED_PRODUCT_CURRENT_NODE_OPTIONS,
   buildOrderSequenceNo,
   buildOrderSequencePrefix,
+  finishedProductSpuBase,
   resolveFinishedProductCurrentNode,
   type FinishedProductProgressFilters,
   type FinishedProductProgressInput,
@@ -104,10 +105,57 @@ function dataValues(input: FinishedProductProgressInput) {
     firstDueDate: input.firstDueDate ? new Date(`${input.firstDueDate}T00:00:00Z`) : null,
     orderDueDate: input.orderDueDate ? new Date(`${input.orderDueDate}T00:00:00Z`) : null,
     realtimeDate: input.realtimeDate ? new Date(`${input.realtimeDate}T00:00:00Z`) : null,
-    currentNode: resolveFinishedProductCurrentNode(input.contractNumber, input.orderedQuantity, input.deliveryQuantity),
+    // 有合同号的行按数量自动推进节点；空合同行（含定厂自动带入的待签行）保留表单所选节点
+    currentNode: String(input.contractNumber ?? '').trim()
+      ? resolveFinishedProductCurrentNode(input.contractNumber, input.orderedQuantity, input.deliveryQuantity)
+      : (String(input.currentNode ?? '').trim() || '合同待签'),
   }
 }
 
+type SortableFinishedProductRow = {
+  orderPlacedDate: Date | null
+  orderSequenceNo: string
+  createdAt: Date
+  itemNumber: string
+  barcode: string | null
+}
+
+/**
+ * 列表排序：有下单日期的订单保持原序在前；无下单日期的行（合同待签等）按 SPU 基号聚组——
+ * 同基号（GBSFY1234/GBPM1234/1234 → 1234）的行排在一起，组内按货号、条码排序。
+ */
+export function sortFinishedProductRowsForList<T extends SortableFinishedProductRow>(rows: T[]): T[] {
+  const dated = rows.filter((row) => row.orderPlacedDate)
+  const undated = rows.filter((row) => !row.orderPlacedDate)
+  if (undated.length === 0) return rows
+
+  const groups = new Map<string, T[]>()
+  for (const row of undated) {
+    const base = finishedProductSpuBase(row.itemNumber) || row.itemNumber || '~'
+    const bucket = groups.get(base)
+    if (bucket) bucket.push(row)
+    else groups.set(base, [row])
+  }
+  const compareBase = (left: string, right: string) => {
+    const leftNumeric = /^\d+$/.test(left)
+    const rightNumeric = /^\d+$/.test(right)
+    if (leftNumeric && rightNumeric) return Number(left) - Number(right)
+    if (leftNumeric !== rightNumeric) return leftNumeric ? -1 : 1
+    return left.localeCompare(right, 'zh-Hans-CN')
+  }
+  const grouped = [...groups.entries()]
+    .sort(([left], [right]) => compareBase(left, right))
+    .flatMap(([, bucket]) => bucket.sort((left, right) => {
+      const byItemNumber = left.itemNumber.localeCompare(right.itemNumber, 'zh-Hans-CN')
+      if (byItemNumber !== 0) return byItemNumber
+      const leftBarcode = left.barcode ?? ''
+      const rightBarcode = right.barcode ?? ''
+      if (leftBarcode !== rightBarcode) return leftBarcode.localeCompare(rightBarcode)
+      return right.createdAt.getTime() - left.createdAt.getTime()
+    }))
+  return [...dated, ...grouped]
+}
+
 export class FinishedProductProgressRepository {
   private async nextOrderSequenceNoInTransaction(tx: Prisma.TransactionClient, prefix: string) {
     const normalized = prefix.trim() || 'DD'
@@ -136,10 +184,11 @@ export class FinishedProductProgressRepository {
       ],
     })
     // 行身份重设计后每条记录即一笔独立订单，平铺返回
-    const pagedRows = rows.slice(params.skip, params.skip + params.take)
+    const sortedRows = sortFinishedProductRowsForList(rows)
+    const pagedRows = sortedRows.slice(params.skip, params.skip + params.take)
     return {
       groups: pagedRows.map((row) => [row]),
-      total: rows.length,
+      total: sortedRows.length,
     }
   }
 
diff --git a/furniture-3d-system/src/server/services/__tests__/finished-product-factory-intake.service.test.ts b/furniture-3d-system/src/server/services/__tests__/finished-product-factory-intake.service.test.ts
new file mode 100644
index 00000000..82f4bdc3
--- /dev/null
+++ b/furniture-3d-system/src/server/services/__tests__/finished-product-factory-intake.service.test.ts
@@ -0,0 +1,158 @@
+import {
+  FinishedProductFactoryIntakeService,
+  FACTORY_INTAKE_LAUNCH_CUTOFF,
+  linkedProductIdFromFlowUrl,
+  type FinishedProductFactoryIntakeDeps,
+} from '@/server/services/finished-product-factory-intake.service'
+
+type CreatedRow = Record<string, unknown>
+
+const FLOW_URL = 'https://cp.jiansun.vip/product-development/non-integrated/prod-1/detail'
+
+function makeDeps() {
+  const created: CreatedRow[] = []
+  const deps: FinishedProductFactoryIntakeDeps = {
+    loadProduct: async () => ({
+      id: 'prod-1',
+      brand: '大货',
+      purchaser: '采购小王',
+      payload: {
+        uploadFiles: [
+          { category: '设计卖点', mimeType: 'image/png', dataUrl: 'https://img.example/design.png' },
+        ],
+        factoryRows: [
+          {
+            skuId: 'sku-1',
+            confirmed: true,
+            model: 'GBSFY1234',
+            barcode: 'GBSFY1234N1410V01',
+            specName: '款式五 100/14/2.5 碳纤维黑色 翻板',
+            supplierName: '三环',
+          },
+          {
+            skuId: 'sku-2',
+            confirmed: false,
+            model: 'GBSFY1235',
+            barcode: 'GBSFY1235N1410V01',
+            specName: '款式六',
+            supplierName: '三环',
+          },
+          {
+            skuId: 'sku-3',
+            confirmed: true,
+            model: '',
+            barcode: '',
+            specName: '缺货号条码',
+            supplierName: '三环',
+          },
+          {
+            skuId: 'sku-4',
+            confirmed: true,
+            model: 'GBPM1234',
+            barcode: 'GBPM1234N205V01',
+            specName: '款式七 120/60 白色',
+            supplierName: '瑞敏',
+          },
+        ],
+      },
+    }),
+    findExistingAutoRow: async (itemNumber, barcode) => {
+      // 模拟真实持久化：本次测试会话内已创建的行也算已存在
+      if (created.some((c) => c.itemNumber === itemNumber && (c.barcode ?? null) === barcode)) {
+        return { id: 'created-in-session' }
+      }
+      if (itemNumber === 'GBSFY1234') return { id: 'existing-1' }
+      return null
+    },
+    createAutoRow: async (data) => {
+      created.push({ ...data })
+      return { id: `created-${created.length}` }
+    },
+    listCompletedSamplesSince: async () => [
+      { openingCode: 'XP2026062500000226', productDevelopmentFlowUrl: FLOW_URL },
+      { openingCode: 'XP2026070100000301', productDevelopmentFlowUrl: null },
+    ],
+  }
+  return { deps, created }
+}
+
+describe('FinishedProductFactoryIntakeService（打样完结带入成品进度）', () => {
+  it('打样完结时：只带入定厂已确认的 SKU，幂等跳过已存在行，映射字段正确', async () => {
+    const { deps, created } = makeDeps()
+    const service = new FinishedProductFactoryIntakeService(deps)
+
+    const result = await service.syncCompletedSampleToFinishedProgress(
+      { openingCode: 'XP2026062500000226', productDevelopmentFlowUrl: FLOW_URL },
+      { id: 'user-1', name: '徐霞客' },
+    )
+
+    // sku-1 已存在跳过；sku-2 未确认跳过；sku-3 缺货号条码跳过；sku-4 创建
+    expect(result).toEqual({ created: 1, skipped: 1 })
+    expect(created).toHaveLength(1)
+    expect(created[0]).toMatchObject({
+      itemNumber: 'GBPM1234',
+      barcode: 'GBPM1234N205V01',
+      productName: '款式七 120/60 白色',
+      brand: '大货',
+      supplier: '瑞敏',
+      imageUrl: 'https://img.example/design.png',
+      followUpOwner: '采购小王',
+      createdById: 'user-1',
+      createdByName: '徐霞客',
+    })
+    expect(String(created[0].remarks)).toContain('定厂完成自动生成')
+    expect(String(created[0].remarks)).toContain('XP2026062500000226')
+  })
+
+  it('由壹点链接解析不出产品 ID 时返回零值', async () => {
+    const { deps, created } = makeDeps()
+    const service = new FinishedProductFactoryIntakeService(deps)
+    await expect(service.syncCompletedSampleToFinishedProgress({
+      openingCode: 'XP1',
+      productDevelopmentFlowUrl: 'https://cp.jiansun.vip/other/path',
+    })).resolves.toEqual({ created: 0, skipped: 0 })
+    expect(created).toHaveLength(0)
+  })
+
+  it('产品不存在时返回零值', async () => {
+    const deps: FinishedProductFactoryIntakeDeps = {
+      loadProduct: async () => null,
+      findExistingAutoRow: async () => null,
+      createAutoRow: async () => ({ id: 'x' }),
+    }
+    const service = new FinishedProductFactoryIntakeService(deps)
+    await expect(service.syncCompletedSampleToFinishedProgress({
+      openingCode: 'XP1',
+      productDevelopmentFlowUrl: FLOW_URL,
+    })).resolves.toEqual({ created: 0, skipped: 0 })
+  })
+
+  it('linkedProductIdFromFlowUrl 解析 /non-integrated/<id>', () => {
+    expect(linkedProductIdFromFlowUrl(FLOW_URL)).toBe('prod-1')
+    expect(linkedProductIdFromFlowUrl('not-a-url')).toBe('')
+    expect(linkedProductIdFromFlowUrl(null)).toBe('')
+  })
+
+  it('每日补抓：扫描上线后完结的打样单并重试，无链接的跳过、同天只跑一次', async () => {
+    const { deps, created } = makeDeps()
+    let now = new Date('2026-09-10T01:30:00Z')
+    const service = new FinishedProductFactoryIntakeService(deps, () => now)
+
+    const first = await service.sweepOncePerDay()
+    // 两条完结单：一条有链接（创建 1 条，1 条已存在跳过），一条无链接（抓不到，明天再试）
+    expect(first).toEqual({ scanned: 2, created: 1, skipped: 1 })
+    expect(created).toHaveLength(1)
+
+    // 同一天再刷列表：守卫生效，不再扫
+    now = new Date('2026-09-10T08:30:00Z')
+    await expect(service.sweepOncePerDay()).resolves.toEqual({ scanned: 0, created: 0, skipped: 0 })
+    expect(created).toHaveLength(1)
+
+    // 第二天：再次扫描，幂等跳过已抓到的
+    now = new Date('2026-09-11T01:30:00Z')
+    const third = await service.sweepOncePerDay()
+    expect(third.scanned).toBe(2)
+    expect(created).toHaveLength(1)
+    expect(FACTORY_INTAKE_LAUNCH_CUTOFF).toBe('2026-09-04')
+  })
+})
diff --git a/furniture-3d-system/src/server/services/finished-product-factory-intake.service.ts b/furniture-3d-system/src/server/services/finished-product-factory-intake.service.ts
new file mode 100644
index 00000000..be46a8a5
--- /dev/null
+++ b/furniture-3d-system/src/server/services/finished-product-factory-intake.service.ts
@@ -0,0 +1,207 @@
+import { prisma } from '@/lib/prisma'
+
+const AUTO_CURRENT_NODE = '合同待签'
+
+/** 功能上线日：打样完结时间早于该日的属于历史数据，每日补抓不扫描。 */
+export const FACTORY_INTAKE_LAUNCH_CUTOFF = '2026-09-04'
+
+export type FinishedProductFactoryIntakeActor = {
+  id?: string | null
+  name?: string | null
+}
+
+export type FinishedProductFactoryIntakeResult = {
+  created: number
+  skipped: number
+}
+
+export type FinishedProductFactoryAutoRowInput = {
+  itemNumber: string
+  barcode: string | null
+  productName: string
+  brand: string
+  supplier: string
+  imageUrl: string | null
+  followUpOwner: string
+  remarks: string
+  createdById: string | null
+  createdByName: string
+}
+
+export type FinishedProductFactoryIntakeDeps = {
+  loadProduct(productId: string): Promise<{
+    id: string
+    brand: string
+    purchaser: string
+    payload: unknown
+  } | null>
+  findExistingAutoRow(itemNumber: string, barcode: string | null): Promise<{ id: string } | null>
+  createAutoRow(data: FinishedProductFactoryAutoRowInput): Promise<{ id: string }>
+  /** 上线日后完结的打样单（开款编号+由壹点链接），每日补抓扫描用 */
+  listCompletedSamplesSince(cutoffDate: string): Promise<Array<{ openingCode: string; productDevelopmentFlowUrl: string | null }>>
+}
+
+function readText(value: unknown) {
+  return typeof value === 'string' ? value.trim() : ''
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return Boolean(value) && typeof value === 'object' && !Array.isArray(value)
+}
+
+/** 由壹点链接 → 产品开发记录 ID（/non-integrated/<productId>） */
+export function linkedProductIdFromFlowUrl(flowUrl: string | null | undefined) {
+  try {
+    const segments = new URL(flowUrl ?? '').pathname.split('/').filter(Boolean)
+    const index = segments.lastIndexOf('non-integrated')
+    return index >= 0 ? decodeURIComponent(segments[index + 1] || '') : ''
+  } catch {
+    return ''
+  }
+}
+
+// 与打样进度 OA 同步同口径：优先「设计卖点」图片，其次款式图
+function extractProductImage(payload: unknown) {
+  if (!isRecord(payload)) return null
+  const files = Array.isArray(payload.uploadFiles) ? payload.uploadFiles : []
+  const designFile = files.find((value) => {
+    if (!isRecord(value)) return false
+    return value.category === '设计卖点'
+      && String(value.mimeType || '').startsWith('image/')
+      && typeof value.dataUrl === 'string'
+      && Boolean(value.dataUrl.trim())
+  }) as { dataUrl?: string } | undefined
+  if (designFile?.dataUrl?.trim()) return designFile.dataUrl.trim()
+  const styleImages = Array.isArray(payload.styleImages) ? payload.styleImages : []
+  const styleImage = styleImages.find((value) => isRecord(value) && typeof value.url === 'string' && Boolean(value.url.trim())) as { url?: string } | undefined
+  return styleImage?.url?.trim() || null
+}
+
+export class FinishedProductFactoryIntakeService {
+  private lastSweepDate: string | null = null
+
+  constructor(
+    private readonly deps: FinishedProductFactoryIntakeDeps = {
+      loadProduct: async (productId) => prisma.intakeNonIntegratedProduct.findFirst({
+        where: { id: productId, deletedAt: null },
+        select: { id: true, brand: true, purchaser: true, payload: true },
+      }),
+      findExistingAutoRow: async (itemNumber, barcode) => prisma.finishedProductProgressItem.findFirst({
+        where: { contractNumber: '', itemNumber, barcode },
+        select: { id: true },
+      }),
+      createAutoRow: async (data) => prisma.finishedProductProgressItem.create({
+        data: {
+          contractDateNumber: '',
+          contractNumber: '',
+          orderSequenceNo: '',
+          orderPlacedDate: null,
+          followUpOwner: data.followUpOwner,
+          imageUrl: data.imageUrl,
+          itemNumber: data.itemNumber,
+          barcode: data.barcode,
+          productName: data.productName,
+          supplier: data.supplier,
+          brand: data.brand,
+          orderedQuantity: 0,
+          inTransitQuantity: 0,
+          firstDueDate: null,
+          orderDueDate: null,
+          realtimeDate: null,
+          deliveryQuantity: 0,
+          currentNode: AUTO_CURRENT_NODE,
+          remarks: data.remarks,
+          createdById: data.createdById,
+          createdByName: data.createdByName,
+          updatedById: data.createdById,
+          updatedByName: data.createdByName,
+        },
+        select: { id: true },
+      }),
+      listCompletedSamplesSince: async (cutoffDate) => prisma.sampleProgressItem.findMany({
+        where: { status: 'COMPLETED', actualSampleCompletedAt: { gte: new Date(`${cutoffDate}T00:00:00Z`) } },
+        select: { openingCode: true, productDevelopmentFlowUrl: true },
+        orderBy: { actualSampleCompletedAt: 'asc' },
+      }),
+    },
+    private readonly now: () => Date = () => new Date(),
+  ) {}
+
+  /** 打样完结（实物审样完成，打样状态变为已完结）时调用：按开款编号+由壹点链接
+   *  关联产品开发记录，把已定厂确认的 SKU 幂等带入成品进度明细（合同待签）。
+   *  调用方负责只在「未完结 → 已完结」转换时触发，历史已完结产品不会被翻出。 */
+  async syncCompletedSampleToFinishedProgress(
+    input: { openingCode: string; productDevelopmentFlowUrl: string | null },
+    actor: FinishedProductFactoryIntakeActor = {},
+  ): Promise<FinishedProductFactoryIntakeResult> {
+    const productId = linkedProductIdFromFlowUrl(input.productDevelopmentFlowUrl)
+    if (!productId) return { created: 0, skipped: 0 }
+
+    const product = await this.deps.loadProduct(productId)
+    if (!product) return { created: 0, skipped: 0 }
+
+    const payload = product.payload
+    const factoryRows = isRecord(payload) && Array.isArray(payload.factoryRows) ? payload.factoryRows : []
+    if (factoryRows.length === 0) return { created: 0, skipped: 0 }
+
+    const image = extractProductImage(payload)
+    const today = this.now().toISOString().slice(0, 10)
+    const actorId = actor.id ?? null
+    const actorName = actor.name || '系统'
+
+    let created = 0
+    let skipped = 0
+    for (const row of factoryRows) {
+      if (!isRecord(row) || row.confirmed !== true) continue
+      const itemNumber = readText(row.model)
+      const barcode = readText(row.barcode)
+      if (!itemNumber && !barcode) continue
+      const existing = await this.deps.findExistingAutoRow(itemNumber, barcode || null)
+      if (existing) {
+        skipped += 1
+        continue
+      }
+      await this.deps.createAutoRow({
+        itemNumber,
+        barcode: barcode || null,
+        productName: readText(row.specName),
+        brand: product.brand || '',
+        supplier: readText(row.supplierName),
+        imageUrl: image,
+        followUpOwner: product.purchaser || '',
+        remarks: `定厂完成自动生成 ${today}（打样单 ${input.openingCode}）`,
+        createdById: actorId,
+        createdByName: actorName,
+      })
+      created += 1
+    }
+    return { created, skipped }
+  }
+
+  /** 每日补抓：扫描上线后完结的全部打样单并重试带入（幂等）。当时未定厂的会在
+   *  定厂确认后的某天补抓中被抓到，直到抓到为止。 */
+  async runDailyCatchUpSweep(actor: FinishedProductFactoryIntakeActor = {}): Promise<FinishedProductFactoryIntakeResult & { scanned: number }> {
+    const samples = await this.deps.listCompletedSamplesSince(FACTORY_INTAKE_LAUNCH_CUTOFF)
+    let created = 0
+    let skipped = 0
+    let scanned = 0
+    for (const sample of samples) {
+      if (!sample.openingCode) continue
+      scanned += 1
+      const result = await this.syncCompletedSampleToFinishedProgress(sample, actor)
+      created += result.created
+      skipped += result.skipped
+    }
+    this.lastSweepDate = this.now().toISOString().slice(0, 10)
+    return { scanned, created, skipped }
+  }
+
+  /** 每天最多执行一次补抓，其余调用直接跳过（进程内守卫）。 */
+  sweepOncePerDay(actor: FinishedProductFactoryIntakeActor = {}): Promise<FinishedProductFactoryIntakeResult & { scanned: number }> {
+    const today = this.now().toISOString().slice(0, 10)
+    if (this.lastSweepDate === today) return Promise.resolve({ scanned: 0, created: 0, skipped: 0 })
+    return this.runDailyCatchUpSweep(actor)
+  }
+}
+
+export const finishedProductFactoryIntakeService = new FinishedProductFactoryIntakeService()
diff --git a/furniture-3d-system/src/server/services/sample-progress.service.ts b/furniture-3d-system/src/server/services/sample-progress.service.ts
index d119fd74..232825e4 100644
--- a/furniture-3d-system/src/server/services/sample-progress.service.ts
+++ b/furniture-3d-system/src/server/services/sample-progress.service.ts
@@ -17,6 +17,7 @@ import {
   sampleProgressSupplierSnapshot,
 } from '@/server/services/sample-progress-change-log'
 import { serializeSampleProgress } from '@/server/services/sample-progress-serialization'
+import { finishedProductFactoryIntakeService } from '@/server/services/finished-product-factory-intake.service'
 import {
   buildSampleProgressParentSummary,
   resolveSupplierWrites,
@@ -242,7 +243,8 @@ async function syncFromOaItems(items: OaBoardProjectListItemDTO[]) {
     const endedAt = endedAtFromOa ?? (
       current?.autoGenerated ? null : current?.actualSampleCompletedAt ?? null
     )
-    return sampleProgressRepository.updateOaFields({
+    const previousStatus = current?.status ?? null
+    const updatePromise = sampleProgressRepository.updateOaFields({
       openingCode,
       brand: item.formSummary.plannedSalesBrands || item.formSummary.salesBrands || item.brand || '',
       designer: structureDesignerByProductId.get(productId) || item.formSummary.structureDesigner || '',
@@ -256,6 +258,24 @@ async function syncFromOaItems(items: OaBoardProjectListItemDTO[]) {
       imageUrl: designImageByProductId.get(linkedProductId(workflowLink)) || item.styleImages[0]?.url || null,
       productDevelopmentFlowUrl: workflowLink || null,
     })
+    // 打样状态从未完结变为已完结（实物审样完成）时，把已定厂 SKU 自动带入成品进度明细
+    if (nextStatus === 'COMPLETED' && previousStatus !== 'COMPLETED') {
+      return updatePromise.then(async () => {
+        try {
+          const syncResult = await finishedProductFactoryIntakeService.syncCompletedSampleToFinishedProgress({
+            openingCode,
+            productDevelopmentFlowUrl: workflowLink || null,
+          })
+          if (syncResult.created > 0) {
+            console.log('[sample-progress] 打样完结自动带入成品进度明细:', { openingCode, ...syncResult })
+          }
+        } catch (error) {
+          console.error(`[sample-progress] 打样完结自动带入成品进度失败 (${openingCode}):`, error)
+        }
+        return { count: 1 }
+      })
+    }
+    return updatePromise
   }))
 }
 
@@ -327,6 +347,10 @@ export const sampleProgressService = {
   async listStored() { return (await sampleProgressRepository.list()).map(serializeSampleProgress) },
   async list() {
     await this.syncFromOaDashboard().catch(() => undefined)
+    // 每日一次：上线后完结但当时未定厂的打样单，补抓已定厂 SKU 直到抓到
+    await finishedProductFactoryIntakeService.sweepOncePerDay().catch((error) => {
+      console.error('[sample-progress] 定厂 SKU 每日补抓失败:', error)
+    })
     return this.listStored()
   },
   getOaPrefill: readOaPrefill,
@@ -393,7 +417,7 @@ export const sampleProgressService = {
     const changeReason = changedDueSuppliers.map((supplier, index) =>
       `${supplier.supplier || `供应商 ${index + 1}`}：${supplier.deliveryDateChangeReason?.trim()}`,
     ).join('\n') || deliveryDateChangeReason?.trim() || null
-    return serializeSampleProgress(await sampleProgressRepository.updateWithChangeLog({
+    const record = await sampleProgressRepository.updateWithChangeLog({
       id,
       data: { ...merged, openingCode: current.openingCode, autoGenerated: false, updatedBy: actor.id },
       suppliers: supplierWrites,
@@ -403,7 +427,22 @@ export const sampleProgressService = {
       changeReason,
       changedById: actor.id,
       changedByName: actor.name || '未知用户',
-    }))
+    })
+    // 人工把打样状态改为已完结（实物审样完成）时，把已定厂 SKU 自动带入成品进度明细
+    if (current.status !== 'COMPLETED' && record.status === 'COMPLETED') {
+      try {
+        const syncResult = await finishedProductFactoryIntakeService.syncCompletedSampleToFinishedProgress({
+          openingCode: current.openingCode,
+          productDevelopmentFlowUrl: current.productDevelopmentFlowUrl ?? null,
+        }, { id: actor.id, name: actor.name })
+        if (syncResult.created > 0) {
+          console.log('[sample-progress] 打样完结(人工)自动带入成品进度明细:', { openingCode: current.openingCode, ...syncResult })
+        }
+      } catch (error) {
+        console.error(`[sample-progress] 打样完结(人工)自动带入成品进度失败 (${current.openingCode}):`, error)
+      }
+    }
+    return serializeSampleProgress(record)
   },
   async listChangeLogs(id: string) {
     if (!(await sampleProgressRepository.findById(id))) throw new AppError(ErrorCode.VALIDATION_FAILED, '打样记录不存在')

From f8ba4f1e2563bbd7068cb7d549ed6eb1c0488966 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Mon, 7 Sep 2026 11:47:40 +0800
Subject: [PATCH 13/16] feat(intake): open sample measurement and pricing
 template access with spec name column

measurement and pricing nodes now default downloads for pricing/purchase/merchandiser subjects so non-admin owners see the export/import template buttons; both workbook exports add a spec name reference column after the barcode (imports stay barcode-keyed and ignore it); the pricing node also grants merchandiser download parity with purchase owners.
---
 .../product-workflow/productWorkflowRowHelpers.ts |  1 +
 .../sample-workflow/sampleWorkflowHelpers.ts      |  1 +
 .../src/lib/intake-node-permission-settings.ts    | 10 ++++++++++
 ...on-integrated-product-pricing-workbook.test.ts |  7 +++++--
 .../non-integrated-product-pricing-workbook.ts    |  4 +++-
 ...integrated-sample-measurement-workbook.test.ts | 15 +++++++++------
 .../non-integrated-sample-measurement-workbook.ts |  4 +++-
 7 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-workflow/productWorkflowRowHelpers.ts b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-workflow/productWorkflowRowHelpers.ts
index 0b229c13..de1933a5 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-workflow/productWorkflowRowHelpers.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-workflow/productWorkflowRowHelpers.ts
@@ -176,6 +176,7 @@ export function buildProductPricingWorkbookRows(
   return rows.map((row) => ({
     image: row.image.trim(),
     barcode: row.barcode.trim(),
+    specName: row.specName.trim(),
     costPrice: row.costPrice.trim(),
   }));
 }
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/sample-workflow/sampleWorkflowHelpers.ts b/furniture-3d-system/src/app/intake/non-integrated/workspaces/sample-workflow/sampleWorkflowHelpers.ts
index fa7093ad..a5f892b1 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/sample-workflow/sampleWorkflowHelpers.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/sample-workflow/sampleWorkflowHelpers.ts
@@ -104,6 +104,7 @@ export function buildSampleMeasurementWorkbookRows(
   return rows.map((row) => ({
     image: row.image.trim(),
     barcode: row.barcode.trim(),
+    specName: row.specName.trim(),
     lengthCm: row.lengthCm.trim(),
     widthCm: row.widthCm.trim(),
     heightCm: row.heightCm.trim(),
diff --git a/furniture-3d-system/src/lib/intake-node-permission-settings.ts b/furniture-3d-system/src/lib/intake-node-permission-settings.ts
index 08ccce79..3ac3a2b9 100644
--- a/furniture-3d-system/src/lib/intake-node-permission-settings.ts
+++ b/furniture-3d-system/src/lib/intake-node-permission-settings.ts
@@ -623,6 +623,11 @@ export const PRODUCT_DEVELOPMENT_PERMISSION_TARGETS: IntakeNodePermissionTarget[
       pricing: "edit",
       externalIntake: "edit",
     },
+    downloads: {
+      merchandiser: true,
+      pricing: true,
+      purchase: true,
+    },
   },
   {
     key: "finishedSampleShipment",
@@ -645,6 +650,11 @@ export const PRODUCT_DEVELOPMENT_PERMISSION_TARGETS: IntakeNodePermissionTarget[
       pricing: "edit",
       externalIntake: "edit",
     },
+    downloads: {
+      merchandiser: true,
+      pricing: true,
+      purchase: true,
+    },
   },
   {
     key: "limit",
diff --git a/furniture-3d-system/src/lib/non-integrated-product-pricing-workbook.test.ts b/furniture-3d-system/src/lib/non-integrated-product-pricing-workbook.test.ts
index 8bf73f13..76357136 100644
--- a/furniture-3d-system/src/lib/non-integrated-product-pricing-workbook.test.ts
+++ b/furniture-3d-system/src/lib/non-integrated-product-pricing-workbook.test.ts
@@ -27,6 +27,7 @@ describe('non-integrated-product-pricing-workbook', () => {
       {
         image: PRODUCT_PRICING_TEST_IMAGE,
         barcode: 'GBGJ-XJ009601N1280V01',
+        specName: '款式一 45/45/50 胡桃色',
         costPrice: '88',
       },
     ])
@@ -40,9 +41,11 @@ describe('non-integrated-product-pricing-workbook', () => {
     expect(worksheet?.name).toBe('产品核价')
     expect(worksheet?.getCell(1, 1).value).toBe('产品图片')
     expect(worksheet?.getCell(1, 2).value).toBe('条码')
-    expect(worksheet?.getCell(1, 3).value).toBe('成本价')
+    expect(worksheet?.getCell(1, 3).value).toBe('条码规格名称')
+    expect(worksheet?.getCell(1, 4).value).toBe('成本价')
     expect(worksheet?.getCell(2, 2).value).toBe('GBGJ-XJ009601N1280V01')
-    expect(worksheet?.getCell(2, 3).value).toBe(88)
+    expect(worksheet?.getCell(2, 3).value).toBe('款式一 45/45/50 胡桃色')
+    expect(worksheet?.getCell(2, 4).value).toBe(88)
 
     const media = (workbook as import('exceljs').Workbook & {
       model?: { media?: unknown[] }
diff --git a/furniture-3d-system/src/lib/non-integrated-product-pricing-workbook.ts b/furniture-3d-system/src/lib/non-integrated-product-pricing-workbook.ts
index b2c402f7..cd3a45b5 100644
--- a/furniture-3d-system/src/lib/non-integrated-product-pricing-workbook.ts
+++ b/furniture-3d-system/src/lib/non-integrated-product-pricing-workbook.ts
@@ -1,6 +1,7 @@
 export type NonIntegratedProductPricingWorkbookRow = {
   image: string
   barcode: string
+  specName: string
   costPrice: string
 }
 
@@ -20,7 +21,7 @@ type ProductPricingWorkbookImageExtension = 'jpeg' | 'png' | 'gif'
 
 type ProductPricingWorkbookExportColumn =
   | {
-      key: 'barcode'
+      key: 'barcode' | 'specName'
       label: string
       width: number
       kind: 'text'
@@ -42,6 +43,7 @@ const NON_INTEGRATED_PRODUCT_PRICING_EXPORT_COLUMNS: ProductPricingWorkbookExpor
   [
     { key: 'image', label: '产品图片', width: 14, kind: 'image' },
     { key: 'barcode', label: '条码', width: 24, kind: 'text' },
+    { key: 'specName', label: '条码规格名称', width: 24, kind: 'text' },
     { key: 'costPrice', label: '成本价', width: 12, kind: 'number' },
   ]
 
diff --git a/furniture-3d-system/src/lib/non-integrated-sample-measurement-workbook.test.ts b/furniture-3d-system/src/lib/non-integrated-sample-measurement-workbook.test.ts
index dd4a84d9..67ddf5cd 100644
--- a/furniture-3d-system/src/lib/non-integrated-sample-measurement-workbook.test.ts
+++ b/furniture-3d-system/src/lib/non-integrated-sample-measurement-workbook.test.ts
@@ -27,6 +27,7 @@ describe('non-integrated-sample-measurement-workbook', () => {
       {
         image: SAMPLE_MEASUREMENT_TEST_IMAGE,
         barcode: 'XJ010101N3576V01',
+        specName: '款式一 1/1/1 黑色',
         lengthCm: '30',
         widthCm: '40',
         heightCm: '60',
@@ -43,13 +44,15 @@ describe('non-integrated-sample-measurement-workbook', () => {
     expect(worksheet?.name).toBe('样包测量')
     expect(worksheet?.getCell(1, 1).value).toBe('产品图片')
     expect(worksheet?.getCell(1, 2).value).toBe('条码')
-    expect(worksheet?.getCell(1, 3).value).toBe('长（CM）')
-    expect(worksheet?.getCell(1, 4).value).toBe('宽（CM）')
-    expect(worksheet?.getCell(1, 5).value).toBe('高（CM）')
-    expect(worksheet?.getCell(1, 6).value).toBe('重量（KG）')
+    expect(worksheet?.getCell(1, 3).value).toBe('条码规格名称')
+    expect(worksheet?.getCell(1, 4).value).toBe('长（CM）')
+    expect(worksheet?.getCell(1, 5).value).toBe('宽（CM）')
+    expect(worksheet?.getCell(1, 6).value).toBe('高（CM）')
+    expect(worksheet?.getCell(1, 7).value).toBe('重量（KG）')
     expect(worksheet?.getCell(2, 2).value).toBe('XJ010101N3576V01')
-    expect(worksheet?.getCell(2, 3).value).toBe(30)
-    expect(worksheet?.getCell(2, 6).value ?? '').toBe('')
+    expect(worksheet?.getCell(2, 3).value).toBe('款式一 1/1/1 黑色')
+    expect(worksheet?.getCell(2, 4).value).toBe(30)
+    expect(worksheet?.getCell(2, 7).value ?? '').toBe('')
 
     const media = (workbook as import('exceljs').Workbook & {
       model?: { media?: unknown[] }
diff --git a/furniture-3d-system/src/lib/non-integrated-sample-measurement-workbook.ts b/furniture-3d-system/src/lib/non-integrated-sample-measurement-workbook.ts
index 92a5aacf..43cc4e83 100644
--- a/furniture-3d-system/src/lib/non-integrated-sample-measurement-workbook.ts
+++ b/furniture-3d-system/src/lib/non-integrated-sample-measurement-workbook.ts
@@ -1,6 +1,7 @@
 export type NonIntegratedSampleMeasurementWorkbookRow = {
   image: string
   barcode: string
+  specName: string
   lengthCm: string
   widthCm: string
   heightCm: string
@@ -26,7 +27,7 @@ type SampleMeasurementWorkbookImageExtension = 'jpeg' | 'png' | 'gif'
 
 type SampleMeasurementWorkbookExportColumn =
   | {
-      key: 'barcode'
+      key: 'barcode' | 'specName'
       label: string
       width: number
       kind: 'text'
@@ -48,6 +49,7 @@ const NON_INTEGRATED_SAMPLE_MEASUREMENT_EXPORT_COLUMNS: SampleMeasurementWorkboo
   [
     { key: 'image', label: '产品图片', width: 14, kind: 'image' },
     { key: 'barcode', label: '条码', width: 24, kind: 'text' },
+    { key: 'specName', label: '条码规格名称', width: 24, kind: 'text' },
     { key: 'lengthCm', label: '长（CM）', width: 12, kind: 'number' },
     { key: 'widthCm', label: '宽（CM）', width: 12, kind: 'number' },
     { key: 'heightCm', label: '高（CM）', width: 12, kind: 'number' },

From d4d26c43bf593991ccf1944cb80f953ec33a0f7c Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Mon, 7 Sep 2026 16:38:54 +0800
Subject: [PATCH 14/16] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=96=B0?=
 =?UTF-8?q?=E5=93=81=E6=8E=A8=E8=8D=90=EF=BC=9A=E6=96=B0=E5=A2=9E=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E6=95=B0=E6=8D=AE=E7=9C=8B=E6=9D=BF=E4=B8=8EPK?=
 =?UTF-8?q?=E6=A6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

看板双视图（明细数据/采购看板，仅采购与管理可见看板）；按月聚合采购推荐SKU/涉及工厂/被选款/被选率；路径行明细支持工厂勾选后跳转明细数据；被选款数量卡片跳转已选明细；PK榜爬山形态铺满全屏，管理员可配置主题/总金额/层级门槛与金额/规则说明（存 SystemConfig，无迁移）。
---
 .../dashboard/route.ts                        |  17 ++
 .../pk-board/config/route.ts                  |  18 ++
 .../pk-board/route.ts                         |  17 ++
 .../SupplierRecommendedProductsClient.tsx     |  68 +++--
 .../SupplierRecommendedProductDashboard.tsx   | 240 ++++++++++++++++++
 .../SupplierRecommendedProductPkBoard.tsx     |  81 ++++++
 ...pplierRecommendedProductPkConfigDialog.tsx |  94 +++++++
 .../supplier-recommended-products/page.tsx    |   3 +-
 .../supplier-recommended-products.css         |  38 ++-
 .../src/lib/supplier-recommended-products.ts  | 118 +++++++++
 .../lib/supply-chain-permission-settings.ts   |   2 +-
 ...plier-recommended-products.service.test.ts | 106 ++++++++
 .../supplier-recommended-products.service.ts  | 159 +++++++++++-
 13 files changed, 937 insertions(+), 24 deletions(-)
 create mode 100644 furniture-3d-system/src/app/api/supply-chain/supplier-recommended-products/dashboard/route.ts
 create mode 100644 furniture-3d-system/src/app/api/supply-chain/supplier-recommended-products/pk-board/config/route.ts
 create mode 100644 furniture-3d-system/src/app/api/supply-chain/supplier-recommended-products/pk-board/route.ts
 create mode 100644 furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductDashboard.tsx
 create mode 100644 furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductPkBoard.tsx
 create mode 100644 furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductPkConfigDialog.tsx

diff --git a/furniture-3d-system/src/app/api/supply-chain/supplier-recommended-products/dashboard/route.ts b/furniture-3d-system/src/app/api/supply-chain/supplier-recommended-products/dashboard/route.ts
new file mode 100644
index 00000000..fab49968
--- /dev/null
+++ b/furniture-3d-system/src/app/api/supply-chain/supplier-recommended-products/dashboard/route.ts
@@ -0,0 +1,17 @@
+import { NextRequest } from 'next/server'
+import { z } from 'zod'
+import { ErrorCode } from '@/server/core/errors'
+import { handleRequest, jsonError, jsonSuccess } from '@/server/core/response'
+import { supplierRecommendedProductsService } from '@/server/services/supplier-recommended-products.service'
+
+const dashboardSchema = z.object({
+  month: z.string().trim().regex(/^\d{4}-\d{2}$/, '月份格式应为 YYYY-MM').optional(),
+})
+
+export async function GET(request: NextRequest) {
+  return handleRequest(request, async (ctx) => {
+    const parsed = dashboardSchema.safeParse(Object.fromEntries(request.nextUrl.searchParams.entries()))
+    if (!parsed.success) return jsonError(ErrorCode.VALIDATION_INVALID_FORMAT, '看板月份参数不正确', 400, ctx.requestId)
+    return jsonSuccess(await supplierRecommendedProductsService.getDashboard(parsed.data.month, ctx.user), 200, ctx.requestId)
+  }, { requireAuth: true })
+}
diff --git a/furniture-3d-system/src/app/api/supply-chain/supplier-recommended-products/pk-board/config/route.ts b/furniture-3d-system/src/app/api/supply-chain/supplier-recommended-products/pk-board/config/route.ts
new file mode 100644
index 00000000..e45672bf
--- /dev/null
+++ b/furniture-3d-system/src/app/api/supply-chain/supplier-recommended-products/pk-board/config/route.ts
@@ -0,0 +1,18 @@
+import { NextRequest } from 'next/server'
+import { ErrorCode } from '@/server/core/errors'
+import { handleRequest, jsonError, jsonSuccess } from '@/server/core/response'
+import { supplierRecommendedProductsService } from '@/server/services/supplier-recommended-products.service'
+
+export async function GET(request: NextRequest) {
+  return handleRequest(request, async (ctx) => {
+    return jsonSuccess(await supplierRecommendedProductsService.getPkConfig(), 200, ctx.requestId)
+  }, { requireAuth: true })
+}
+
+export async function PUT(request: NextRequest) {
+  return handleRequest(request, async (ctx) => {
+    const body = await request.json().catch(() => null)
+    if (!body || typeof body !== 'object') return jsonError(ErrorCode.VALIDATION_INVALID_FORMAT, 'PK榜配置格式不正确', 400, ctx.requestId)
+    return jsonSuccess(await supplierRecommendedProductsService.updatePkConfig(body, ctx.user), 200, ctx.requestId)
+  }, { requireAuth: true })
+}
diff --git a/furniture-3d-system/src/app/api/supply-chain/supplier-recommended-products/pk-board/route.ts b/furniture-3d-system/src/app/api/supply-chain/supplier-recommended-products/pk-board/route.ts
new file mode 100644
index 00000000..04ecc1e2
--- /dev/null
+++ b/furniture-3d-system/src/app/api/supply-chain/supplier-recommended-products/pk-board/route.ts
@@ -0,0 +1,17 @@
+import { NextRequest } from 'next/server'
+import { z } from 'zod'
+import { ErrorCode } from '@/server/core/errors'
+import { handleRequest, jsonError, jsonSuccess } from '@/server/core/response'
+import { supplierRecommendedProductsService } from '@/server/services/supplier-recommended-products.service'
+
+const pkBoardSchema = z.object({
+  month: z.string().trim().regex(/^\d{4}-\d{2}$/, '月份格式应为 YYYY-MM').optional(),
+})
+
+export async function GET(request: NextRequest) {
+  return handleRequest(request, async (ctx) => {
+    const parsed = pkBoardSchema.safeParse(Object.fromEntries(request.nextUrl.searchParams.entries()))
+    if (!parsed.success) return jsonError(ErrorCode.VALIDATION_INVALID_FORMAT, 'PK榜月份参数不正确', 400, ctx.requestId)
+    return jsonSuccess(await supplierRecommendedProductsService.getPkBoard(parsed.data.month, ctx.user), 200, ctx.requestId)
+  }, { requireAuth: true })
+}
diff --git a/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/SupplierRecommendedProductsClient.tsx b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/SupplierRecommendedProductsClient.tsx
index 6cdf3699..c9fd87ea 100644
--- a/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/SupplierRecommendedProductsClient.tsx
+++ b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/SupplierRecommendedProductsClient.tsx
@@ -5,6 +5,7 @@ import { BadgeCheck, FileDown, Grid2X2, List, Plus, RotateCcw, Search, Trash2, U
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { EMPTY_SUPPLIER_RECOMMENDED_PRODUCT_FILTERS, type SupplierRecommendedProductChangeLogEntry, type SupplierRecommendedProductFilters, type SupplierRecommendedProductOperator, type SupplierRecommendedProductPage, type SupplierRecommendedProductRow } from '@/lib/supplier-recommended-products'
 import { SupplierRecommendedProductColumnSettings } from './components/SupplierRecommendedProductColumnSettings'
+import { SupplierRecommendedProductDashboard } from './components/SupplierRecommendedProductDashboard'
 import { SupplierRecommendedProductCardGrid } from './components/SupplierRecommendedProductCardGrid'
 import { SupplierRecommendedProductDeleteDialog } from './components/SupplierRecommendedProductDeleteDialog'
 import { SupplierRecommendedProductDetailDialog } from './components/SupplierRecommendedProductDetailDialog'
@@ -36,9 +37,10 @@ function openDatePicker(event: React.MouseEvent<HTMLInputElement>) {
   }
 }
 
-export function SupplierRecommendedProductsClient({ initialData, canEdit, canDownload, canSelect, currentUser }: { initialData: SupplierRecommendedProductPage; canEdit: boolean; canDownload: boolean; canSelect: boolean; currentUser: { id: string; name: string } }) {
+export function SupplierRecommendedProductsClient({ initialData, canEdit, canDownload, canSelect, canViewDashboard, currentUser }: { initialData: SupplierRecommendedProductPage; canEdit: boolean; canDownload: boolean; canSelect: boolean; canViewDashboard: boolean; currentUser: { id: string; name: string } }) {
   const [data, setData] = useState(initialData)
   const [filters, setFilters] = useState<SupplierRecommendedProductFilters>({ ...EMPTY_SUPPLIER_RECOMMENDED_PRODUCT_FILTERS })
+  const [pageView, setPageView] = useState<'list' | 'dashboard'>(canViewDashboard ? 'dashboard' : 'list')
   const [editor, setEditor] = useState<SupplierRecommendedProductRow | 'new' | null>(null)
   const [logs, setLogs] = useState<SupplierRecommendedProductChangeLogEntry[] | null>(null)
   const [preview, setPreview] = useState<SupplierRecommendedProductRow | null>(null)
@@ -117,6 +119,22 @@ export function SupplierRecommendedProductsClient({ initialData, canEdit, canDow
     void load({ ...filters, selection }, 1, data.pageInfo.pageSize)
   }
 
+  // 看板点击「被选款数量」：跳到明细数据并筛出已选
+  const openSelectedInList = () => {
+    setPageView('list')
+    if (filters.selection !== 'selected') {
+      void load({ ...filters, selection: 'selected' }, 1, data.pageInfo.pageSize)
+    }
+  }
+
+  // 看板点击「涉及工厂」：跳到明细数据并按当月涉及的工厂 + 月份范围筛选
+  const openFactoriesInList = (factories: string[], month: string) => {
+    setPageView('list')
+    const [year, monthNumber] = month.split('-').map(Number)
+    const lastDay = new Date(Date.UTC(year, monthNumber, 0)).getUTCDate()
+    void load({ ...filters, supplier: factories, selection: 'all', dateFrom: `${month}-01`, dateTo: `${month}-${String(lastDay).padStart(2, '0')}` }, 1, data.pageInfo.pageSize)
+  }
+
   const submitSelection = async (action: 'select' | 'return', selectedOperator?: SupplierRecommendedProductOperator) => {
     const ids = [...selectedIds]
     if (ids.length === 0 || selectionBusy) return
@@ -150,6 +168,26 @@ export function SupplierRecommendedProductsClient({ initialData, canEdit, canDow
     void submitSelection(action)
   }
 
+  const downloadExportFile = async (query: URLSearchParams) => {
+    const response = await fetch(`/api/supply-chain/supplier-recommended-products/export?${query}`, { cache: 'no-store' })
+    if (!response.ok) {
+      const payload = await response.json().catch(() => null)
+      throw new Error(payload?.error?.message || '导出失败')
+    }
+    const blob = await response.blob()
+    const disposition = response.headers.get('Content-Disposition') || ''
+    const match = /filename\*=UTF-8''([^;]+)/.exec(disposition)
+    const filename = match ? decodeURIComponent(match[1]) : '供应商新品推荐导出.xlsx'
+    const url = URL.createObjectURL(blob)
+    const anchor = document.createElement('a')
+    anchor.href = url
+    anchor.download = filename
+    document.body.appendChild(anchor)
+    anchor.click()
+    anchor.remove()
+    URL.revokeObjectURL(url)
+  }
+
   const exportSelected = async () => {
     if (exportingSelected) return
     setExportingSelected(true)
@@ -160,23 +198,7 @@ export function SupplierRecommendedProductsClient({ initialData, canEdit, canDow
           if (value.length) params.set(key, value.join(','))
         } else if (value) params.set(key, String(value))
       })
-      const response = await fetch(`/api/supply-chain/supplier-recommended-products/export?${params}`, { cache: 'no-store' })
-      if (!response.ok) {
-        const payload = await response.json().catch(() => null)
-        throw new Error(payload?.error?.message || '导出失败')
-      }
-      const blob = await response.blob()
-      const disposition = response.headers.get('Content-Disposition') || ''
-      const match = /filename\*=UTF-8''([^;]+)/.exec(disposition)
-      const filename = match ? decodeURIComponent(match[1]) : '供应商新品推荐导出.xlsx'
-      const url = URL.createObjectURL(blob)
-      const anchor = document.createElement('a')
-      anchor.href = url
-      anchor.download = filename
-      document.body.appendChild(anchor)
-      anchor.click()
-      anchor.remove()
-      URL.revokeObjectURL(url)
+      await downloadExportFile(params)
       setFeedback({ tone: 'success', message: '导出成功，文件已开始下载' })
     } catch (error) {
       setFeedback({ tone: 'error', message: error instanceof Error ? error.message : '导出失败' })
@@ -216,8 +238,12 @@ export function SupplierRecommendedProductsClient({ initialData, canEdit, canDow
   const commitPage = () => { const parsed = Number(pageInput); if (!Number.isFinite(parsed)) return setPageInput(String(data.pageInfo.page)); const page = Math.min(Math.max(1, Math.trunc(parsed)), data.pageInfo.totalPages); setPageInput(String(page)); if (page !== data.pageInfo.page) void load(filters, page, data.pageInfo.pageSize) }
   return <main className="recommended-products-page">
     <header className="recommended-products-toolbar">
-      <div><h1>供应商新品推荐</h1><p>维护供应商自荐产品资料、寄样和发货信息</p></div>
+      {canViewDashboard && <div className="recommended-page-switch" role="group" aria-label="切换页面视图">
+        <button type="button" aria-pressed={pageView === 'list'} onClick={() => setPageView('list')} className={pageView === 'list' ? 'recommended-page-switch-active' : ''}>明细数据</button>
+        <button type="button" aria-pressed={pageView === 'dashboard'} onClick={() => setPageView('dashboard')} className={pageView === 'dashboard' ? 'recommended-page-switch-active' : ''}>采购看板</button>
+      </div>}
       <div className="recommended-products-actions">
+        {pageView === 'list' && <>
         <div className="recommended-selection-switch" role="group" aria-label="选款池切换">
           {(['all', 'unselected', 'selected', 'discarded'] as const).map((selection) => <button key={selection} type="button" aria-pressed={filters.selection === selection} onClick={() => changeSelectionFilter(selection)} className={filters.selection === selection ? 'recommended-selection-switch-active' : ''}>{selection === 'all' ? '全部' : selection === 'unselected' ? '未选' : selection === 'selected' ? '已选' : '废弃'}</button>)}
         </div>
@@ -231,9 +257,12 @@ export function SupplierRecommendedProductsClient({ initialData, canEdit, canDow
         </>}
         {canSelect && <button type="button" disabled={selectedIds.size === 0 || loading || selectionBusy} onClick={updateSelection} className="recommended-control-button">{filters.selection === 'selected' ? <Undo2 size={15} /> : <BadgeCheck size={15} />}{filters.selection === 'selected' ? `批量退回${selectedIds.size ? `（${selectedIds.size}）` : ''}` : `批量选款${selectedIds.size ? `（${selectedIds.size}）` : ''}`}</button>}
         {canDownload && filters.selection === 'selected' && <button type="button" disabled={exportingSelected || loading} onClick={() => void exportSelected()} className="recommended-control-button"><FileDown size={15} />{exportingSelected ? '导出中…' : '导出'}</button>}
+        </>}
       </div>
     </header>
     <SupplierRecommendedProductFeedback feedback={feedback} onDismiss={dismissFeedback} />
+    {pageView === 'dashboard' && <SupplierRecommendedProductDashboard onOpenSelected={openSelectedInList} onOpenFactories={openFactoriesInList} />}
+    {pageView === 'list' && <>
     <form className="recommended-products-filters" onSubmit={(event) => { event.preventDefault(); void load(filters, 1, data.pageInfo.pageSize) }}>
       <input value={filters.search} onChange={(event) => setFilters({ ...filters, search: event.target.value })} placeholder="搜索供应商、采购、产品代码、材质或发货模式" />
       <SupplierRecommendedProductMultiSelect label="类目" options={data.options.categories} values={filters.category} onChange={(category) => setFilters({ ...filters, category })} />
@@ -253,6 +282,7 @@ export function SupplierRecommendedProductsClient({ initialData, canEdit, canDow
       {viewMode === 'table' ? <SupplierRecommendedProductTable rows={data.rows} columns={columns.visibleColumns} canEdit={canEdit} canSelect={canSelect} selectionMode={filters.selection} deletingId={deletingId} selectedIds={selectedIds} allSelected={selectableRows.length > 0 && selectableRows.every((row) => selectedIds.has(row.id))} onToggleSelection={toggleSelection} onToggleAll={toggleAllSelection} onOpenDetail={setDetail} onEdit={setEditor} onDelete={remove} onHistory={(row) => void openHistory(row)} onPreview={setPreview} /> : <SupplierRecommendedProductCardGrid rows={data.rows} canEdit={canEdit} canSelect={canSelect} selectionMode={filters.selection} deletingId={deletingId} selectedIds={selectedIds} onToggleSelection={toggleSelection} onOpenDetail={setDetail} onEdit={(row) => setEditor(row)} onDelete={remove} onHistory={(row) => void openHistory(row)} />}
       <SupplierRecommendedProductPagination {...data.pageInfo} loading={loading} pageInput={pageInput} onPageInput={setPageInput} onCommitPage={commitPage} onPage={(page) => void load(filters, page, data.pageInfo.pageSize)} onPageSize={(pageSize) => void load(filters, 1, pageSize)} />
     </section>
+    </>}
     {editor && <SupplierRecommendedProductEditor item={editor === 'new' ? null : editor} onClose={() => setEditor(null)} onSaved={() => { setEditor(null); void load(filters, data.pageInfo.page, data.pageInfo.pageSize) }} />}
     {detail && <SupplierRecommendedProductDetailDialog row={detail} canEdit={canEdit} onClose={() => setDetail(null)} onEdit={(row) => { setDetail(null); setEditor(row) }} onDelete={(row) => { setDetail(null); remove(row) }} onHistory={(row) => { setDetail(null); void openHistory(row) }} onPreview={(row) => setPreview(row)} />}
     {logs && <SupplierRecommendedProductHistoryDialog logs={logs} onClose={() => setLogs(null)} />}
diff --git a/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductDashboard.tsx b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductDashboard.tsx
new file mode 100644
index 00000000..43c54f47
--- /dev/null
+++ b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductDashboard.tsx
@@ -0,0 +1,240 @@
+'use client'
+
+import { ChevronDown, ChevronRight, LoaderCircle, Table2, Trophy } from 'lucide-react'
+import { Fragment, useCallback, useEffect, useState } from 'react'
+import type { SupplierRecommendedProductDashboard, SupplierRecommendedProductDashboardRow } from '@/lib/supplier-recommended-products'
+import { SupplierRecommendedProductPkBoard } from './SupplierRecommendedProductPkBoard'
+
+type BoardView = 'table' | 'pk'
+
+const BOARD_VIEW_STORAGE_KEY = 'supply-chain:supplier-recommended-products:dashboard-view'
+
+type Props = {
+  onOpenSelected: () => void
+  onOpenFactories: (factories: string[], month: string) => void
+}
+
+type PathRow = {
+  key: string
+  factory: string
+  category: string
+  material: string
+  skuCount: number
+  selectedCount: number
+}
+
+function flattenPaths(row: SupplierRecommendedProductDashboardRow): PathRow[] {
+  const paths: PathRow[] = []
+  for (const factory of row.factories) {
+    for (const category of factory.categories) {
+      const materialSku = category.materials.reduce((sum, material) => sum + material.skuCount, 0)
+      const materialSelected = category.materials.reduce((sum, material) => sum + material.selectedCount, 0)
+      if (category.skuCount > materialSku || category.selectedCount > materialSelected) {
+        paths.push({
+          key: `${factory.factory}/${category.category}`,
+          factory: factory.factory,
+          category: category.category,
+          material: '',
+          skuCount: category.skuCount - materialSku,
+          selectedCount: category.selectedCount - materialSelected,
+        })
+      }
+      for (const material of category.materials) {
+        paths.push({
+          key: `${factory.factory}/${category.category}/${material.material}`,
+          factory: factory.factory,
+          category: category.category,
+          material: material.material,
+          skuCount: material.skuCount,
+          selectedCount: material.selectedCount,
+        })
+      }
+    }
+  }
+  return paths
+}
+
+function currentMonthValue(now = new Date()) {
+  return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}`
+}
+
+export function SupplierRecommendedProductDashboard({ onOpenSelected, onOpenFactories }: Props) {
+  const [month, setMonth] = useState(currentMonthValue())
+  const [data, setData] = useState<SupplierRecommendedProductDashboard | null>(null)
+  const [loading, setLoading] = useState(false)
+  const [error, setError] = useState('')
+  const [expandedPurchasers, setExpandedPurchasers] = useState<ReadonlySet<string>>(() => new Set())
+  const [selectMode, setSelectMode] = useState(false)
+  const [checkedPaths, setCheckedPaths] = useState<ReadonlySet<string>>(() => new Set())
+  const [boardView, setBoardView] = useState<BoardView>('table')
+
+  // 浏览器本地偏好需在水合后读取，避免 SSR 阶段访问 localStorage
+  /* eslint-disable react-hooks/set-state-in-effect */
+  useEffect(() => {
+    try {
+      const stored = window.localStorage.getItem(BOARD_VIEW_STORAGE_KEY)
+      if (stored === 'table' || stored === 'pk') setBoardView(stored)
+    } catch {
+      // 本地存储不可用时保持默认表格形态
+    }
+  }, [])
+  /* eslint-enable react-hooks/set-state-in-effect */
+
+  const changeBoardView = (next: BoardView) => {
+    setBoardView(next)
+    try {
+      window.localStorage.setItem(BOARD_VIEW_STORAGE_KEY, next)
+    } catch {
+      // 本地存储不可用时仅当前会话生效
+    }
+  }
+
+  const load = useCallback(async (targetMonth: string) => {
+    setLoading(true)
+    setError('')
+    try {
+      const response = await fetch(`/api/supply-chain/supplier-recommended-products/dashboard?month=${encodeURIComponent(targetMonth)}`, { cache: 'no-store' })
+      const payload = await response.json().catch(() => null)
+      if (!response.ok || !payload?.success) throw new Error(payload?.error?.message || '看板数据加载失败')
+      setData(payload.data as SupplierRecommendedProductDashboard)
+    } catch (requestError) {
+      setData(null)
+      setError(requestError instanceof Error ? requestError.message : '看板数据加载失败')
+    } finally {
+      setLoading(false)
+    }
+  }, [])
+
+  useEffect(() => {
+    void load(month)
+  }, [month, load])
+
+  const togglePurchaser = (key: string) => setExpandedPurchasers((current) => {
+    const next = new Set(current)
+    if (next.has(key)) next.delete(key)
+    else next.add(key)
+    return next
+  })
+  const allExpanded = data !== null && data.rows.length > 0 && expandedPurchasers.size >= data.rows.length
+  const expandAll = () => setExpandedPurchasers(new Set(data?.rows.map((row) => row.purchaser) ?? []))
+  const collapseAll = () => setExpandedPurchasers(new Set())
+  const totals = data?.totals
+
+  const toggleSelectMode = () => setSelectMode((current) => {
+    const next = !current
+    if (next) {
+      setExpandedPurchasers(new Set(data?.rows.map((row) => row.purchaser) ?? []))
+    } else {
+      setCheckedPaths(new Set())
+      setExpandedPurchasers(new Set())
+    }
+    return next
+  })
+  const togglePath = (key: string) => setCheckedPaths((current) => {
+    const next = new Set(current)
+    if (next.has(key)) next.delete(key)
+    else next.add(key)
+    return next
+  })
+  const checkedFactories = [...new Set([...checkedPaths].map((key) => (key.split('::')[1] ?? key).split('/')[0]))]
+
+  return <div className="recommended-dashboard">
+    <div className="recommended-dashboard-toolbar">
+      <label className="recommended-dashboard-month">
+        <span>月份</span>
+        <input type="month" value={month} onChange={(event) => { if (event.target.value) setMonth(event.target.value) }} />
+      </label>
+      {totals && <div className="recommended-dashboard-stats">
+        <div className="recommended-dashboard-stat"><span>推荐SKU</span><strong>{totals.skuCount}</strong></div>
+        <button
+          type="button"
+          className="recommended-dashboard-stat"
+          onClick={toggleSelectMode}
+          aria-expanded={selectMode}
+          title={selectMode ? '退出工厂勾选' : '勾选工厂查看明细'}
+        >
+          <span>涉及工厂{selectMode ? ' · 勾选模式' : ''}</span>
+          <strong>{totals.factoryCount}</strong>
+        </button>
+        <button
+          type="button"
+          className="recommended-dashboard-stat"
+          onClick={onOpenSelected}
+          title="查看已选款明细"
+        >
+          <span>被选款数量</span>
+          <strong>{totals.selectedCount}</strong>
+        </button>
+        <div className="recommended-dashboard-stat"><span>被选率</span><strong>{totals.selectedRate}%</strong></div>
+      </div>}
+      <div className="recommended-dashboard-toolbar-actions">
+        {boardView === 'table' && data && data.rows.length > 0 && <Fragment>
+          <button type="button" className="recommended-control-button" onClick={expandAll} disabled={allExpanded}>展开</button>
+          <button type="button" className="recommended-control-button" onClick={collapseAll} disabled={expandedPurchasers.size === 0}>收起</button>
+        </Fragment>}
+        {selectMode && <Fragment>
+          <button type="button" className="recommended-primary-button" disabled={checkedFactories.length === 0} onClick={() => onOpenFactories(checkedFactories, month)}>查看明细（{checkedFactories.length}）</button>
+          <button type="button" className="recommended-control-button" onClick={toggleSelectMode}>取消勾选</button>
+        </Fragment>}
+        <div className="recommended-view-switch" role="group" aria-label="切换看板形态">
+          <button type="button" title="表格视图" aria-pressed={boardView === 'table'} onClick={() => changeBoardView('table')} className={boardView === 'table' ? 'recommended-view-switch-active' : ''}><Table2 size={16} /></button>
+          <button type="button" title="PK榜视图" aria-pressed={boardView === 'pk'} onClick={() => changeBoardView('pk')} className={boardView === 'pk' ? 'recommended-view-switch-active' : ''}><Trophy size={16} /></button>
+        </div>
+      </div>
+    </div>
+    {loading && <div className="recommended-dashboard-state"><LoaderCircle size={16} className="recommended-spin" />加载中</div>}
+    {!loading && error && <div className="recommended-dashboard-state recommended-dashboard-state-error">{error}</div>}
+    {!loading && !error && boardView === 'pk' && <div className="recommended-dashboard-scroll"><SupplierRecommendedProductPkBoard month={month} /></div>}
+    {!loading && !error && boardView === 'table' && data && <div className="recommended-dashboard-scroll">
+      <table className="recommended-dashboard-table">
+        <thead>
+          <tr>
+            <th className="recommended-dashboard-expand-cell" aria-hidden="true"></th>
+            <th>采购</th>
+            <th>工厂</th>
+            <th>类目</th>
+            <th>材质</th>
+            <th>SKU数量</th>
+            <th>被选款数量</th>
+            <th>业绩</th>
+            <th>SABC评级</th>
+          </tr>
+        </thead>
+        <tbody>
+          {data.rows.length === 0 && <tr><td colSpan={9} className="recommended-dashboard-empty">{month} 没有推荐数据</td></tr>}
+          {data.rows.map((row) => {
+            const expanded = expandedPurchasers.has(row.purchaser)
+            return <Fragment key={row.purchaser}>
+              <tr className="recommended-dashboard-row" onClick={() => togglePurchaser(row.purchaser)} aria-expanded={expanded}>
+                <td className="recommended-dashboard-expand-cell">{expanded ? <ChevronDown size={15} aria-hidden="true" /> : <ChevronRight size={15} aria-hidden="true" />}</td>
+                <td className="recommended-dashboard-purchaser">{row.purchaser}</td>
+                <td>{row.factoryCount}</td>
+                <td className="recommended-dashboard-placeholder">—</td>
+                <td className="recommended-dashboard-placeholder">—</td>
+                <td>{row.skuCount}</td>
+                <td>{row.selectedCount}</td>
+                <td className="recommended-dashboard-placeholder">{row.performance || '—'}</td>
+                <td className="recommended-dashboard-placeholder">{row.sabcRating || '—'}</td>
+              </tr>
+              {expanded && flattenPaths(row).map((path) => {
+                const rowKey = `${row.purchaser}::${path.key}`
+                return <tr key={rowKey} className={checkedPaths.has(rowKey) ? 'recommended-dashboard-path-row recommended-dashboard-path-row-checked' : 'recommended-dashboard-path-row'}>
+                  <td className="recommended-dashboard-expand-cell">{selectMode && <input type="checkbox" checked={checkedPaths.has(rowKey)} onChange={() => togglePath(rowKey)} aria-label={`选择 ${path.factory} ${path.category}${path.material ? ` ${path.material}` : ''}`} />}</td>
+                  <td></td>
+                  <td className="recommended-dashboard-cell-factory">{path.factory}</td>
+                  <td className="recommended-dashboard-cell-category">{path.category}</td>
+                  <td className="recommended-dashboard-cell-material">{path.material || '—'}</td>
+                  <td>{path.skuCount}</td>
+                  <td>{path.selectedCount}</td>
+                  <td className="recommended-dashboard-placeholder"></td>
+                  <td className="recommended-dashboard-placeholder"></td>
+                </tr>
+              })}
+            </Fragment>
+          })}
+        </tbody>
+      </table>
+    </div>}
+    {!loading && !error && boardView === 'table' && data && <p className="recommended-dashboard-note">点击采购行展开该采购的 工厂 × 类目 × 材质 推荐明细；数据基于当月录入的推荐记录实时统计。</p>}
+  </div>
+}
diff --git a/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductPkBoard.tsx b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductPkBoard.tsx
new file mode 100644
index 00000000..90a7ac60
--- /dev/null
+++ b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductPkBoard.tsx
@@ -0,0 +1,81 @@
+'use client'
+
+import { LoaderCircle } from 'lucide-react'
+import { useCallback, useEffect, useState } from 'react'
+import { type SupplierRecommendedProductPkBoard } from '@/lib/supplier-recommended-products'
+import { SupplierRecommendedProductPkConfigDialog } from './SupplierRecommendedProductPkConfigDialog'
+
+function formatSavedAt(value: string | null) {
+  if (!value) return ''
+  const date = new Date(value)
+  if (Number.isNaN(date.getTime())) return ''
+  return new Intl.DateTimeFormat('zh-CN', { timeZone: 'Asia/Shanghai', year: 'numeric', month: '2-digit', day: '2-digit' }).format(date)
+}
+
+type Props = { month: string }
+
+export function SupplierRecommendedProductPkBoard({ month }: Props) {
+  const [board, setBoard] = useState<SupplierRecommendedProductPkBoard | null>(null)
+  const [loading, setLoading] = useState(false)
+  const [error, setError] = useState('')
+  const [configOpen, setConfigOpen] = useState(false)
+
+  const load = useCallback(async () => {
+    setLoading(true)
+    setError('')
+    try {
+      const response = await fetch(`/api/supply-chain/supplier-recommended-products/pk-board?month=${encodeURIComponent(month)}`, { cache: 'no-store' })
+      const payload = await response.json().catch(() => null)
+      if (!response.ok || !payload?.success) throw new Error(payload?.error?.message || 'PK榜数据加载失败')
+      setBoard(payload.data as SupplierRecommendedProductPkBoard)
+    } catch (requestError) {
+      setBoard(null)
+      setError(requestError instanceof Error ? requestError.message : 'PK榜数据加载失败')
+    } finally {
+      setLoading(false)
+    }
+  }, [month])
+
+  useEffect(() => {
+    void load()
+  }, [load])
+
+  const tiers = board?.config.tiers ?? []
+
+  return <div className="recommended-pk">
+    {loading && <div className="recommended-dashboard-state"><LoaderCircle size={16} className="recommended-spin" />加载中</div>}
+    {!loading && error && <div className="recommended-dashboard-state recommended-dashboard-state-error">{error}</div>}
+    {!loading && !error && board && <div className="recommended-pk-poster">
+      <div className="recommended-pk-head">
+        <div className="recommended-pk-head-fields">
+          <div className="recommended-pk-head-field"><span>主题</span><strong>{board.config.theme}</strong></div>
+          {board.config.totalAmount && <div className="recommended-pk-head-field"><span>总金额</span><strong>¥{board.config.totalAmount}</strong></div>}
+          <div className="recommended-pk-head-field"><span>更新日期</span><strong>{formatSavedAt(board.config.savedAt) || '—'}</strong></div>
+        </div>
+        {board.canConfigure && <button type="button" className="recommended-control-button" onClick={() => setConfigOpen(true)}>设置</button>}
+      </div>
+      <div className="recommended-pk-ladder">
+        {tiers.map((tier, index) => {
+          const flags = board.entries.filter((entry) => entry.tierIndex === index)
+          return <div key={`${tier.label}-${index}`} className="recommended-pk-tier" style={{ minHeight: `${(100 * (index + 1)) / Math.max(tiers.length, 1)}%` }}>
+            {tier.amount && <div className="recommended-pk-tier-amount">¥{tier.amount}</div>}
+            <div className="recommended-pk-tier-label">{tier.label}</div>
+            <div className="recommended-pk-tier-flags">
+              {flags.map((flag) => <div key={flag.purchaser} className="recommended-pk-flag">
+                <span className="recommended-pk-flag-name">{flag.purchaser}</span>
+                <span className="recommended-pk-flag-count">被选{flag.selectedCount}款</span>
+              </div>)}
+            </div>
+            <div className="recommended-pk-tier-line" aria-hidden="true"></div>
+          </div>
+        })}
+      </div>
+      {board.config.rules && <p className="recommended-pk-rules">其他规则：{board.config.rules}</p>}
+    </div>}
+    {configOpen && board && <SupplierRecommendedProductPkConfigDialog
+      config={board.config}
+      onClose={() => setConfigOpen(false)}
+      onSaved={() => { setConfigOpen(false); void load() }}
+    />}
+  </div>
+}
diff --git a/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductPkConfigDialog.tsx b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductPkConfigDialog.tsx
new file mode 100644
index 00000000..974f19e1
--- /dev/null
+++ b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/components/SupplierRecommendedProductPkConfigDialog.tsx
@@ -0,0 +1,94 @@
+'use client'
+
+import { LoaderCircle, Plus, Trash2 } from 'lucide-react'
+import { useState } from 'react'
+import { type SupplierRecommendedProductPkConfig, type SupplierRecommendedProductPkTier } from '@/lib/supplier-recommended-products'
+
+type Props = {
+  config: SupplierRecommendedProductPkConfig
+  onClose: () => void
+  onSaved: () => void
+}
+
+export function SupplierRecommendedProductPkConfigDialog({ config, onClose, onSaved }: Props) {
+  const [theme, setTheme] = useState(config.theme)
+  const [totalAmount, setTotalAmount] = useState(config.totalAmount)
+  const [rules, setRules] = useState(config.rules)
+  const [tiers, setTiers] = useState<SupplierRecommendedProductPkTier[]>(() => config.tiers.map((tier) => ({ ...tier })))
+  const [error, setError] = useState('')
+  const [saving, setSaving] = useState(false)
+
+  const updateTier = (index: number, patch: Partial<SupplierRecommendedProductPkTier>) => {
+    setTiers((current) => current.map((tier, tierIndex) => (tierIndex === index ? { ...tier, ...patch } : tier)))
+  }
+
+  const submit = async () => {
+    setSaving(true)
+    setError('')
+    try {
+      const response = await fetch('/api/supply-chain/supplier-recommended-products/pk-board/config', {
+        method: 'PUT',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          theme,
+          totalAmount,
+          rules,
+          tiers: tiers.map((tier) => ({ label: tier.label, minCount: Number(tier.minCount) || 0, amount: tier.amount })),
+        }),
+      })
+      const payload = await response.json().catch(() => null)
+      if (!response.ok || !payload?.success) throw new Error(payload?.error?.message || 'PK榜配置保存失败')
+      onSaved()
+    } catch (saveError) {
+      setError(saveError instanceof Error ? saveError.message : 'PK榜配置保存失败')
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  return <div className="recommended-operator-overlay" role="presentation" onMouseDown={(event) => { if (event.target === event.currentTarget && !saving) onClose() }}>
+    <section className="recommended-operator-dialog recommended-pk-config-dialog" role="dialog" aria-modal="true" aria-labelledby="recommended-pk-config-title">
+      <header className="recommended-operator-header">
+        <div>
+          <div className="recommended-operator-eyebrow">PK榜设置</div>
+          <h2 id="recommended-pk-config-title">主题与爬梯规则</h2>
+        </div>
+        <button type="button" title="关闭" aria-label="关闭PK榜设置" onClick={onClose} disabled={saving} className="recommended-icon-button">×</button>
+      </header>
+      <div className="recommended-pk-config-body">
+        <div className="recommended-pk-config-grid">
+          <label className="recommended-pk-config-field"><span>主题</span>
+            <input value={theme} maxLength={60} onChange={(event) => setTheme(event.target.value)} placeholder="例如：9月新品推荐PK" />
+          </label>
+          <label className="recommended-pk-config-field"><span>总金额</span>
+            <input value={totalAmount} maxLength={30} onChange={(event) => setTotalAmount(event.target.value)} placeholder="例如：10000" />
+          </label>
+        </div>
+        <div className="recommended-pk-config-tiers">
+          <div className="recommended-pk-config-tier-head"><span>层级（从低到高）</span><span>被选款门槛</span><span>金额</span><span></span></div>
+          {tiers.map((tier, index) => <div key={index} className="recommended-pk-config-tier-row">
+            <input value={tier.label} maxLength={20} aria-label={`第${index + 1}层级名称`} onChange={(event) => updateTier(index, { label: event.target.value })} />
+            <input value={String(tier.minCount)} inputMode="numeric" aria-label={`第${index + 1}层级门槛`} onChange={(event) => updateTier(index, { minCount: Number(event.target.value.replace(/[^\d]/g, '')) || 0 })} />
+            <input value={tier.amount} maxLength={20} aria-label={`第${index + 1}层级金额`} onChange={(event) => updateTier(index, { amount: event.target.value })} placeholder="如 200" />
+            <button type="button" title="删除层级" aria-label={`删除层级${tier.label}`} disabled={tiers.length <= 2} className="recommended-icon-button" onClick={() => setTiers((current) => current.filter((_, tierIndex) => tierIndex !== index))}>
+              <Trash2 size={15} aria-hidden="true" />
+            </button>
+          </div>)}
+          <button type="button" className="recommended-pk-config-add" disabled={tiers.length >= 8} onClick={() => setTiers((current) => [...current, { label: '', minCount: (current[current.length - 1]?.minCount ?? 0) + 1, amount: '' }])}>
+            <Plus size={14} aria-hidden="true" />加一层
+          </button>
+        </div>
+        <label className="recommended-pk-config-field"><span>其他规则说明（显示在榜底部）</span>
+          <textarea value={rules} maxLength={500} rows={3} onChange={(event) => setRules(event.target.value)} placeholder="例如：被选款以当月运营正式选款为准，金额为单款奖励。" />
+        </label>
+        {error && <div className="recommended-pk-config-error" role="alert">{error}</div>}
+      </div>
+      <footer className="recommended-operator-footer">
+        <button type="button" className="recommended-secondary-button" onClick={onClose} disabled={saving}>取消</button>
+        <button type="button" className="recommended-primary-button" onClick={() => { void submit() }} disabled={saving}>
+          {saving && <LoaderCircle size={14} className="recommended-spin" aria-hidden="true" />}保存
+        </button>
+      </footer>
+    </section>
+  </div>
+}
diff --git a/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/page.tsx b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/page.tsx
index 234daee4..f9be878c 100644
--- a/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/page.tsx
+++ b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/page.tsx
@@ -12,5 +12,6 @@ export default async function SupplierRecommendedProductsPage() {
   if (!access.view) redirect('/supply-chain')
   const initialData = await supplierRecommendedProductsService.listPage({ page: 1, pageSize: 50, user: authUser })
   const canSelect = await supplierRecommendedProductsService.canSelect(authUser)
-  return <SupplierRecommendedProductsClient initialData={initialData} canEdit={access.edit} canDownload={access.download} canSelect={canSelect} currentUser={{ id: authUser.id, name: authUser.name }} />
+  const canViewDashboard = await supplierRecommendedProductsService.canViewDashboard(authUser)
+  return <SupplierRecommendedProductsClient initialData={initialData} canEdit={access.edit} canDownload={access.download} canSelect={canSelect} canViewDashboard={canViewDashboard} currentUser={{ id: authUser.id, name: authUser.name }} />
 }
diff --git a/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/supplier-recommended-products.css b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/supplier-recommended-products.css
index 8017bda6..7006d43f 100644
--- a/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/supplier-recommended-products.css
+++ b/furniture-3d-system/src/app/supply-chain/purchase/supplier-recommended-products/supplier-recommended-products.css
@@ -1,5 +1,6 @@
-  .recommended-products-page{height:100%;min-height:0;display:flex;flex-direction:column;overflow:hidden;background:#f5f6f6;color:#27272a}
+  .recommended-products-page{height:100%;min-height:0;display:flex;flex-direction:column;overflow:hidden;background:#f5f6f6;color:#27272a}
   .recommended-products-toolbar{display:flex;flex-wrap:wrap;align-items:center;justify-content:space-between;gap:16px;padding:18px 24px;border-bottom:1px solid #e4e4e7;background:#fff}
+  .recommended-page-switch{display:inline-flex;height:38px;align-items:stretch;border:1px solid #d4d4d8;border-radius:7px;background:#fff;overflow:hidden}.recommended-page-switch button{border:0;background:#fff;padding:0 16px;color:#52525b;font-size:13px;font-weight:650;cursor:pointer}.recommended-page-switch button:hover{background:#f4f4f5}.recommended-page-switch button.recommended-page-switch-active{background:#27272a;color:#fff}.recommended-dashboard{display:flex;min-height:0;flex:1;flex-direction:column;gap:14px;padding:16px 24px 20px 20px;overflow:hidden}.recommended-dashboard-toolbar{display:flex;align-items:center;justify-content:space-between;gap:12px}.recommended-dashboard-month{display:inline-flex;align-items:center;gap:8px;color:#52525b;font-size:12px;font-weight:650}.recommended-dashboard-month input{height:34px;border:1px solid #d4d4d8;border-radius:5px;padding:0 10px;color:#3f3f46;font-size:12px;outline:none}.recommended-dashboard-stats{flex:1;display:flex;align-items:stretch;gap:12px;margin:0 12px;min-width:0}.recommended-dashboard-stat{flex:1;border:1px solid #e4e4e7;border-radius:6px;background:#fff;padding:6px 14px;display:flex;align-items:baseline;gap:8px;min-width:0}.recommended-dashboard-stat span{color:#71717a;font-size:12px}.recommended-dashboard-stat strong{color:#27272a;font-size:18px;font-weight:750;white-space:nowrap}button.recommended-dashboard-stat{cursor:pointer;text-align:left;font-family:inherit}button.recommended-dashboard-stat:hover{border-color:#a1a1aa}.recommended-dashboard-path-row input[type=checkbox]{width:14px;height:14px;margin:0;cursor:pointer;accent-color:#27272a;vertical-align:middle}.recommended-dashboard-path-row-checked td{background:#eef0f1}.recommended-dashboard-scroll{flex:1;min-height:0;overflow-y:auto}.recommended-dashboard-table{width:100%;border-collapse:collapse;background:#fff;font-size:12px}.recommended-dashboard-table th{background:#eef0ef;color:#52525b;font-weight:650;text-align:left;padding:10px 14px;border-bottom:1px solid #e4e4e7;white-space:nowrap}.recommended-dashboard-table td{padding:11px 14px;border-bottom:1px solid #f4f4f5;color:#3f3f46}.recommended-dashboard-row{cursor:pointer}.recommended-dashboard-row:hover td{background:#fafafa}.recommended-dashboard-expand-cell{width:34px;padding-right:0!important;color:#a1a1aa}.recommended-dashboard-purchaser{font-weight:700;color:#27272a}.recommended-dashboard-path-row:hover td{background:#f4f4f5}.recommended-dashboard-cell-factory{font-weight:600;color:#3f3f46}.recommended-dashboard-cell-category{color:#52525b}.recommended-dashboard-cell-material{color:#8b8b90}.recommended-dashboard-placeholder{color:#c9cacc}.recommended-dashboard-empty{text-align:center;color:#a1a1aa;padding:24px}.recommended-dashboard-state{display:flex;align-items:center;justify-content:center;gap:8px;min-height:200px;color:#71717a;font-size:13px}.recommended-dashboard-state-error{color:#b42318}.recommended-dashboard-note{margin:0;color:#a1a1aa;font-size:11px}
   .recommended-feedback{position:fixed;right:24px;bottom:24px;z-index:110;display:flex;width:min(360px,calc(100vw - 32px));box-sizing:border-box;align-items:flex-start;gap:10px;border:1px solid;border-radius:7px;padding:11px 12px;font-size:12px;line-height:1.5;box-shadow:0 14px 36px rgba(24,24,27,.16);animation:recommended-feedback-in .18s ease-out}.recommended-feedback-icon{margin-top:1px;flex:0 0 auto}.recommended-feedback-message{min-width:0;flex:1;overflow-wrap:anywhere}.recommended-feedback button{display:inline-flex;height:22px;width:22px;flex:0 0 auto;align-items:center;justify-content:center;border:0;border-radius:4px;background:transparent;color:inherit;cursor:pointer}.recommended-feedback button:hover{background:rgba(24,24,27,.08)}.recommended-feedback-success{border-color:#b7dec8;background:#f0faf4;color:#166534}.recommended-feedback-error{border-color:#efc0ba;background:#fff5f4;color:#b42318}.recommended-feedback-info{border-color:#c6d4e5;background:#f4f8fc;color:#28527a}@keyframes recommended-feedback-in{from{opacity:0;transform:translateY(8px)}to{opacity:1;transform:translateY(0)}}
   .recommended-products-toolbar h1{margin:0;font-size:18px;font-weight:750}.recommended-products-toolbar p{margin:4px 0 0;color:#71717a;font-size:12px}.recommended-products-actions{display:flex;flex-wrap:wrap;align-items:center;justify-content:flex-end;gap:8px}.recommended-view-switch{display:inline-flex;height:38px;align-items:stretch;border:1px solid #d4d4d8;border-radius:5px;background:#fff;overflow:hidden}.recommended-view-switch button{display:inline-flex;align-items:center;gap:5px;border:0;border-right:1px solid #e4e4e7;background:#fff;padding:0 10px;color:#71717a;font-size:12px;font-weight:600;cursor:pointer}.recommended-view-switch button:last-child{border-right:0}.recommended-view-switch button:hover{background:#f4f4f5;color:#3f3f46}.recommended-view-switch button.recommended-view-switch-active{background:#27272a;color:#fff}
   .recommended-selection-switch{display:inline-flex;height:38px;align-items:stretch;border:1px solid #d4d4d8;border-radius:5px;background:#fff;overflow:hidden}.recommended-selection-switch button{border:0;border-right:1px solid #e4e4e7;background:#fff;padding:0 11px;color:#71717a;font-size:12px;font-weight:650;cursor:pointer}.recommended-selection-switch button:last-child{border-right:0}.recommended-selection-switch button:hover{background:#f4f4f5;color:#3f3f46}.recommended-selection-switch button.recommended-selection-switch-active{background:#27272a;color:#fff}
@@ -15,3 +16,38 @@
   .recommended-operator-overlay{position:fixed;inset:0;z-index:100;display:flex;align-items:center;justify-content:center;background:rgba(24,24,27,.3);padding:16px}.recommended-operator-dialog{display:flex;width:min(520px,100%);max-height:min(82vh,680px);flex-direction:column;overflow:hidden;border:1px solid #e4e4e7;border-radius:9px;background:#f8f9f8;box-shadow:0 24px 70px rgba(24,24,27,.2)}.recommended-operator-header{display:flex;align-items:flex-start;justify-content:space-between;border-bottom:1px solid #e4e4e7;background:#fff;padding:20px 22px 16px}.recommended-operator-eyebrow{color:#a1a1aa;font-size:11px;font-weight:650}.recommended-operator-header h2{margin:3px 0 0;color:#27272a;font-size:19px;font-weight:750}.recommended-operator-header p{margin:5px 0 0;color:#71717a;font-size:12px}.recommended-operator-search{display:flex;align-items:center;gap:8px;border-bottom:1px solid #e4e4e7;background:#fff;padding:14px 22px}.recommended-operator-search>input{min-width:0;flex:1;height:36px;border:1px solid #d4d4d8;border-radius:5px;padding:0 10px;color:#27272a;font-size:12px;outline:none}.recommended-operator-search>input:focus{border-color:#71717a;box-shadow:0 0 0 2px rgba(82,82,91,.08)}.recommended-operator-search .recommended-control-button{height:36px;padding:0 11px}.recommended-operator-list{min-height:180px;flex:1;overflow-y:auto;padding:10px 14px}.recommended-operator-option{display:flex;align-items:center;gap:10px;margin:2px 0;border:1px solid transparent;border-radius:6px;background:#fff;padding:11px 12px;color:#3f3f46;cursor:pointer}.recommended-operator-option:hover,.recommended-operator-option-selected{border-color:#d4d4d8;background:#fff;box-shadow:0 2px 8px rgba(24,24,27,.06)}.recommended-operator-option input{height:16px;width:16px;accent-color:#27272a}.recommended-operator-option-copy{display:flex;min-width:0;flex:1;flex-direction:column;gap:3px}.recommended-operator-option-copy strong{font-size:13px}.recommended-operator-option-copy small{color:#71717a;font-size:11px}.recommended-operator-state{display:flex;align-items:center;justify-content:center;gap:7px;min-height:180px;color:#71717a;font-size:12px}.recommended-operator-state-error{color:#b42318}.recommended-operator-footer{display:flex;justify-content:flex-end;gap:8px;border-top:1px solid #e4e4e7;background:#fff;padding:14px 22px}.recommended-operator-footer .recommended-primary-button,.recommended-operator-footer .recommended-secondary-button{height:36px}
   .recommended-delete-overlay{position:fixed;inset:0;z-index:100;display:flex;width:100vw;min-height:100dvh;align-items:center;justify-content:center;background:rgba(24,24,27,.28);padding:16px;box-sizing:border-box}.recommended-delete-dialog{width:min(440px,100%);box-sizing:border-box;border:1px solid #e4e4e7;border-radius:8px;background:#fff;box-shadow:0 20px 50px rgba(24,24,27,.2)}.recommended-delete-dialog-header{display:flex;align-items:flex-start;gap:11px;padding:20px 20px 14px}.recommended-delete-dialog-header h2{margin:0;color:#27272a;font-size:15px;font-weight:700}.recommended-delete-dialog-header p{margin:6px 0 0;color:#71717a;font-size:12px;line-height:1.6}.recommended-delete-dialog-icon{display:flex;height:30px;width:30px;flex:0 0 auto;align-items:center;justify-content:center;border-radius:50%;background:#fff1f0;color:#b42318}.recommended-delete-dialog-header .recommended-column-close{margin-left:auto;flex:0 0 auto}.recommended-delete-dialog-actions{display:flex;justify-content:flex-end;gap:8px;border-top:1px solid #f4f4f5;padding:14px 20px}.recommended-delete-dialog-actions .recommended-primary-button{border-color:#b42318;background:#b42318}.recommended-delete-dialog-actions .recommended-primary-button:hover{border-color:#912018;background:#912018}.recommended-spin{animation:recommended-spin .9s linear infinite}@keyframes recommended-spin{to{transform:rotate(360deg)}}
   @media(max-width:1280px){.recommended-products-filters{grid-template-columns:repeat(4,minmax(140px,1fr))}.recommended-products-filters>input:first-child{grid-column:span 2}}@media(max-width:760px){.recommended-products-toolbar{align-items:flex-start;padding:14px}.recommended-products-actions{justify-content:flex-start}.recommended-products-filters{grid-template-columns:1fr 1fr;padding:10px 14px}.recommended-products-filters>input:first-child{grid-column:1/-1}.recommended-products-table-shell{margin:10px 0 10px 10px}.recommended-products-table-shell>div:first-child{padding-bottom:72px}.recommended-products-card-grid{padding:12px}.recommended-product-card-list{grid-template-columns:1fr}.recommended-product-card-image{height:220px}.recommended-detail-overlay{padding:0}.recommended-detail-dialog{max-height:100dvh;border-radius:0}.recommended-detail-header,.recommended-detail-content,.recommended-detail-footer{padding-left:14px;padding-right:14px}.recommended-detail-grid{grid-template-columns:1fr}.recommended-page-button{padding:0 7px}.recommended-products-toolbar p{display:none}.recommended-feedback{right:14px;bottom:calc(76px + env(safe-area-inset-bottom));width:calc(100vw - 28px)}}
+
+/* ===== 采购看板PK榜海报 ===== */
+.recommended-dashboard-toolbar-actions{display:flex;align-items:center;gap:12px;margin-left:auto}
+.recommended-pk{display:flex;flex-direction:column;gap:12px;height:100%;min-height:0}
+.recommended-pk-poster{flex:1;min-height:0;border:1px solid #e4e4e7;border-radius:10px;background:#fff;padding:20px 24px;display:flex;flex-direction:column;gap:18px}
+.recommended-pk-head{display:flex;align-items:flex-start;justify-content:space-between;gap:12px}
+.recommended-pk-head-fields{display:flex;flex-wrap:wrap;gap:10px 28px}
+.recommended-pk-head-field{display:flex;align-items:baseline;gap:8px}
+.recommended-pk-head-field span{color:#71717a;font-size:12px}
+.recommended-pk-head-field strong{color:#18181b;font-size:15px;font-weight:700}
+.recommended-pk-ladder{flex:1;min-height:420px;display:flex;align-items:flex-end;gap:10px;padding:6px 4px 0;border-bottom:2px solid #27272a}
+.recommended-pk-tier{flex:1;min-width:0;display:flex;flex-direction:column;align-items:center;gap:8px}
+
+.recommended-pk-tier-amount{border:1.5px solid #27272a;border-radius:6px;background:#fff;padding:2px 12px;font-size:13px;font-weight:700;color:#18181b;white-space:nowrap}
+.recommended-pk-tier-label{background:#27272a;color:#fff;border-radius:6px;padding:4px 16px;font-size:13px;font-weight:700;letter-spacing:3px;white-space:nowrap}
+.recommended-pk-tier-line{width:2px;flex:1;min-height:12px;background:#27272a;border-radius:1px}
+.recommended-pk-tier-flags{display:flex;flex-direction:column;align-items:center;gap:6px}
+.recommended-pk-flag{display:flex;flex-direction:column;align-items:center;gap:2px;background:#18181b;color:#fff;border-radius:8px;padding:7px 14px;box-shadow:0 1px 2px rgba(24,24,27,.18)}
+.recommended-pk-flag-name{font-size:13px;font-weight:650}
+.recommended-pk-flag-count{font-size:11px;color:#d4d4d8}
+.recommended-pk-rules{position:sticky;bottom:0;z-index:5;margin:0;background:#fff;border-top:1px dashed #d4d4d8;padding:10px 2px;color:#52525b;font-size:12px;line-height:1.7}
+.recommended-pk-config-dialog{width:min(560px,94vw);max-height:88vh}
+.recommended-pk-config-body{display:flex;flex-direction:column;gap:14px;overflow:auto;padding:14px 2px}
+.recommended-pk-config-grid{display:grid;grid-template-columns:1fr 1fr;gap:12px}
+.recommended-pk-config-field{display:flex;flex-direction:column;gap:6px;color:#52525b;font-size:12px}
+.recommended-pk-config-field input,.recommended-pk-config-field textarea{border:1px solid #d4d4d8;border-radius:6px;padding:7px 10px;font-size:13px;color:#3f3f46;outline:none;font-family:inherit;resize:vertical}
+.recommended-pk-config-field input:focus,.recommended-pk-config-field textarea:focus{border-color:#a1a1aa}
+.recommended-pk-config-tiers{display:flex;flex-direction:column;gap:8px}
+.recommended-pk-config-tier-head,.recommended-pk-config-tier-row{display:grid;grid-template-columns:1.2fr .8fr .8fr 34px;gap:8px;align-items:center}
+.recommended-pk-config-tier-head{color:#71717a;font-size:11px;padding:0 2px}
+.recommended-pk-config-tier-row input{height:34px;border:1px solid #d4d4d8;border-radius:6px;padding:0 10px;font-size:13px;color:#3f3f46;outline:none;min-width:0}
+.recommended-pk-config-add{align-self:flex-start;display:inline-flex;align-items:center;gap:6px;border:1px dashed #a1a1aa;border-radius:6px;background:#fff;color:#52525b;font-size:12px;padding:6px 12px;cursor:pointer}
+.recommended-pk-config-add:disabled{opacity:.45;cursor:not-allowed}
+.recommended-pk-config-error{border:1px solid #fecaca;border-radius:6px;background:#fef2f2;color:#b91c1c;font-size:12px;padding:8px 12px}
+
diff --git a/furniture-3d-system/src/lib/supplier-recommended-products.ts b/furniture-3d-system/src/lib/supplier-recommended-products.ts
index 5081dce1..fdf09232 100644
--- a/furniture-3d-system/src/lib/supplier-recommended-products.ts
+++ b/furniture-3d-system/src/lib/supplier-recommended-products.ts
@@ -74,6 +74,90 @@ export type SupplierRecommendedProductOperator = {
   departmentName: string
 }
 
+export type SupplierRecommendedProductDashboardMaterial = {
+  material: string
+  skuCount: number
+  selectedCount: number
+}
+
+export type SupplierRecommendedProductDashboardCategory = {
+  category: string
+  skuCount: number
+  selectedCount: number
+  materials: SupplierRecommendedProductDashboardMaterial[]
+}
+
+export type SupplierRecommendedProductDashboardFactory = {
+  factory: string
+  skuCount: number
+  selectedCount: number
+  categories: SupplierRecommendedProductDashboardCategory[]
+}
+
+export type SupplierRecommendedProductDashboardRow = {
+  purchaser: string
+  factoryCount: number
+  skuCount: number
+  selectedCount: number
+  performance: string
+  sabcRating: string
+  factories: SupplierRecommendedProductDashboardFactory[]
+}
+
+export type SupplierRecommendedProductDashboard = {
+  month: string
+  totals: { skuCount: number; factoryCount: number; selectedCount: number; selectedRate: number }
+  rows: SupplierRecommendedProductDashboardRow[]
+}
+
+export type SupplierRecommendedProductPkTier = {
+  label: string
+  minCount: number
+  amount: string
+}
+
+export type SupplierRecommendedProductPkConfig = {
+  theme: string
+  totalAmount: string
+  rules: string
+  tiers: SupplierRecommendedProductPkTier[]
+  savedAt: string | null
+}
+
+export type SupplierRecommendedProductPkEntry = {
+  purchaser: string
+  selectedCount: number
+  tierIndex: number
+  amount: string
+}
+
+export type SupplierRecommendedProductPkBoard = {
+  month: string
+  config: SupplierRecommendedProductPkConfig
+  entries: SupplierRecommendedProductPkEntry[]
+  canConfigure: boolean
+}
+
+export const SUPPLIER_RECOMMENDED_PRODUCT_PK_CONFIG_KEY = 'supplier-recommended-products:pk-board:v1'
+
+export const SUPPLIER_RECOMMENDED_PRODUCT_PK_DEFAULT_TIERS: SupplierRecommendedProductPkTier[] = [
+  { label: '苦海', minCount: 0, amount: '' },
+  { label: '人间', minCount: 1, amount: '' },
+  { label: '飞升区', minCount: 3, amount: '' },
+  { label: '封神榜', minCount: 5, amount: '' },
+  { label: '仙界', minCount: 8, amount: '' },
+  { label: '单量称王', minCount: 10, amount: '' },
+]
+
+export const SUPPLIER_RECOMMENDED_PRODUCT_PK_DEFAULT_CONFIG: SupplierRecommendedProductPkConfig = {
+  theme: '供应商新品推荐PK榜',
+  totalAmount: '',
+  rules: '',
+  tiers: SUPPLIER_RECOMMENDED_PRODUCT_PK_DEFAULT_TIERS,
+  savedAt: null,
+}
+
+
 const cleanString = (max: number) => z.preprocess(
   (value) => String(value ?? '').trim(),
   z.string().max(max),
@@ -118,6 +202,40 @@ export const supplierRecommendedProductInputSchema = z.object({
 }).strict()
 
 export type SupplierRecommendedProductInput = z.infer<typeof supplierRecommendedProductInputSchema>
+
+export const supplierRecommendedProductPkConfigSchema = z.object({
+  theme: z.string().trim().min(1, '请填写PK榜主题').max(60, '主题不能超过60字'),
+  totalAmount: z.string().trim().max(30, '总金额不能超过30字').default(''),
+  rules: z.string().trim().max(500, '规则说明不能超过500字').default(''),
+  tiers: z.array(z.object({
+    label: z.string().trim().min(1, '层级名称不能为空').max(20, '层级名称不能超过20字'),
+    minCount: z.number({ message: '门槛必须为数字' }).int('门槛必须为整数').min(0, '门槛不能小于0').max(1_000_000, '门槛超出允许范围'),
+    amount: z.string().trim().max(20, '层级金额不能超过20字').default(''),
+  })).min(2, '至少保留两个层级').max(8, '最多设置八个层级'),
+})
+
+export function normalizeSupplierRecommendedProductPkConfig(input: unknown): SupplierRecommendedProductPkConfig {
+  if (!input || typeof input !== 'object') return { ...SUPPLIER_RECOMMENDED_PRODUCT_PK_DEFAULT_CONFIG, tiers: SUPPLIER_RECOMMENDED_PRODUCT_PK_DEFAULT_TIERS.map((tier) => ({ ...tier })) }
+  const source = input as Partial<SupplierRecommendedProductPkConfig>
+  const tiers = Array.isArray(source.tiers)
+    ? source.tiers
+      .filter((tier) => tier && typeof tier === 'object' && typeof tier.label === 'string')
+      .map((tier) => ({
+        label: String(tier.label).trim().slice(0, 20) || '未命名层级',
+        minCount: Number.isFinite(tier.minCount) ? Math.max(0, Math.trunc(Number(tier.minCount))) : 0,
+        amount: typeof tier.amount === 'string' ? tier.amount.trim().slice(0, 20) : '',
+      }))
+      .slice(0, 8)
+    : []
+  return {
+    theme: typeof source.theme === 'string' && source.theme.trim() ? source.theme.trim().slice(0, 60) : SUPPLIER_RECOMMENDED_PRODUCT_PK_DEFAULT_CONFIG.theme,
+    totalAmount: typeof source.totalAmount === 'string' ? source.totalAmount.trim().slice(0, 30) : '',
+    rules: typeof source.rules === 'string' ? source.rules.trim().slice(0, 500) : '',
+    tiers: tiers.length >= 2 ? tiers : SUPPLIER_RECOMMENDED_PRODUCT_PK_DEFAULT_TIERS.map((tier) => ({ ...tier })),
+    savedAt: typeof source.savedAt === 'string' && !Number.isNaN(new Date(source.savedAt).getTime()) ? source.savedAt : null,
+  }
+}
+
 export type SupplierRecommendedProductRow = SupplierRecommendedProductInput & {
   id: string
   selectionStatus?: SupplierRecommendedProductSelectionStatus
diff --git a/furniture-3d-system/src/lib/supply-chain-permission-settings.ts b/furniture-3d-system/src/lib/supply-chain-permission-settings.ts
index 8d81defb..eb572545 100644
--- a/furniture-3d-system/src/lib/supply-chain-permission-settings.ts
+++ b/furniture-3d-system/src/lib/supply-chain-permission-settings.ts
@@ -371,7 +371,7 @@ export function getSupplyChainApiPermissionRequirement(pathname: string, method:
   if (pathname.startsWith('/api/supply-chain/supplier-recommended-products')) {
     return {
       targetKey: 'purchaseSupplierRecommendedProducts' as const,
-      action: pathname.endsWith('/template') || pathname.endsWith('/export') ? 'download' as const : pathname.endsWith('/selection') ? 'view' as const : action,
+      action: pathname.endsWith('/template') || pathname.endsWith('/export') ? 'download' as const : pathname.endsWith('/selection') || pathname.endsWith('/dashboard') ? 'view' as const : action,
     }
   }
   if (pathname.startsWith('/api/supply-chain/script-monitor')) {
diff --git a/furniture-3d-system/src/server/services/__tests__/supplier-recommended-products.service.test.ts b/furniture-3d-system/src/server/services/__tests__/supplier-recommended-products.service.test.ts
index 3189f6ec..a6436fa4 100644
--- a/furniture-3d-system/src/server/services/__tests__/supplier-recommended-products.service.test.ts
+++ b/furniture-3d-system/src/server/services/__tests__/supplier-recommended-products.service.test.ts
@@ -14,6 +14,16 @@ jest.mock('@/server/services/user.service', () => ({
   },
 }))
 
+const mockSystemConfigGet = jest.fn()
+const mockSystemConfigSet = jest.fn()
+
+jest.mock('@/server/services/system-config.service', () => ({
+  systemConfigService: {
+    get: (...args: unknown[]) => mockSystemConfigGet(...args),
+    set: (...args: unknown[]) => mockSystemConfigSet(...args),
+  },
+}))
+
 import type { SupplierRecommendedProductsRepository } from '@/server/repositories/supplier-recommended-products.repository'
 import { SupplierRecommendedProductsService } from '@/server/services/supplier-recommended-products.service'
 import {
@@ -247,4 +257,100 @@ describe('SupplierRecommendedProductsService', () => {
 
     await expect(service.updateSelection({ ids: ['recommended-1'], action: 'select' }, operatorUser)).rejects.toThrow('请选择对应的运营人员')
   })
+
+  describe('采购看板PK榜', () => {
+    const purchasingUser = { ...USER, businessRoles: ['PURCHASING'] as const }
+    const administrator = { id: 'admin-1', name: '子龙', role: 'ADMIN' as const, businessRoles: [] }
+
+    function pkRecord(purchaser: string, selectionStatus: 'SELECTED' | 'UNSELECTED') {
+      return {
+        id: `${purchaser}-${selectionStatus}-${Math.random()}`,
+        purchaser,
+        selectionStatus,
+        recommendationDate: new Date('2026-09-01T00:00:00Z'),
+        createdAt: new Date(),
+        updatedAt: new Date(),
+      }
+    }
+
+    it('按当月被选款数给采购落级，0款落在最低层', async () => {
+      mockSystemConfigGet.mockResolvedValue(null)
+      const repository = {
+        listAll: jest.fn().mockResolvedValue([
+          ...Array.from({ length: 5 }, () => pkRecord('雁兰', 'SELECTED')),
+          ...Array.from({ length: 2 }, () => pkRecord('伯阳', 'UNSELECTED')),
+          pkRecord('徐霞客', 'SELECTED'),
+        ]),
+      } as unknown as SupplierRecommendedProductsRepository
+      const service = new SupplierRecommendedProductsService(repository)
+
+      const board = await service.getPkBoard('2026-09', purchasingUser)
+      const byPurchaser = new Map(board.entries.map((entry) => [entry.purchaser, entry]))
+      expect(byPurchaser.get('雁兰')?.tierIndex).toBe(3)
+      expect(byPurchaser.get('伯阳')?.tierIndex).toBe(0)
+      expect(byPurchaser.get('徐霞客')?.tierIndex).toBe(1)
+      expect(board.entries[0]?.purchaser).toBe('雁兰')
+      expect(board.canConfigure).toBe(false)
+    })
+
+    it('只允许采购或管理角色查看PK榜', async () => {
+      const repository = { listAll: jest.fn() } as unknown as SupplierRecommendedProductsRepository
+      const service = new SupplierRecommendedProductsService(repository)
+
+      await expect(service.getPkBoard('2026-09', USER)).rejects.toThrow('只有采购或管理可以查看采购看板')
+    })
+
+    it('管理员保存配置时归一化层级并写入保存时间', async () => {
+      mockSystemConfigGet.mockResolvedValue(null)
+      mockSystemConfigSet.mockResolvedValue(undefined)
+      const service = new SupplierRecommendedProductsService({} as unknown as SupplierRecommendedProductsRepository)
+
+      const saved = await service.updatePkConfig({
+        theme: '9月PK',
+        totalAmount: '10000',
+        rules: '被选款以正式选款为准',
+        tiers: [
+          { label: '单量称王', minCount: 10, amount: '1000' },
+          { label: '苦海', minCount: 0, amount: '' },
+          { label: '人间', minCount: 1, amount: '100' },
+        ],
+      }, administrator)
+
+      expect(saved.tiers.map((tier) => tier.label)).toEqual(['苦海', '人间', '单量称王'])
+      expect(saved.savedAt).toBeTruthy()
+      expect(mockSystemConfigSet).toHaveBeenCalledWith(
+        'supplier-recommended-products:pk-board:v1',
+        expect.objectContaining({ theme: '9月PK' }),
+        '供应商新品推荐PK榜配置',
+      )
+    })
+
+    it('拒绝重复的层级门槛', async () => {
+      const service = new SupplierRecommendedProductsService({} as unknown as SupplierRecommendedProductsRepository)
+
+      await expect(service.updatePkConfig({
+        theme: '9月PK',
+        totalAmount: '',
+        rules: '',
+        tiers: [
+          { label: '苦海', minCount: 1, amount: '' },
+          { label: '人间', minCount: 1, amount: '' },
+        ],
+      }, administrator)).rejects.toThrow('门槛重复了')
+    })
+
+    it('非管理员不能保存PK榜配置', async () => {
+      const service = new SupplierRecommendedProductsService({} as unknown as SupplierRecommendedProductsRepository)
+
+      await expect(service.updatePkConfig({
+        theme: '9月PK',
+        totalAmount: '',
+        rules: '',
+        tiers: [
+          { label: '苦海', minCount: 0, amount: '' },
+          { label: '人间', minCount: 1, amount: '' },
+        ],
+      }, purchasingUser)).rejects.toThrow('只有管理员可以设置PK榜')
+    })
+  })
 })
diff --git a/furniture-3d-system/src/server/services/supplier-recommended-products.service.ts b/furniture-3d-system/src/server/services/supplier-recommended-products.service.ts
index c44d34ec..5b103ab3 100644
--- a/furniture-3d-system/src/server/services/supplier-recommended-products.service.ts
+++ b/furniture-3d-system/src/server/services/supplier-recommended-products.service.ts
@@ -1,16 +1,23 @@
 import {
   SUPPLIER_RECOMMENDED_PRODUCT_FIELDS,
+  SUPPLIER_RECOMMENDED_PRODUCT_PK_CONFIG_KEY,
   SUPPLIER_RECOMMENDED_PRODUCT_REQUIRED_KEYS,
+  normalizeSupplierRecommendedProductPkConfig,
   supplierRecommendedProductInputSchema,
+  supplierRecommendedProductPkConfigSchema,
   type SupplierRecommendedProductChange,
   type SupplierRecommendedProductFilters,
   type SupplierRecommendedProductImportProgress,
   type SupplierRecommendedProductInput,
+  type SupplierRecommendedProductPkBoard,
+  type SupplierRecommendedProductPkConfig,
+  type SupplierRecommendedProductPkEntry,
 } from '@/lib/supplier-recommended-products'
 import { AppError, ErrorCode } from '@/server/core/errors'
 import type { AuthUser } from '@/server/core/types'
 import { supplierRecommendedProductsRepository, type SupplierRecommendedProductRecord, type SupplierRecommendedProductsRepository } from '@/server/repositories/supplier-recommended-products.repository'
 import { supplyChainPermissionSettingsService } from '@/server/services/supply-chain-permission-settings.service'
+import { systemConfigService } from '@/server/services/system-config.service'
 import { hasBusinessRole, isAdmin } from '@/lib/role-scope'
 import { userService } from '@/server/services/user.service'
 
@@ -85,14 +92,28 @@ function parseInput(input: unknown, rowNumber?: number) {
 }
 
 function currentImportDate(now = new Date()) {
+  return currentMonthParts(now, 'day')
+}
+
+function currentMonth(now = new Date()) {
+  return currentMonthParts(now, 'month')
+}
+
+function currentMonthParts(now: Date, mode: 'month' | 'day') {
   const parts = new Intl.DateTimeFormat('en-US', {
     timeZone: IMPORT_TIME_ZONE,
     year: 'numeric',
     month: '2-digit',
-    day: '2-digit',
+    ...(mode === 'day' ? { day: '2-digit' } : {}),
   }).formatToParts(now)
   const value = (type: Intl.DateTimeFormatPartTypes) => parts.find((part) => part.type === type)?.value ?? ''
-  return `${value('year')}-${value('month')}-${value('day')}`
+  return mode === 'day' ? `${value('year')}-${value('month')}-${value('day')}` : `${value('year')}-${value('month')}`
+}
+
+function monthRangeDays(month: string): [string, string] {
+  const [year, monthNumber] = month.split('-').map(Number)
+  const lastDay = new Date(Date.UTC(year, monthNumber, 0)).getUTCDate()
+  return [`${month}-01`, `${month}-${String(lastDay).padStart(2, '0')}`]
 }
 
 function parseDeleteIds(input: unknown) {
@@ -124,6 +145,140 @@ export class SupplierRecommendedProductsService {
     return access.view && (isAdmin(user) || hasBusinessRole(user, 'OPERATIONS'))
   }
 
+  async canViewDashboard(user: AuthUser) {
+    const access = await this.getAccess(user)
+    return access.view && (isAdmin(user) || hasBusinessRole(user, 'PURCHASING') || hasBusinessRole(user, 'MANAGEMENT'))
+  }
+
+  private async assertPurchasingBoardViewer(user: AuthUser) {
+    await this.requireAccess(user, 'view')
+    if (!isAdmin(user) && !hasBusinessRole(user, 'PURCHASING') && !hasBusinessRole(user, 'MANAGEMENT')) {
+      throw new AppError(ErrorCode.AUTH_PERMISSION_DENIED, '只有采购或管理可以查看采购看板')
+    }
+  }
+
+  async getDashboard(monthInput: string | undefined, user: AuthUser) {
+    await this.assertPurchasingBoardViewer(user)
+    const month = /^\d{4}-\d{2}$/.test(String(monthInput ?? '').trim()) ? String(monthInput).trim() : currentMonth()
+    const [startDay, endDay] = monthRangeDays(month)
+    const records = await this.repository.listAll({ ...cleanFilters(undefined), dateFrom: startDay, dateTo: endDay })
+
+    type CategoryBucket = { skuCount: number; selectedCount: number; materials: Map<string, { skuCount: number; selectedCount: number }> }
+    type FactoryBucket = { skuCount: number; selectedCount: number; categories: Map<string, CategoryBucket> }
+    type PurchaserBucket = { skuCount: number; selectedCount: number; factories: Map<string, FactoryBucket> }
+    const buckets = new Map<string, PurchaserBucket>()
+    const allFactories = new Set<string>()
+    const totals = { skuCount: 0, factoryCount: 0, selectedCount: 0 }
+
+    for (const record of records) {
+      const purchaser = record.purchaser.trim() || '未填写采购'
+      const factory = record.supplier.trim() || '未填写工厂'
+      allFactories.add(factory)
+      const selected = record.selectionStatus === 'SELECTED'
+      const purchaserBucket = buckets.get(purchaser) ?? { skuCount: 0, selectedCount: 0, factories: new Map<string, FactoryBucket>() }
+      purchaserBucket.skuCount += 1
+      if (selected) purchaserBucket.selectedCount += 1
+      buckets.set(purchaser, purchaserBucket)
+
+      const factoryBucket = purchaserBucket.factories.get(factory) ?? { skuCount: 0, selectedCount: 0, categories: new Map<string, CategoryBucket>() }
+      factoryBucket.skuCount += 1
+      if (selected) factoryBucket.selectedCount += 1
+      purchaserBucket.factories.set(factory, factoryBucket)
+
+      totals.skuCount += 1
+      if (selected) totals.selectedCount += 1
+
+      const category = record.category.trim() || '未填写类目'
+      const categoryBucket = factoryBucket.categories.get(category) ?? { skuCount: 0, selectedCount: 0, materials: new Map<string, { skuCount: number; selectedCount: number }> }
+      categoryBucket.skuCount += 1
+      if (selected) categoryBucket.selectedCount += 1
+      const material = record.material.trim()
+      if (material) {
+        const materialBucket = categoryBucket.materials.get(material) ?? { skuCount: 0, selectedCount: 0 }
+        materialBucket.skuCount += 1
+        if (selected) materialBucket.selectedCount += 1
+        categoryBucket.materials.set(material, materialBucket)
+      }
+      factoryBucket.categories.set(category, categoryBucket)
+    }
+
+    totals.factoryCount = allFactories.size
+
+    const rows = [...buckets.entries()].map(([purchaser, bucket]) => ({
+      purchaser,
+      factoryCount: bucket.factories.size,
+      skuCount: bucket.skuCount,
+      selectedCount: bucket.selectedCount,
+      performance: '',
+      sabcRating: '',
+      factories: [...bucket.factories.entries()].map(([factory, factoryBucket]) => ({
+        factory,
+        skuCount: factoryBucket.skuCount,
+        selectedCount: factoryBucket.selectedCount,
+        categories: [...factoryBucket.categories.entries()].map(([category, value]) => ({
+          category,
+          skuCount: value.skuCount,
+          selectedCount: value.selectedCount,
+          materials: [...value.materials.entries()].map(([materialName, m]) => ({ material: materialName, skuCount: m.skuCount, selectedCount: m.selectedCount }))
+            .sort((left, right) => right.skuCount - left.skuCount),
+        })).sort((left, right) => right.skuCount - left.skuCount),
+      })).sort((left, right) => right.skuCount - left.skuCount),
+    })).sort((left, right) => right.skuCount - left.skuCount)
+
+    return {
+      month,
+      totals: { ...totals, selectedRate: totals.skuCount === 0 ? 0 : Math.round((totals.selectedCount / totals.skuCount) * 100) },
+      rows,
+    }
+  }
+
+  async getPkBoard(monthInput: string | undefined, user: AuthUser): Promise<SupplierRecommendedProductPkBoard> {
+    await this.assertPurchasingBoardViewer(user)
+    const month = /^\d{4}-\d{2}$/.test(String(monthInput ?? '').trim()) ? String(monthInput).trim() : currentMonth()
+    const [startDay, endDay] = monthRangeDays(month)
+    const records = await this.repository.listAll({ ...cleanFilters(undefined), dateFrom: startDay, dateTo: endDay })
+    const config = await this.getPkConfig()
+    const tiers = config.tiers
+    const counts = new Map<string, number>()
+    for (const record of records) {
+      const purchaser = record.purchaser.trim() || '未填写采购'
+      counts.set(purchaser, (counts.get(purchaser) ?? 0) + (record.selectionStatus === 'SELECTED' ? 1 : 0))
+    }
+    const entries: SupplierRecommendedProductPkEntry[] = []
+    counts.forEach((selectedCount, purchaser) => {
+      let tierIndex = 0
+      tiers.forEach((tier, index) => {
+        if (selectedCount >= tier.minCount) tierIndex = index
+      })
+      entries.push({ purchaser, selectedCount, tierIndex, amount: tiers[tierIndex]?.amount ?? '' })
+    })
+    entries.sort((left, right) => right.selectedCount - left.selectedCount || left.purchaser.localeCompare(right.purchaser, 'zh-Hans-CN'))
+    const access = await this.getAccess(user)
+    return { month, config, entries, canConfigure: isAdmin(user) && access.edit }
+  }
+
+  async getPkConfig(): Promise<SupplierRecommendedProductPkConfig> {
+    const stored = await systemConfigService.get<unknown>(SUPPLIER_RECOMMENDED_PRODUCT_PK_CONFIG_KEY)
+    return normalizeSupplierRecommendedProductPkConfig(stored)
+  }
+
+  async updatePkConfig(input: unknown, user: AuthUser): Promise<SupplierRecommendedProductPkConfig> {
+    await this.assertPurchasingBoardViewer(user)
+    const access = await this.getAccess(user)
+    if (!isAdmin(user) || !access.edit) throw new AppError(ErrorCode.AUTH_PERMISSION_DENIED, '只有管理员可以设置PK榜')
+    const parsed = supplierRecommendedProductPkConfigSchema.safeParse(input)
+    if (!parsed.success) throw new AppError(ErrorCode.VALIDATION_FAILED, parsed.error.issues[0]?.message ?? 'PK榜配置不正确')
+    const tiers = [...parsed.data.tiers].sort((left, right) => left.minCount - right.minCount)
+    for (let index = 1; index < tiers.length; index += 1) {
+      if (tiers[index].minCount === tiers[index - 1].minCount) {
+        throw new AppError(ErrorCode.VALIDATION_INVALID_FORMAT, `「${tiers[index].label}」和「${tiers[index - 1].label}」的门槛重复了，请改成从低到高递增`)
+      }
+    }
+    const value = { theme: parsed.data.theme, totalAmount: parsed.data.totalAmount, rules: parsed.data.rules, tiers, savedAt: new Date().toISOString() }
+    await systemConfigService.set(SUPPLIER_RECOMMENDED_PRODUCT_PK_CONFIG_KEY, value, '供应商新品推荐PK榜配置')
+    return normalizeSupplierRecommendedProductPkConfig(value)
+  }
+
   async listSelectionOperators(search: unknown, user: AuthUser) {
     await this.requireSelectionAccess(user)
     const normalizedSearch = String(search ?? '').trim().slice(0, 100)

From e9f83b16ee7ac80bb6192235480fa74a5c59c9db Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Mon, 7 Sep 2026 17:12:59 +0800
Subject: [PATCH 15/16] feat(intake): add product factory workbook export and
 import by sku code

the product factory workspace gains export/import template buttons (purchase/merchandiser already hold node download grants): the export brings out the sku code, set count and every factory fillable field, splitting set count 2 rows into their A/B package codes; the import matches rows by sku code, enforces a header layout identical to the exported template, validates supplier names against the supplier directory, warehouses against the warehouse directory, enum fields against system options and number/date formats, collapses or splits A/B packages when the imported set count changes, and rejects confirmed rows - any row error aborts the whole import with per-row line numbers and reasons. Size, color and material columns are reference only.
---
 .../buildNonIntegratedDetailChrome.test.tsx   |   1 +
 .../buildNonIntegratedDetailChrome.tsx        |  12 +
 .../buildNonIntegratedDetailRenderers.tsx     |   1 +
 ...ntegratedDocumentWorkspaceHeaderActions.ts |   6 +
 ...useNonIntegratedDetailDomainControllers.ts |   1 +
 .../useNonIntegratedDetailInputRefs.ts        |   2 +
 ...tegratedSkuReviewActionControllers.test.ts |  11 +
 ...NonIntegratedSkuReviewActionControllers.ts |  30 ++
 .../ProductFactoryHeaderActions.tsx           |  45 ++
 .../productFactoryWorkbookHelpers.ts          | 441 ++++++++++++++++++
 .../useProductFactoryWorkbookController.ts    | 192 ++++++++
 .../DocumentWorkspaceHeaderActionsSlot.tsx    |  21 +
 ...ntegrated-product-factory-workbook.test.ts | 132 ++++++
 ...non-integrated-product-factory-workbook.ts | 263 +++++++++++
 14 files changed, 1158 insertions(+)
 create mode 100644 furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/productFactoryWorkbookHelpers.ts
 create mode 100644 furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/useProductFactoryWorkbookController.ts
 create mode 100644 furniture-3d-system/src/lib/non-integrated-product-factory-workbook.test.ts
 create mode 100644 furniture-3d-system/src/lib/non-integrated-product-factory-workbook.ts

diff --git a/furniture-3d-system/src/app/intake/non-integrated/buildNonIntegratedDetailChrome.test.tsx b/furniture-3d-system/src/app/intake/non-integrated/buildNonIntegratedDetailChrome.test.tsx
index d805d7f0..8fc9583e 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/buildNonIntegratedDetailChrome.test.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/buildNonIntegratedDetailChrome.test.tsx
@@ -37,6 +37,7 @@ describe("buildNonIntegratedDetailChrome", () => {
       permissionState: {},
       productContext: {},
       productFactoryActions: {},
+      productFactoryWorkbook: {},
       productLimitWorkbook: {},
       productPricingWorkbook: {},
       productPhotoUploadActions: {},
diff --git a/furniture-3d-system/src/app/intake/non-integrated/buildNonIntegratedDetailChrome.tsx b/furniture-3d-system/src/app/intake/non-integrated/buildNonIntegratedDetailChrome.tsx
index b9836bac..6c96d970 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/buildNonIntegratedDetailChrome.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/buildNonIntegratedDetailChrome.tsx
@@ -63,6 +63,7 @@ type DetailChromeProps = Required<
   permissionState: ProductSetupState["permissionState"];
   productContext: ProductSetupState["productContext"];
   productFactoryActions: FormActionState["productFactoryActions"];
+  productFactoryWorkbook: SkuReviewActionState["productFactoryWorkbook"];
   productLimitWorkbook: SkuReviewActionState["productLimitWorkbook"];
   productPricingWorkbook: SkuReviewActionState["productPricingWorkbook"];
   productPhotoUploadActions: FileActionState["productPhotoUploadActions"];
@@ -110,6 +111,7 @@ export function buildNonIntegratedDetailChrome({
   permissionState,
   productContext,
   productFactoryActions,
+  productFactoryWorkbook,
   productLimitWorkbook,
   productPricingWorkbook,
   productPhotoUploadActions,
@@ -150,6 +152,8 @@ export function buildNonIntegratedDetailChrome({
         onDownloadUploadFile: documentDownloads.handleDownloadUploadFile,
         onDownloadWorkspaceFiles:
           documentDownloads.handleDownloadWorkspaceFiles,
+        onExportProductFactoryWorkbook:
+          productFactoryWorkbook.handleExportProductFactoryWorkbook,
         onExportProductLimitWorkbook:
           productLimitWorkbook.handleExportProductLimitWorkbook,
         onExportProductPricingWorkbook:
@@ -161,6 +165,8 @@ export function buildNonIntegratedDetailChrome({
         onExportReviewSheet: reviewSheetAssets.handleExportReviewSheet,
         onFinishedSampleShipmentStatusClick:
           sampleWorkflowActions.handleFinishedSampleShipmentStatusClick,
+        onImportProductFactoryWorkbookChange:
+          productFactoryWorkbook.handleImportProductFactoryWorkbookChange,
         onImportProductLimitWorkbookChange:
           productLimitWorkbook.handleImportProductLimitWorkbookChange,
         onImportProductPricingWorkbookChange:
@@ -242,6 +248,8 @@ export function buildNonIntegratedDetailChrome({
         isCurrentUserAdmin: permissionState.isCurrentUserAdmin,
         isCurrentUserPlainReadOnlyViewer:
           permissionState.isCurrentUserPlainReadOnlyViewer,
+        isExportingProductFactory:
+          productFactoryWorkbook.isExportingProductFactory,
         isExportingProductLimit:
           productLimitWorkbook.isExportingProductLimit,
         isExportingProductPricing:
@@ -251,6 +259,8 @@ export function buildNonIntegratedDetailChrome({
         isExportingReviewSheet: reviewSheetAssets.isExportingReviewSheet,
         isExportingSampleMeasurement:
           sampleMeasurementWorkbook.isExportingSampleMeasurement,
+        isImportingProductFactory:
+          productFactoryWorkbook.isImportingProductFactory,
         isImportingProductLimit:
           productLimitWorkbook.isImportingProductLimit,
         isImportingProductPricing:
@@ -266,6 +276,8 @@ export function buildNonIntegratedDetailChrome({
         isReadOnly: editability.isReadOnly,
         productFactoryReopenField:
           workflowState.productFactoryReopenField,
+        productFactoryWorkbookInputRef:
+          inputRefs.productFactoryWorkbookInputRef,
         productLimitWorkbookInputRef:
           inputRefs.productLimitWorkbookInputRef,
         productPricingWorkbookInputRef:
diff --git a/furniture-3d-system/src/app/intake/non-integrated/buildNonIntegratedDetailRenderers.tsx b/furniture-3d-system/src/app/intake/non-integrated/buildNonIntegratedDetailRenderers.tsx
index 4bdd7ad4..f8345b58 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/buildNonIntegratedDetailRenderers.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/buildNonIntegratedDetailRenderers.tsx
@@ -163,6 +163,7 @@ export function buildNonIntegratedDetailRenderers({
     permissionState: setup.permissionState,
     productContext: setup.productContext,
     productFactoryActions: formActions.productFactoryActions,
+    productFactoryWorkbook: skuActions.productFactoryWorkbook,
     productLimitWorkbook: skuActions.productLimitWorkbook,
     productPricingWorkbook: skuActions.productPricingWorkbook,
     sampleMeasurementWorkbook: skuActions.sampleMeasurementWorkbook,
diff --git a/furniture-3d-system/src/app/intake/non-integrated/buildNonIntegratedDocumentWorkspaceHeaderActions.ts b/furniture-3d-system/src/app/intake/non-integrated/buildNonIntegratedDocumentWorkspaceHeaderActions.ts
index a8648ba4..8b486735 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/buildNonIntegratedDocumentWorkspaceHeaderActions.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/buildNonIntegratedDocumentWorkspaceHeaderActions.ts
@@ -1,5 +1,6 @@
 import type { ComponentProps } from "react";
 
+import { NON_INTEGRATED_PRODUCT_FACTORY_WORKBOOK_ACCEPT } from "@/lib/non-integrated-product-factory-workbook";
 import { NON_INTEGRATED_PRODUCT_LIMIT_WORKBOOK_ACCEPT } from "@/lib/non-integrated-product-limit-workbook";
 import { NON_INTEGRATED_PRODUCT_PRICING_WORKBOOK_ACCEPT } from "@/lib/non-integrated-product-pricing-workbook";
 import { NON_INTEGRATED_SAMPLE_MEASUREMENT_WORKBOOK_ACCEPT } from "@/lib/non-integrated-sample-measurement-workbook";
@@ -50,11 +51,13 @@ type DirectStateName =
   | "installationWorkspaceUploadInputRef"
   | "isCurrentUserAdmin"
   | "isCurrentUserPlainReadOnlyViewer"
+  | "isExportingProductFactory"
   | "isExportingProductLimit"
   | "isExportingProductPricing"
   | "isExportingQualityInspection"
   | "isExportingReviewSheet"
   | "isExportingSampleMeasurement"
+  | "isImportingProductFactory"
   | "isImportingProductLimit"
   | "isImportingProductPricing"
   | "isImportingSampleMeasurement"
@@ -63,6 +66,7 @@ type DirectStateName =
   | "isProductPricingNodeLocked"
   | "isReadOnly"
   | "productFactoryReopenField"
+  | "productFactoryWorkbookInputRef"
   | "productLimitWorkbookInputRef"
   | "productPricingWorkbookInputRef"
   | "sampleMeasurementWorkbookInputRef"
@@ -156,6 +160,8 @@ export function buildNonIntegratedDocumentWorkspaceHeaderActions({
     isProjectReviewWorkspace: presentation.isProjectReviewWorkspace,
     isReviewWorkspace: presentation.isReviewWorkspace,
     isSampleMeasurementWorkspace: presentation.isSampleMeasurementWorkspace,
+    productFactoryWorkbookAccept:
+      NON_INTEGRATED_PRODUCT_FACTORY_WORKBOOK_ACCEPT,
     productLimitWorkbookAccept:
       NON_INTEGRATED_PRODUCT_LIMIT_WORKBOOK_ACCEPT,
     productPricingWorkbookAccept:
diff --git a/furniture-3d-system/src/app/intake/non-integrated/useNonIntegratedDetailDomainControllers.ts b/furniture-3d-system/src/app/intake/non-integrated/useNonIntegratedDetailDomainControllers.ts
index fad875d7..4f145222 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/useNonIntegratedDetailDomainControllers.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/useNonIntegratedDetailDomainControllers.ts
@@ -239,6 +239,7 @@ export function useNonIntegratedDetailDomainControllers(
   });
   const skuActions = useNonIntegratedSkuReviewActionControllers({
     artifactState,
+    warehouseOptions: directoryOptions.warehouseDirectoryOptions,
     workflowCompletion: workflow.workflowCompletion,
     basicInfoController: formActions.basicInfoController,
     basicInfoDerived: setup.basicInfoDerived,
diff --git a/furniture-3d-system/src/app/intake/non-integrated/useNonIntegratedDetailInputRefs.ts b/furniture-3d-system/src/app/intake/non-integrated/useNonIntegratedDetailInputRefs.ts
index bba521fc..e3286fa4 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/useNonIntegratedDetailInputRefs.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/useNonIntegratedDetailInputRefs.ts
@@ -10,6 +10,7 @@ export function useNonIntegratedDetailInputRefs() {
   const batchSkuImageInputRef = useRef<HTMLInputElement | null>(null);
   const skuWorkbookInputRef = useRef<HTMLInputElement | null>(null);
   const productLimitWorkbookInputRef = useRef<HTMLInputElement | null>(null);
+  const productFactoryWorkbookInputRef = useRef<HTMLInputElement | null>(null);
   const productPricingWorkbookInputRef = useRef<HTMLInputElement | null>(null);
   const sampleMeasurementWorkbookInputRef = useRef<HTMLInputElement | null>(
     null,
@@ -47,6 +48,7 @@ export function useNonIntegratedDetailInputRefs() {
     pendingProductPhotoCurrentUploadTargetRef,
     pendingProductPhotoPanelUploadRef,
     previewFileInputRef,
+    productFactoryWorkbookInputRef,
     productLimitWorkbookInputRef,
     productPhotoCurrentUploadInputRef,
     productPhotoDetailUploadInputRef,
diff --git a/furniture-3d-system/src/app/intake/non-integrated/useNonIntegratedSkuReviewActionControllers.test.ts b/furniture-3d-system/src/app/intake/non-integrated/useNonIntegratedSkuReviewActionControllers.test.ts
index 8fe31696..0c256e9c 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/useNonIntegratedSkuReviewActionControllers.test.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/useNonIntegratedSkuReviewActionControllers.test.ts
@@ -8,6 +8,7 @@ import { useSkuBatchLifecycleController } from "./workspaces/basic-info/useSkuBa
 import { useSkuCreationController } from "./workspaces/basic-info/useSkuCreationController";
 import { useSkuDisplayState } from "./workspaces/basic-info/useSkuDisplayState";
 import { useSkuWorkbookController } from "./workspaces/basic-info/useSkuWorkbookController";
+import { useProductFactoryWorkbookController } from "./workspaces/product-factory/useProductFactoryWorkbookController";
 import { useProductLimitWorkbookController } from "./workspaces/product-workflow/useProductLimitWorkbookController";
 import { useProductPricingWorkbookController } from "./workspaces/product-workflow/useProductPricingWorkbookController";
 import { useSampleMeasurementWorkbookController } from "./workspaces/sample-workflow/useSampleMeasurementWorkbookController";
@@ -23,6 +24,9 @@ jest.mock("./workspaces/basic-info/useSkuBatchLifecycleController");
 jest.mock("./workspaces/basic-info/useSkuCreationController");
 jest.mock("./workspaces/basic-info/useSkuDisplayState");
 jest.mock("./workspaces/basic-info/useSkuWorkbookController");
+jest.mock(
+  "./workspaces/product-factory/useProductFactoryWorkbookController",
+);
 jest.mock("./workspaces/product-workflow/useProductLimitWorkbookController");
 jest.mock(
   "./workspaces/product-workflow/useProductPricingWorkbookController",
@@ -42,6 +46,9 @@ describe("useNonIntegratedSkuReviewActionControllers", () => {
       aiWhiteBackground: { canUseAiWhiteBackground: true },
       skuBatchLifecycle: { handleAddSkuBatch: jest.fn() },
       skuWorkbook: { handleExportSkuWorkbook: jest.fn() },
+      productFactoryWorkbook: {
+        handleExportProductFactoryWorkbook: jest.fn(),
+      },
       productLimitWorkbook: { handleExportProductLimitWorkbook: jest.fn() },
       productPricingWorkbook: {
         handleExportProductPricingWorkbook: jest.fn(),
@@ -65,6 +72,9 @@ describe("useNonIntegratedSkuReviewActionControllers", () => {
       .mocked(useSkuBatchLifecycleController)
       .mockReturnValue(returns.skuBatchLifecycle as never);
     jest.mocked(useSkuWorkbookController).mockReturnValue(returns.skuWorkbook as never);
+    jest
+      .mocked(useProductFactoryWorkbookController)
+      .mockReturnValue(returns.productFactoryWorkbook as never);
     jest
       .mocked(useProductLimitWorkbookController)
       .mockReturnValue(returns.productLimitWorkbook as never);
@@ -150,6 +160,7 @@ describe("useNonIntegratedSkuReviewActionControllers", () => {
     expect(result.current).toEqual({
       aiWhiteBackground: returns.aiWhiteBackground,
       bomWorkbook: returns.bomWorkbook,
+      productFactoryWorkbook: returns.productFactoryWorkbook,
       productLimitWorkbook: returns.productLimitWorkbook,
       productPricingWorkbook: returns.productPricingWorkbook,
       sampleMeasurementWorkbook: returns.sampleMeasurementWorkbook,
diff --git a/furniture-3d-system/src/app/intake/non-integrated/useNonIntegratedSkuReviewActionControllers.ts b/furniture-3d-system/src/app/intake/non-integrated/useNonIntegratedSkuReviewActionControllers.ts
index 9d450f8f..0534678c 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/useNonIntegratedSkuReviewActionControllers.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/useNonIntegratedSkuReviewActionControllers.ts
@@ -8,6 +8,7 @@ import { useSkuBatchLifecycleController } from "./workspaces/basic-info/useSkuBa
 import { useSkuCreationController } from "./workspaces/basic-info/useSkuCreationController";
 import { useSkuDisplayState } from "./workspaces/basic-info/useSkuDisplayState";
 import { useSkuWorkbookController } from "./workspaces/basic-info/useSkuWorkbookController";
+import { useProductFactoryWorkbookController } from "./workspaces/product-factory/useProductFactoryWorkbookController";
 import { useProductLimitWorkbookController } from "./workspaces/product-workflow/useProductLimitWorkbookController";
 import { useProductPricingWorkbookController } from "./workspaces/product-workflow/useProductPricingWorkbookController";
 import { useSampleMeasurementWorkbookController } from "./workspaces/sample-workflow/useSampleMeasurementWorkbookController";
@@ -91,6 +92,7 @@ type SkuReviewActionControllerProps = Pick<
   seriesDerived: ProductSetupState["seriesDerived"];
   seriesDraft: ProductSetupState["seriesDraft"];
   supplierCodeByName: ReadonlyMap<string, string>;
+  warehouseOptions: readonly string[];
   skuBatchAction: WorkflowDerivedState["skuBatchAction"];
   skuState: ReturnType<typeof useNonIntegratedSkuState>;
   spuEstimate: ReturnType<typeof useSpuEstimateRefreshToken>;
@@ -139,6 +141,7 @@ export function useNonIntegratedSkuReviewActionControllers({
   seriesDerived,
   seriesDraft,
   supplierCodeByName,
+  warehouseOptions,
   skuBatchAction,
   skuState,
   spuEstimate,
@@ -271,6 +274,32 @@ export function useNonIntegratedSkuReviewActionControllers({
       transferProgress.updateGeneratedDownloadProgress,
     updateImportProgress: transferProgress.updateImportProgress,
   });
+  const productFactoryWorkbook = useProductFactoryWorkbookController({
+    allProductFactoryRows: workflowRows.productFactoryRows,
+    canDownloadWorkspaceFiles: permissionState.canDownloadWorkspaceFiles,
+    denyWorkspaceDownloadForCurrentUser:
+      documentDownloads.denyWorkspaceDownloadForCurrentUser,
+    factoryRows: workflowState.factoryRows,
+    finishDownloadProgress: transferProgress.finishDownloadProgress,
+    finishImportProgress: transferProgress.finishImportProgress,
+    isReadOnly: editability.isReadOnly,
+    skuItems: skuState.skuItems,
+    setDownloadProgress: transferProgress.setDownloadProgress,
+    setFactoryRows: workflowState.setFactoryRows,
+    setSkuItems: skuState.setSkuItems,
+    setSaveMessage: overlayState.setSaveMessage,
+    setSaveMessageType: overlayState.setSaveMessageType,
+    setUploadProgress: transferProgress.setUploadProgress,
+    spu: formState.formValues.spu || formState.formValues.productCode,
+    startGeneratedDownloadProgress:
+      transferProgress.startGeneratedDownloadProgress,
+    startImportProgress: transferProgress.startImportProgress,
+    supplierCodeByName,
+    updateGeneratedDownloadProgress:
+      transferProgress.updateGeneratedDownloadProgress,
+    updateImportProgress: transferProgress.updateImportProgress,
+    warehouseOptions,
+  });
   const productLimitWorkbook = useProductLimitWorkbookController({
     canDownloadWorkspaceFiles: permissionState.canDownloadWorkspaceFiles,
     denyWorkspaceDownloadForCurrentUser:
@@ -493,6 +522,7 @@ export function useNonIntegratedSkuReviewActionControllers({
   return {
     aiWhiteBackground,
     bomWorkbook,
+    productFactoryWorkbook,
     productLimitWorkbook,
     productPricingWorkbook,
     qualityInspectionActions,
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactoryHeaderActions.tsx b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactoryHeaderActions.tsx
index 694fdde8..4e31d301 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactoryHeaderActions.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactoryHeaderActions.tsx
@@ -1,3 +1,4 @@
+import type { ChangeEvent, RefObject } from "react";
 import Button from "@/components/ui/Button";
 import {
   PRODUCT_FACTORY_REOPEN_FIELD_OPTIONS,
@@ -7,8 +8,15 @@ import {
 type ProductFactoryHeaderActionsProps = {
   actionGroupClassName: string;
   basicInfoIsConfirmed: boolean;
+  canDownloadWorkspaceFiles: boolean;
   isAdmin: boolean;
+  isExportingWorkbook: boolean;
+  isImportingWorkbook: boolean;
   isReadOnly: boolean;
+  workbookAccept: string;
+  workbookInputRef: RefObject<HTMLInputElement | null>;
+  onExportWorkbook: () => void;
+  onImportWorkbookChange: (event: ChangeEvent<HTMLInputElement>) => void;
   rowCount: number;
   hasPendingRows: boolean;
   isConfirmed: boolean;
@@ -25,8 +33,15 @@ type ProductFactoryHeaderActionsProps = {
 export function ProductFactoryHeaderActions({
   actionGroupClassName,
   basicInfoIsConfirmed,
+  canDownloadWorkspaceFiles,
   isAdmin,
+  isExportingWorkbook,
+  isImportingWorkbook,
   isReadOnly,
+  workbookAccept,
+  workbookInputRef,
+  onExportWorkbook,
+  onImportWorkbookChange,
   rowCount,
   hasPendingRows,
   isConfirmed,
@@ -51,6 +66,36 @@ export function ProductFactoryHeaderActions({
 
   return (
     <div className={actionGroupClassName}>
+      {canDownloadWorkspaceFiles ? (
+        <Button
+          variant="plain"
+          size="small"
+          onClick={onExportWorkbook}
+          disabled={isExportingWorkbook || rowCount === 0}
+        >
+          {isExportingWorkbook ? "导出中..." : "导出模板"}
+        </Button>
+      ) : null}
+      {isReadOnly ? null : (
+        <>
+          <Button
+            variant="plain"
+            size="small"
+            onClick={() => workbookInputRef.current?.click()}
+            disabled={isImportingWorkbook || rowCount === 0}
+          >
+            {isImportingWorkbook ? "导入中..." : "导入模板"}
+          </Button>
+          <input
+            ref={workbookInputRef}
+            type="file"
+            accept={workbookAccept}
+            className="hidden"
+            data-testid="product-factory-import-input"
+            onChange={onImportWorkbookChange}
+          />
+        </>
+      )}
       {isAdmin ? (
         <div className="relative">
           <Button
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/productFactoryWorkbookHelpers.ts b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/productFactoryWorkbookHelpers.ts
new file mode 100644
index 00000000..b11360d6
--- /dev/null
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/productFactoryWorkbookHelpers.ts
@@ -0,0 +1,441 @@
+import type {
+  NonIntegratedFactoryRow,
+  NonIntegratedSkuItem,
+} from "../../nonIntegratedStorage";
+import {
+  INSTALL_METHOD_OPTIONS,
+  PRODUCT_FACTORY_INSTALLATION_SERVICE_OPTIONS,
+  PRODUCT_FACTORY_PRODUCTION_TYPE_OPTIONS,
+  PRODUCT_FACTORY_PURCHASE_ORDER_METHOD_OPTIONS,
+  PRODUCT_FACTORY_SHIPPING_METHOD_OPTIONS,
+  PRODUCT_FACTORY_SUPPLIER_CATEGORY_OPTIONS,
+  normalizeSetCountValue,
+} from "../basic-info/skuFieldConfig";
+import { buildAutoBarcode } from "../basic-info/skuAutoHelpers";
+import {
+  buildProductFactoryRows,
+  normalizeProductFactorySupplier,
+} from "../basic-info/productFactoryHelpers";
+import { buildSkuItemsAfterSetCountCommit } from "../basic-info/skuSetCountCommitHelpers";
+import { isImportedSkuContentLocked } from "../basic-info/skuSourceHelpers";
+import type { NonIntegratedProductFactoryWorkbookImportRow } from "@/lib/non-integrated-product-factory-workbook";
+
+export type ProductFactoryWorkbookEntryValues = {
+  supplierName?: string;
+  warehouse?: string;
+  shippingMethod?: string;
+  minimumOrderQuantity?: string;
+  taxIncludedUnitPrice?: string;
+  leadTime?: string;
+  installMethod?: string;
+  productionType?: string;
+  installationService?: string;
+  supplierCategory?: string;
+  purchaseOrderMethod?: string;
+  setCount?: string;
+};
+
+export type ProductFactoryWorkbookEntry = {
+  rowNumber: number;
+  skuCode: string;
+  targetRow: NonIntegratedFactoryRow;
+  values: ProductFactoryWorkbookEntryValues;
+  setCountChanged: boolean;
+};
+
+export type ProductFactoryWorkbookValidationResult = {
+  errors: string[];
+  entries: ProductFactoryWorkbookEntry[];
+};
+
+const WORKBOOK_VALUE_OPTION_RULES = [
+  { key: "shippingMethod", label: "发货方式", options: PRODUCT_FACTORY_SHIPPING_METHOD_OPTIONS },
+  { key: "installMethod", label: "安装方式", options: INSTALL_METHOD_OPTIONS },
+  { key: "productionType", label: "产品生产类型", options: PRODUCT_FACTORY_PRODUCTION_TYPE_OPTIONS },
+  { key: "installationService", label: "安装服务", options: PRODUCT_FACTORY_INSTALLATION_SERVICE_OPTIONS },
+  { key: "supplierCategory", label: "供应商分类", options: PRODUCT_FACTORY_SUPPLIER_CATEGORY_OPTIONS },
+  { key: "purchaseOrderMethod", label: "采购下单方式", options: PRODUCT_FACTORY_PURCHASE_ORDER_METHOD_OPTIONS },
+] as const;
+
+function pushValueError(
+  errors: string[],
+  rowNumber: number,
+  label: string,
+  value: string,
+  reason: string,
+) {
+  errors.push(`第${rowNumber}行：${label}「${value}」${reason}`);
+}
+
+// 交期支持多种常见写法，统一归一化为 UI 存储用的「YYYY年MM月DD日」格式。
+export const NORMALIZE_LEADTIME_VERSION = 2;
+export function normalizeLeadTimeValue(value: string) {
+  const normalizedValue = value.trim();
+  if (!normalizedValue) return "";
+
+  const zhMatch = normalizedValue.match(/^(\d{4})年(\d{1,2})月(\d{1,2})日$/);
+  const isoMatch = normalizedValue.match(/^(\d{4})-(\d{1,2})-(\d{1,2})$/);
+  const fullYearMatch = normalizedValue.match(
+    /^(\d{4})[/.](\d{1,2})[/.](\d{1,2})$/,
+  );
+  const shortYearMatch = normalizedValue.match(
+    /^(\d{1,2})[/.](\d{1,2})[/.](\d{2}|\d{4})$/,
+  );
+  let year: number;
+  let month: number;
+  let day: number;
+  if (zhMatch || isoMatch || fullYearMatch) {
+    const match = zhMatch ?? isoMatch ?? fullYearMatch;
+    year = Number.parseInt(match?.[1] ?? "", 10);
+    month = Number.parseInt(match?.[2] ?? "", 10);
+    day = Number.parseInt(match?.[3] ?? "", 10);
+  } else if (shortYearMatch) {
+    const yearText = shortYearMatch[3] ?? "";
+    year = Number.parseInt(
+      yearText.length === 2 ? `20${yearText}` : yearText,
+      10,
+    );
+    month = Number.parseInt(shortYearMatch[1] ?? "", 10);
+    day = Number.parseInt(shortYearMatch[2] ?? "", 10);
+  } else {
+    return "";
+  }
+
+  if (
+    !Number.isFinite(year) ||
+    !Number.isFinite(month) ||
+    !Number.isFinite(day) ||
+    month < 1 ||
+    month > 12 ||
+    day < 1 ||
+    day > 31
+  ) {
+    return "";
+  }
+
+  const parsedDate = new Date(Date.UTC(year, month - 1, day));
+  if (
+    parsedDate.getUTCFullYear() !== year ||
+    parsedDate.getUTCMonth() !== month - 1 ||
+    parsedDate.getUTCDate() !== day
+  ) {
+    return "";
+  }
+
+  return `${year}年${String(month).padStart(2, "0")}月${String(day).padStart(2, "0")}日`;
+}
+
+export function validateProductFactoryWorkbookRows({
+  rows,
+  productFactoryRows,
+  skuItems,
+  supplierCodeByName,
+  warehouseOptions,
+}: {
+  rows: ReadonlyArray<NonIntegratedProductFactoryWorkbookImportRow>;
+  productFactoryRows: NonIntegratedFactoryRow[];
+  skuItems: NonIntegratedSkuItem[];
+  supplierCodeByName: ReadonlyMap<string, string>;
+  warehouseOptions: readonly string[];
+}): ProductFactoryWorkbookValidationResult {
+  const errors: string[] = [];
+  const entries: ProductFactoryWorkbookEntry[] = [];
+  const rowBySkuCode = new Map(
+    productFactoryRows
+      .map((row) => [row.skuCode.trim().toUpperCase(), row] as const)
+      .filter(([code]) => code.length > 0),
+  );
+  const normalizedWarehouseOptions = new Set(
+    warehouseOptions.map((option) => option.trim()),
+  );
+  const seenSkuCodes = new Set<string>();
+
+  for (const row of rows) {
+    const rowLabel = `第${row.rowNumber}行`;
+    const skuCode = row.skuCode.trim();
+    if (!skuCode) {
+      errors.push(`${rowLabel}：货号为空`);
+      continue;
+    }
+    const targetRow = rowBySkuCode.get(skuCode.toUpperCase());
+    if (!targetRow) {
+      errors.push(`${rowLabel}：货号「${skuCode}」不存在`);
+      continue;
+    }
+    if (seenSkuCodes.has(targetRow.skuId)) {
+      errors.push(`${rowLabel}：货号「${skuCode}」在文件中重复`);
+      continue;
+    }
+    seenSkuCodes.add(targetRow.skuId);
+
+    if (targetRow.confirmed) {
+      errors.push(`${rowLabel}：货号「${skuCode}」已确认定厂，不可导入修改`);
+      continue;
+    }
+
+    const values: ProductFactoryWorkbookEntryValues = {};
+
+    const supplierName = row.supplierName.trim();
+    if (supplierName) {
+      const supplier = normalizeProductFactorySupplier(
+        supplierName,
+        supplierCodeByName,
+      );
+      if (!supplier.name) {
+        pushValueError(
+          errors,
+          row.rowNumber,
+          "供应商名称",
+          supplierName,
+          "未匹配到供应商目录",
+        );
+      } else {
+        values.supplierName = supplierName;
+      }
+    }
+
+    const warehouse = row.warehouse.trim();
+    if (warehouse) {
+      if (!normalizedWarehouseOptions.has(warehouse)) {
+        pushValueError(errors, row.rowNumber, "仓库", warehouse, "未匹配到仓库目录");
+      } else {
+        values.warehouse = warehouse;
+      }
+    }
+
+    for (const rule of WORKBOOK_VALUE_OPTION_RULES) {
+      const value = row[rule.key].trim();
+      if (!value) continue;
+      if (!(rule.options as readonly string[]).includes(value)) {
+        pushValueError(errors, row.rowNumber, rule.label, value, "不是有效选项");
+      } else {
+        values[rule.key] = value;
+      }
+    }
+
+    const minimumOrderQuantity = row.minimumOrderQuantity.trim();
+    if (minimumOrderQuantity && !/^\d+$/.test(minimumOrderQuantity)) {
+      pushValueError(
+        errors,
+        row.rowNumber,
+        "最低起订量",
+        minimumOrderQuantity,
+        "需为正整数",
+      );
+    } else if (minimumOrderQuantity) {
+      values.minimumOrderQuantity = minimumOrderQuantity;
+    }
+
+    const taxIncludedUnitPrice = row.taxIncludedUnitPrice.trim();
+    if (taxIncludedUnitPrice && !/^\d+(\.\d{1,2})?$/.test(taxIncludedUnitPrice)) {
+      pushValueError(
+        errors,
+        row.rowNumber,
+        "含税单价",
+        taxIncludedUnitPrice,
+        "需为数字",
+      );
+    } else if (taxIncludedUnitPrice) {
+      values.taxIncludedUnitPrice = taxIncludedUnitPrice;
+    }
+
+    const leadTime = row.leadTime.trim();
+    if (leadTime) {
+      const normalizedLeadTime = normalizeLeadTimeValue(leadTime);
+      if (!normalizedLeadTime) {
+        pushValueError(
+          errors,
+          row.rowNumber,
+          "交期",
+          leadTime,
+          "无法识别为日期，支持 2026/09/30、2026年9月30日、9/10/26",
+        );
+      } else {
+        values.leadTime = normalizedLeadTime;
+      }
+    }
+
+    const setCount = row.setCount.trim();
+    let setCountChanged = false;
+    if (setCount) {
+      const normalizedSetCount = Number.parseInt(setCount, 10);
+      if (
+        !Number.isFinite(normalizedSetCount) ||
+        normalizedSetCount < 1 ||
+        normalizedSetCount > 26 ||
+        String(normalizedSetCount) !== setCount
+      ) {
+        pushValueError(errors, row.rowNumber, "套件量", setCount, "需为 1-26 的整数");
+      } else if (normalizeSetCountValue(setCount) !== normalizeSetCountValue(targetRow.setCount)) {
+        const skuItem = skuItems.find((item) => item.id === targetRow.skuId);
+        if (skuItem && isImportedSkuContentLocked(skuItem)) {
+          errors.push(
+            `${rowLabel}：货号「${skuCode}」为导入锁定内容，不可修改套件量`,
+          );
+        } else {
+          values.setCount = String(normalizedSetCount);
+          setCountChanged = true;
+        }
+      }
+    }
+
+    entries.push({
+      rowNumber: row.rowNumber,
+      skuCode,
+      targetRow,
+      values,
+      setCountChanged,
+    });
+  }
+
+  return { errors, entries };
+}
+
+export function applyProductFactoryWorkbookRows({
+  currentRows,
+  entries,
+  skuItems,
+  supplierCodeByName,
+}: {
+  currentRows: NonIntegratedFactoryRow[];
+  entries: ProductFactoryWorkbookEntry[];
+  skuItems: NonIntegratedSkuItem[];
+  supplierCodeByName: ReadonlyMap<string, string>;
+}) {
+  let nextRows = [...currentRows];
+  let nextSkuItems = [...skuItems];
+  const appliedSkuIds = new Set<string>();
+
+  for (const entry of entries) {
+    const rowIndex = nextRows.findIndex(
+      (row) => row.skuId === entry.targetRow.skuId,
+    );
+    if (rowIndex < 0) continue;
+
+    const row = nextRows[rowIndex];
+    const values = entry.values;
+    let supplierName = row.supplierName;
+    let supplierCode = row.supplierCode;
+    let barcode = row.barcode;
+
+    if (values.supplierName !== undefined) {
+      const supplier = normalizeProductFactorySupplier(
+        values.supplierName,
+        supplierCodeByName,
+      );
+      supplierName = supplier.name;
+      supplierCode = supplier.code;
+      const versionNo =
+        nextSkuItems.find((item) => item.id === row.skuId)?.versionNo ?? "V01";
+      barcode = buildAutoBarcode(row.skuCode, supplierCode, versionNo);
+    }
+
+    nextRows[rowIndex] = {
+      ...row,
+      supplierName,
+      supplierCode,
+      barcode,
+      ...(values.warehouse !== undefined
+        ? { warehouse: values.warehouse, warehouseBatchInitialized: true }
+        : {}),
+      ...(values.shippingMethod !== undefined
+        ? { shippingMethod: values.shippingMethod }
+        : {}),
+      ...(values.minimumOrderQuantity !== undefined
+        ? { minimumOrderQuantity: values.minimumOrderQuantity }
+        : {}),
+      ...(values.taxIncludedUnitPrice !== undefined
+        ? { taxIncludedUnitPrice: values.taxIncludedUnitPrice }
+        : {}),
+      ...(values.leadTime !== undefined ? { leadTime: values.leadTime } : {}),
+      ...(values.installMethod !== undefined
+        ? { installMethod: values.installMethod }
+        : {}),
+      ...(values.productionType !== undefined
+        ? { productionType: values.productionType }
+        : {}),
+      ...(values.installationService !== undefined
+        ? { installationService: values.installationService }
+        : {}),
+      ...(values.supplierCategory !== undefined
+        ? { supplierCategory: values.supplierCategory }
+        : {}),
+      ...(values.purchaseOrderMethod !== undefined
+        ? { purchaseOrderMethod: values.purchaseOrderMethod }
+        : {}),
+      ...(values.setCount !== undefined ? { setCount: values.setCount } : {}),
+    };
+
+    if (values.setCount !== undefined) {
+      const skuItemIndex = nextSkuItems.findIndex(
+        (item) => item.id === row.skuId,
+      );
+      if (skuItemIndex >= 0) {
+        nextSkuItems[skuItemIndex] = {
+          ...nextSkuItems[skuItemIndex],
+          setCount: values.setCount,
+        };
+      }
+    }
+
+    appliedSkuIds.add(row.skuId);
+  }
+
+  for (const skuId of appliedSkuIds) {
+    const before = skuItems.find((item) => item.id === skuId);
+    const after = nextSkuItems.find((item) => item.id === skuId);
+    if (!before || !after) continue;
+    if (
+      normalizeSetCountValue(before.setCount) ===
+      normalizeSetCountValue(after.setCount)
+    ) {
+      continue;
+    }
+
+    nextSkuItems = buildSkuItemsAfterSetCountCommit({
+      allowImportedContentLocked: true,
+      current: nextSkuItems,
+      isSkuItemFactoryConfirmed: (item) =>
+        Boolean(nextRows.find((row) => row.skuId === item.id)?.confirmed),
+      targetId: skuId,
+    });
+  }
+
+  nextRows = buildProductFactoryRows(nextSkuItems, nextRows, supplierCodeByName);
+
+  // 供应商值二次固化：工厂行重建会以 sku.manufacturer 优先，
+  // 导入的供应商值需要在重建后的行（含 A/B 包行）上重新写入。
+  for (const entry of entries) {
+    if (entry.values.supplierName === undefined) continue;
+    const anchor = nextSkuItems.find(
+      (item) => item.id === entry.targetRow.skuId,
+    );
+    if (!anchor) continue;
+
+    nextRows = nextRows.map((row) => {
+      const rowSkuItem = nextSkuItems.find((item) => item.id === row.skuId);
+      const rowGroupId = rowSkuItem
+        ? rowSkuItem.packageGroupId || rowSkuItem.id
+        : "";
+      const anchorGroupId = anchor.packageGroupId || anchor.id;
+      if (rowGroupId !== anchorGroupId) return row;
+
+      const supplier = normalizeProductFactorySupplier(
+        entry.values.supplierName as string,
+        supplierCodeByName,
+      );
+      if (!supplier.name) return row;
+      const versionNo = rowSkuItem?.versionNo ?? "V01";
+      return {
+        ...row,
+        supplierName: supplier.name,
+        supplierCode: supplier.code,
+        barcode: buildAutoBarcode(row.skuCode, supplier.code, versionNo),
+      };
+    });
+  }
+
+  return { nextRows, nextSkuItems, appliedCount: appliedSkuIds.size };
+}
+
+
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/useProductFactoryWorkbookController.ts b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/useProductFactoryWorkbookController.ts
new file mode 100644
index 00000000..00032a7d
--- /dev/null
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/useProductFactoryWorkbookController.ts
@@ -0,0 +1,192 @@
+import { useState, type ChangeEvent, type Dispatch, type SetStateAction } from "react";
+
+import {
+  NON_INTEGRATED_PRODUCT_FACTORY_WORKBOOK_ACCEPT,
+  createNonIntegratedProductFactoryWorkbook,
+  downloadNonIntegratedProductFactoryWorkbook,
+  parseNonIntegratedProductFactoryWorkbook,
+} from "@/lib/non-integrated-product-factory-workbook";
+
+import type {
+  NonIntegratedFactoryRow,
+  NonIntegratedSkuItem,
+} from "../../nonIntegratedStorage";
+import type {
+  DownloadProgressState,
+  UploadProgressState,
+} from "../documents/progressHelpers";
+import {
+  applyProductFactoryWorkbookRows,
+  validateProductFactoryWorkbookRows,
+} from "./productFactoryWorkbookHelpers";
+
+type SaveMessageType = "success" | "error";
+
+function buildProductFactoryWorkbookFileName(spu: string) {
+  return `${spu.trim() || "产品定厂"}-产品定厂模板.xlsx`;
+}
+
+type UseProductFactoryWorkbookControllerParams = {
+  allProductFactoryRows: NonIntegratedFactoryRow[];
+  canDownloadWorkspaceFiles: boolean;
+  denyWorkspaceDownloadForCurrentUser: () => void;
+  factoryRows: NonIntegratedFactoryRow[];
+  finishDownloadProgress: (fileName?: string) => void;
+  finishImportProgress: (fileName?: string) => void;
+  isReadOnly: boolean;
+  skuItems: NonIntegratedSkuItem[];
+  setDownloadProgress: Dispatch<SetStateAction<DownloadProgressState | null>>;
+  setFactoryRows: Dispatch<SetStateAction<NonIntegratedFactoryRow[]>>;
+  setSkuItems: Dispatch<SetStateAction<NonIntegratedSkuItem[]>>;
+  setSaveMessage: Dispatch<SetStateAction<string>>;
+  setSaveMessageType: Dispatch<SetStateAction<SaveMessageType>>;
+  setUploadProgress: Dispatch<SetStateAction<UploadProgressState | null>>;
+  spu: string;
+  startGeneratedDownloadProgress: (fileName: string) => void;
+  startImportProgress: (file: File) => void;
+  supplierCodeByName: ReadonlyMap<string, string>;
+  updateGeneratedDownloadProgress: (percent: number, fileName?: string) => void;
+  updateImportProgress: (percent: number, fileName?: string) => void;
+  warehouseOptions: readonly string[];
+};
+
+export function useProductFactoryWorkbookController({
+  allProductFactoryRows,
+  canDownloadWorkspaceFiles,
+  denyWorkspaceDownloadForCurrentUser,
+  factoryRows,
+  finishDownloadProgress,
+  finishImportProgress,
+  isReadOnly,
+  skuItems,
+  setDownloadProgress,
+  setFactoryRows,
+  setSkuItems,
+  setSaveMessage,
+  setSaveMessageType,
+  setUploadProgress,
+  spu,
+  startGeneratedDownloadProgress,
+  startImportProgress,
+  supplierCodeByName,
+  updateGeneratedDownloadProgress,
+  updateImportProgress,
+  warehouseOptions,
+}: UseProductFactoryWorkbookControllerParams) {
+  const [isExportingProductFactory, setIsExportingProductFactory] =
+    useState(false);
+  const [isImportingProductFactory, setIsImportingProductFactory] =
+    useState(false);
+
+  async function handleExportProductFactoryWorkbook() {
+    if (!canDownloadWorkspaceFiles) {
+      denyWorkspaceDownloadForCurrentUser();
+      return;
+    }
+    if (allProductFactoryRows.length === 0 || isExportingProductFactory) {
+      return;
+    }
+
+    const fileName = buildProductFactoryWorkbookFileName(spu);
+    setIsExportingProductFactory(true);
+    try {
+      startGeneratedDownloadProgress(fileName);
+      const workbook = await createNonIntegratedProductFactoryWorkbook(
+        allProductFactoryRows.map((row) => ({
+          skuCode: row.skuCode.trim(),
+          setCount: row.setCount.trim(),
+          supplierName: row.supplierName.trim(),
+          warehouse: row.warehouse.trim(),
+          shippingMethod: row.shippingMethod.trim(),
+          minimumOrderQuantity: row.minimumOrderQuantity.trim(),
+          taxIncludedUnitPrice: row.taxIncludedUnitPrice.trim(),
+          leadTime: row.leadTime.trim(),
+          installMethod: row.installMethod.trim(),
+          productionType: row.productionType.trim(),
+          installationService: row.installationService.trim(),
+          supplierCategory: row.supplierCategory.trim(),
+          purchaseOrderMethod: row.purchaseOrderMethod.trim(),
+          size: row.size.trim(),
+          color: row.color.trim(),
+          material: row.material.trim(),
+        })),
+      );
+      updateGeneratedDownloadProgress(80, fileName);
+      downloadNonIntegratedProductFactoryWorkbook(workbook, fileName);
+      finishDownloadProgress(fileName);
+    } catch (error) {
+      setSaveMessage(
+        error instanceof Error ? error.message : "产品定厂模板导出失败",
+      );
+      setSaveMessageType("error");
+      setDownloadProgress(null);
+    } finally {
+      setIsExportingProductFactory(false);
+    }
+  }
+
+  async function handleImportProductFactoryWorkbookChange(
+    event: ChangeEvent<HTMLInputElement>,
+  ) {
+    if (isReadOnly) {
+      event.target.value = "";
+      return;
+    }
+
+    const file = event.target.files?.[0];
+    if (!file) return;
+
+    setIsImportingProductFactory(true);
+    try {
+      startImportProgress(file);
+      const workbookImport =
+        await parseNonIntegratedProductFactoryWorkbook(file);
+      updateImportProgress(45, file.name);
+      if (workbookImport.rows.length === 0) {
+        throw new Error("上传资料中没有可导入的产品定厂行");
+      }
+
+      const { errors, entries } = validateProductFactoryWorkbookRows({
+        productFactoryRows: factoryRows,
+        rows: workbookImport.rows,
+        skuItems,
+        supplierCodeByName,
+        warehouseOptions,
+      });
+      if (errors.length > 0) {
+        throw new Error(`导入已取消，本次未导入任何数据。${errors.join(" ")}`);
+      }
+
+      updateImportProgress(70, file.name);
+      const applyResult = applyProductFactoryWorkbookRows({
+        currentRows: factoryRows,
+        entries,
+        skuItems,
+        supplierCodeByName,
+      });
+      setFactoryRows(applyResult.nextRows);
+      setSkuItems(applyResult.nextSkuItems);
+      setSaveMessage(
+        `已导入 ${applyResult.appliedCount} 行产品定厂，请核对后确认。`,
+      );
+      setSaveMessageType("success");
+      finishImportProgress(file.name);
+    } catch (error) {
+      setSaveMessage(
+        error instanceof Error ? error.message : "产品定厂模板导入失败",
+      );
+      setSaveMessageType("error");
+      setUploadProgress(null);
+    } finally {
+      setIsImportingProductFactory(false);
+      event.target.value = "";
+    }
+  }
+
+  return {
+    handleExportProductFactoryWorkbook,
+    handleImportProductFactoryWorkbookChange,
+    isExportingProductFactory,
+    isImportingProductFactory,
+  };
+}
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/shared/DocumentWorkspaceHeaderActionsSlot.tsx b/furniture-3d-system/src/app/intake/non-integrated/workspaces/shared/DocumentWorkspaceHeaderActionsSlot.tsx
index 13971ace..ad035526 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/shared/DocumentWorkspaceHeaderActionsSlot.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/shared/DocumentWorkspaceHeaderActionsSlot.tsx
@@ -70,6 +70,7 @@ export function DocumentWorkspaceHeaderActionsSlot({
   isCurrentUserAdmin,
   isCurrentUserPlainReadOnlyViewer,
   isDetectionWorkspace,
+  isExportingProductFactory,
   isExportingProductLimit,
   isExportingProductPricing,
   isExportingQualityInspection,
@@ -77,6 +78,7 @@ export function DocumentWorkspaceHeaderActionsSlot({
   isExportingSampleMeasurement,
   isFactoryQualityWorkspace,
   isFinishedSampleShipmentWorkspace,
+  isImportingProductFactory,
   isImportingProductLimit,
   isImportingProductPricing,
   isImportingSampleMeasurement,
@@ -99,6 +101,8 @@ export function DocumentWorkspaceHeaderActionsSlot({
   isReviewWorkspace,
   isSampleMeasurementWorkspace,
   productFactoryReopenField,
+  productFactoryWorkbookAccept,
+  productFactoryWorkbookInputRef,
   productLimitWorkbookAccept,
   productLimitWorkbookInputRef,
   productPhotoCurrentUploadInputRef,
@@ -119,12 +123,14 @@ export function DocumentWorkspaceHeaderActionsSlot({
   onDeleteUploadFile,
   onDownloadUploadFile,
   onDownloadWorkspaceFiles,
+  onExportProductFactoryWorkbook,
   onExportProductLimitWorkbook,
   onExportProductPricingWorkbook,
   onExportQualityInspection,
   onExportReviewSheet,
   onExportSampleMeasurementWorkbook,
   onFinishedSampleShipmentStatusClick,
+  onImportProductFactoryWorkbookChange,
   onImportProductLimitWorkbookChange,
   onImportProductPricingWorkbookChange,
   onImportSampleMeasurementWorkbookChange,
@@ -187,6 +193,7 @@ export function DocumentWorkspaceHeaderActionsSlot({
   isCurrentUserAdmin: boolean;
   isCurrentUserPlainReadOnlyViewer: boolean;
   isDetectionWorkspace: boolean;
+  isExportingProductFactory: boolean;
   isExportingProductLimit: boolean;
   isExportingProductPricing: boolean;
   isExportingQualityInspection: boolean;
@@ -194,6 +201,7 @@ export function DocumentWorkspaceHeaderActionsSlot({
   isExportingSampleMeasurement: boolean;
   isFactoryQualityWorkspace: boolean;
   isFinishedSampleShipmentWorkspace: boolean;
+  isImportingProductFactory: boolean;
   isImportingProductLimit: boolean;
   isImportingProductPricing: boolean;
   isImportingSampleMeasurement: boolean;
@@ -216,6 +224,8 @@ export function DocumentWorkspaceHeaderActionsSlot({
   isReviewWorkspace: boolean;
   isSampleMeasurementWorkspace: boolean;
   productFactoryReopenField: ProductFactoryReopenField;
+  productFactoryWorkbookAccept: string;
+  productFactoryWorkbookInputRef: RefObject<HTMLInputElement | null>;
   productLimitWorkbookAccept: string;
   productLimitWorkbookInputRef: RefObject<HTMLInputElement | null>;
   productPhotoCurrentUploadInputRef: RefObject<HTMLInputElement | null>;
@@ -236,12 +246,16 @@ export function DocumentWorkspaceHeaderActionsSlot({
   onDeleteUploadFile: (id: string) => void;
   onDownloadUploadFile: (file: NonIntegratedUploadFile) => void;
   onDownloadWorkspaceFiles: (files: NonIntegratedUploadFile[]) => void;
+  onExportProductFactoryWorkbook: () => void;
   onExportProductLimitWorkbook: () => void;
   onExportProductPricingWorkbook: () => void;
   onExportQualityInspection: () => void;
   onExportReviewSheet: () => void;
   onExportSampleMeasurementWorkbook: () => void;
   onFinishedSampleShipmentStatusClick: () => void;
+  onImportProductFactoryWorkbookChange: (
+    event: ChangeEvent<HTMLInputElement>,
+  ) => void;
   onImportProductLimitWorkbookChange: (
     event: ChangeEvent<HTMLInputElement>,
   ) => void;
@@ -294,8 +308,15 @@ export function DocumentWorkspaceHeaderActionsSlot({
       <ProductFactoryHeaderActions
         actionGroupClassName={actionGroupClassName}
         basicInfoIsConfirmed={basicInfoIsConfirmed}
+        canDownloadWorkspaceFiles={canDownloadWorkspaceFiles}
         isAdmin={isCurrentUserAdmin}
+        isExportingWorkbook={isExportingProductFactory}
+        isImportingWorkbook={isImportingProductFactory}
         isReadOnly={isReadOnly}
+        workbookAccept={productFactoryWorkbookAccept}
+        workbookInputRef={productFactoryWorkbookInputRef}
+        onExportWorkbook={onExportProductFactoryWorkbook}
+        onImportWorkbookChange={onImportProductFactoryWorkbookChange}
         rowCount={displayedProductFactoryRowCount}
         hasPendingRows={displayedProductFactoryHasPendingRows}
         isConfirmed={displayedProductFactoryIsConfirmed}
diff --git a/furniture-3d-system/src/lib/non-integrated-product-factory-workbook.test.ts b/furniture-3d-system/src/lib/non-integrated-product-factory-workbook.test.ts
new file mode 100644
index 00000000..7cbd5ab3
--- /dev/null
+++ b/furniture-3d-system/src/lib/non-integrated-product-factory-workbook.test.ts
@@ -0,0 +1,132 @@
+import {
+  NON_INTEGRATED_PRODUCT_FACTORY_WORKBOOK_COLUMNS,
+  createNonIntegratedProductFactoryWorkbook,
+  parseNonIntegratedProductFactoryWorkbook,
+} from '@/lib/non-integrated-product-factory-workbook'
+
+function readBlobAsArrayBuffer(blob: Blob) {
+  return new Promise<ArrayBuffer>((resolve, reject) => {
+    const reader = new FileReader()
+    reader.onload = () => {
+      if (reader.result instanceof ArrayBuffer) {
+        resolve(reader.result)
+        return
+      }
+      reject(new Error('failed to read workbook blob'))
+    }
+    reader.onerror = () => reject(reader.error ?? new Error('failed to read workbook blob'))
+    reader.readAsArrayBuffer(blob)
+  })
+}
+
+function createWorkbookFile(rows: unknown[][], name = 'product-factory.xlsx') {
+  const XLSX = require('xlsx')
+  const workbook = XLSX.utils.book_new()
+  XLSX.utils.book_append_sheet(
+    workbook,
+    XLSX.utils.aoa_to_sheet(rows),
+    '产品定厂',
+  )
+  const bytes = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' }) as ArrayBuffer
+  const file = new File([bytes], name, {
+    type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+  })
+  Object.defineProperty(file, 'arrayBuffer', {
+    value: async () => bytes,
+  })
+  return file
+}
+
+describe('non-integrated-product-factory-workbook', () => {
+  it('exports every factory template column in order', async () => {
+    const blob = await createNonIntegratedProductFactoryWorkbook([
+      {
+        skuCode: 'LRSF009501',
+        setCount: '1',
+        supplierName: '兰考华兰家具',
+        warehouse: '郑州仓',
+        shippingMethod: '入仓',
+        minimumOrderQuantity: '50',
+        taxIncludedUnitPrice: '1999',
+        leadTime: '2026/09/30',
+        installMethod: '整装',
+        productionType: 'OEM',
+        installationService: '送货',
+        supplierCategory: '主力供应商',
+        purchaseOrderMethod: '订单式',
+        size: '140/60/75',
+        color: '胡桃色',
+        material: '橡胶木',
+      },
+    ])
+
+    const ExcelJS = await import('exceljs')
+    const workbook = new ExcelJS.Workbook()
+    const workbookBytes = await readBlobAsArrayBuffer(blob)
+    await workbook.xlsx.load(workbookBytes as ArrayBuffer)
+
+    const worksheet = workbook.getWorksheet(1)
+    expect(worksheet?.name).toBe('产品定厂')
+    NON_INTEGRATED_PRODUCT_FACTORY_WORKBOOK_COLUMNS.forEach((column, index) => {
+      expect(worksheet?.getCell(1, index + 1).value).toBe(column.label)
+    })
+    expect(worksheet?.getCell(2, 1).value).toBe('LRSF009501')
+    expect(worksheet?.getCell(2, 2).value).toBe(1)
+    expect(worksheet?.getCell(2, 3).value).toBe('兰考华兰家具')
+    expect(worksheet?.getCell(2, 8).value).toBe('2026/09/30')
+  })
+
+  it('parses strictly-ordered template rows with worksheet row numbers', async () => {
+    const headers = NON_INTEGRATED_PRODUCT_FACTORY_WORKBOOK_COLUMNS.map(
+      (column) => column.label,
+    )
+    const file = createWorkbookFile([
+      headers,
+      headers.map((label) =>
+        label === '货号'
+          ? 'LRSF009501'
+          : label === '套件量'
+            ? '2'
+            : label === '供应商名称'
+              ? '兰考华兰家具'
+              : '',
+      ),
+    ])
+
+    const result = await parseNonIntegratedProductFactoryWorkbook(file)
+
+    expect(result.sheetName).toBe('产品定厂')
+    expect(result.rows).toEqual([
+      {
+        rowNumber: 2,
+        skuCode: 'LRSF009501',
+        setCount: '2',
+        supplierName: '兰考华兰家具',
+        warehouse: '',
+        shippingMethod: '',
+        minimumOrderQuantity: '',
+        taxIncludedUnitPrice: '',
+        leadTime: '',
+        installMethod: '',
+        productionType: '',
+        installationService: '',
+        supplierCategory: '',
+        purchaseOrderMethod: '',
+        size: '',
+        color: '',
+        material: '',
+      },
+    ])
+  })
+
+  it('rejects templates whose headers differ from the exported template', async () => {
+    const file = createWorkbookFile([
+      ['货号', '数量', '供应商'],
+      ['LRSF009501', '1', '兰考华兰家具'],
+    ])
+
+    await expect(
+      parseNonIntegratedProductFactoryWorkbook(file),
+    ).rejects.toThrow('上传资料表头与模板不一致')
+  })
+})
diff --git a/furniture-3d-system/src/lib/non-integrated-product-factory-workbook.ts b/furniture-3d-system/src/lib/non-integrated-product-factory-workbook.ts
new file mode 100644
index 00000000..4b09cb47
--- /dev/null
+++ b/furniture-3d-system/src/lib/non-integrated-product-factory-workbook.ts
@@ -0,0 +1,263 @@
+export type NonIntegratedProductFactoryWorkbookRow = {
+  skuCode: string
+  setCount: string
+  supplierName: string
+  warehouse: string
+  shippingMethod: string
+  minimumOrderQuantity: string
+  taxIncludedUnitPrice: string
+  leadTime: string
+  installMethod: string
+  productionType: string
+  installationService: string
+  supplierCategory: string
+  purchaseOrderMethod: string
+  size: string
+  color: string
+  material: string
+}
+
+export type NonIntegratedProductFactoryWorkbookImportRow = {
+  rowNumber: number
+} & NonIntegratedProductFactoryWorkbookRow
+
+export const NON_INTEGRATED_PRODUCT_FACTORY_WORKBOOK_COLUMNS = [
+  { key: 'skuCode', label: '货号' },
+  { key: 'setCount', label: '套件量' },
+  { key: 'supplierName', label: '供应商名称' },
+  { key: 'warehouse', label: '仓库' },
+  { key: 'shippingMethod', label: '发货方式' },
+  { key: 'minimumOrderQuantity', label: '最低起订量' },
+  { key: 'taxIncludedUnitPrice', label: '含税单价' },
+  { key: 'leadTime', label: '交期' },
+  { key: 'installMethod', label: '安装方式' },
+  { key: 'productionType', label: '产品生产类型' },
+  { key: 'installationService', label: '安装服务' },
+  { key: 'supplierCategory', label: '供应商分类' },
+  { key: 'purchaseOrderMethod', label: '采购下单方式' },
+  { key: 'size', label: '尺寸' },
+  { key: 'color', label: '颜色' },
+  { key: 'material', label: '材质' },
+] as const
+
+const EXCEL_MIME_TYPE =
+  'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+
+export const NON_INTEGRATED_PRODUCT_FACTORY_WORKBOOK_ACCEPT =
+  '.xls,.xlsx,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+
+const EXCEL_TEXT_STYLE_COLUMNS = new Set(['skuCode', 'supplierName', 'leadTime', 'size', 'color', 'material'])
+
+function applyHeaderCellStyle(cell: import('exceljs').Cell) {
+  cell.border = {
+    top: { style: 'thin', color: { argb: 'FFD6DEE7' } },
+    left: { style: 'thin', color: { argb: 'FFD6DEE7' } },
+    bottom: { style: 'thin', color: { argb: 'FFD6DEE7' } },
+    right: { style: 'thin', color: { argb: 'FFD6DEE7' } },
+  }
+  cell.alignment = {
+    vertical: 'middle',
+    horizontal: 'center',
+    wrapText: true,
+  }
+  cell.font = {
+    name: 'Microsoft YaHei',
+    size: 10,
+    bold: true,
+  }
+  cell.fill = {
+    type: 'pattern',
+    pattern: 'solid',
+    fgColor: { argb: 'FFF5F7FA' },
+  }
+}
+
+function applyBodyCellStyle(cell: import('exceljs').Cell) {
+  cell.border = {
+    top: { style: 'thin', color: { argb: 'FFE1E6ED' } },
+    left: { style: 'thin', color: { argb: 'FFE1E6ED' } },
+    bottom: { style: 'thin', color: { argb: 'FFE1E6ED' } },
+    right: { style: 'thin', color: { argb: 'FFE1E6ED' } },
+  }
+  cell.alignment = {
+    vertical: 'middle',
+    horizontal: 'left',
+    wrapText: true,
+  }
+  cell.font = {
+    name: 'Microsoft YaHei',
+    size: 10,
+  }
+}
+
+export async function createNonIntegratedProductFactoryWorkbook(
+  rows: NonIntegratedProductFactoryWorkbookRow[],
+  sheetName = '产品定厂',
+) {
+  const ExcelJS = await import('exceljs')
+  const workbook = new ExcelJS.Workbook()
+  workbook.creator = 'Codex'
+  workbook.lastModifiedBy = 'Codex'
+  workbook.created = new Date()
+  workbook.modified = new Date()
+
+  const worksheet = workbook.addWorksheet(sheetName)
+  worksheet.properties.defaultRowHeight = 24
+  worksheet.views = [{ state: 'frozen', ySplit: 1 }]
+
+  NON_INTEGRATED_PRODUCT_FACTORY_WORKBOOK_COLUMNS.forEach((column, index) => {
+    worksheet.getColumn(index + 1).width = column.key === 'skuCode' ? 22 : 16
+  })
+
+  NON_INTEGRATED_PRODUCT_FACTORY_WORKBOOK_COLUMNS.forEach((column, index) => {
+    const headerCell = worksheet.getCell(1, index + 1)
+    headerCell.value = column.label
+    applyHeaderCellStyle(headerCell)
+  })
+  worksheet.getRow(1).height = 28
+
+  rows.forEach((row, rowIndex) => {
+    const worksheetRowNumber = rowIndex + 2
+    const worksheetRow = worksheet.getRow(worksheetRowNumber)
+    worksheetRow.height = 24
+
+    NON_INTEGRATED_PRODUCT_FACTORY_WORKBOOK_COLUMNS.forEach(
+      (column, columnIndex) => {
+        const cell = worksheet.getCell(worksheetRowNumber, columnIndex + 1)
+        const rawValue = (row[column.key as keyof NonIntegratedProductFactoryWorkbookRow] ?? '').toString()
+        cell.value = EXCEL_TEXT_STYLE_COLUMNS.has(column.key)
+          ? rawValue
+          : parseWorkbookNumericValue(rawValue) ?? rawValue
+        applyBodyCellStyle(cell)
+      },
+    )
+  })
+
+  const buffer = await workbook.xlsx.writeBuffer()
+  return new Blob([buffer], { type: EXCEL_MIME_TYPE })
+}
+
+export function downloadNonIntegratedProductFactoryWorkbook(
+  blob: Blob,
+  fileName: string,
+) {
+  const url = URL.createObjectURL(blob)
+  const anchor = document.createElement('a')
+  anchor.href = url
+  anchor.download = fileName
+  document.body.appendChild(anchor)
+  anchor.click()
+  anchor.remove()
+  URL.revokeObjectURL(url)
+}
+
+function parseWorkbookNumericValue(value: string) {
+  const normalizedValue = value.trim()
+  if (!normalizedValue) return null
+  if (!/^-?\d+(?:\.\d+)?$/.test(normalizedValue)) return null
+
+  const parsedValue = Number(normalizedValue)
+  return Number.isFinite(parsedValue) ? parsedValue : null
+}
+
+function normalizeWorkbookCellValue(value: unknown) {
+  if (value === null || value === undefined) return ''
+  if (value instanceof Date) return value.toISOString()
+  return String(value).trim()
+}
+
+function readWorkbookFileArrayBuffer(file: File) {
+  if (typeof file.arrayBuffer === 'function') {
+    return file.arrayBuffer()
+  }
+
+  return new Promise<ArrayBuffer>((resolve, reject) => {
+    const reader = new FileReader()
+    reader.onload = () => {
+      if (reader.result instanceof ArrayBuffer) {
+        resolve(reader.result)
+        return
+      }
+      reject(new Error('无法读取产品定厂模板'))
+    }
+    reader.onerror = () => reject(new Error('无法读取产品定厂模板'))
+    reader.readAsArrayBuffer(file)
+  })
+}
+
+export async function parseNonIntegratedProductFactoryWorkbook(file: File) {
+  const XLSX = await import('xlsx')
+  const bytes = await readWorkbookFileArrayBuffer(file)
+  const workbook = XLSX.read(bytes, { type: 'array', cellDates: false })
+  const sheetName = workbook.SheetNames[0]
+  if (!sheetName) {
+    throw new Error('上传资料中没有可读取的工作表')
+  }
+
+  const worksheet = workbook.Sheets[sheetName]
+  const sheetRows = XLSX.utils.sheet_to_json(worksheet, {
+    header: 1,
+    raw: false,
+    defval: '',
+    blankrows: false,
+  }) as unknown[][]
+
+  const headerRowIndex = sheetRows.findIndex((row) =>
+    row.some((cell) => normalizeWorkbookCellValue(cell).length > 0),
+  )
+  if (headerRowIndex < 0) {
+    throw new Error('上传资料中没有可读取的表头')
+  }
+
+  const expectedLabels = NON_INTEGRATED_PRODUCT_FACTORY_WORKBOOK_COLUMNS.map(
+    (column) => column.label,
+  )
+  const headerCells = sheetRows[headerRowIndex].map((cell) =>
+    normalizeWorkbookCellValue(cell),
+  )
+  while (headerCells.length > 0 && headerCells[headerCells.length - 1] === '') {
+    headerCells.pop()
+  }
+
+  const headerDiff: string[] = []
+  const maxColumns = Math.max(expectedLabels.length, headerCells.length)
+  for (let index = 0; index < maxColumns; index++) {
+    const expected = expectedLabels[index] ?? ''
+    const actual = headerCells[index] ?? ''
+    if (expected !== actual) {
+      headerDiff.push(
+        actual
+          ? `第${index + 1}列应为「${expected}」实际为「${actual}」`
+          : `缺少第${index + 1}列「${expected}」`,
+      )
+    }
+  }
+  if (headerDiff.length > 0) {
+    throw new Error(
+      `上传资料表头与模板不一致，请使用最新导出的模板重新填写：${headerDiff.join('；')}`,
+    )
+  }
+
+  const rows = sheetRows
+    .slice(headerRowIndex + 1)
+    .map((row, index): NonIntegratedProductFactoryWorkbookImportRow => {
+      const importRow = {
+        rowNumber: headerRowIndex + index + 2,
+      } as NonIntegratedProductFactoryWorkbookImportRow
+      for (const column of NON_INTEGRATED_PRODUCT_FACTORY_WORKBOOK_COLUMNS) {
+        const cellIndex = NON_INTEGRATED_PRODUCT_FACTORY_WORKBOOK_COLUMNS.indexOf(column)
+        importRow[column.key] = normalizeWorkbookCellValue(row[cellIndex])
+      }
+      return importRow
+    })
+    .filter((row) =>
+      NON_INTEGRATED_PRODUCT_FACTORY_WORKBOOK_COLUMNS.some(
+        (column) => row[column.key].trim().length > 0,
+      ),
+    )
+
+  return {
+    rows,
+    sheetName,
+  }
+}

From 494a1cf60fc56f08a47671e8e673eca24b53c323 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Tue, 8 Sep 2026 05:59:19 +0800
Subject: [PATCH 16/16] feat(store-accounts): add audited finance password
 reveal

---
 .../finance-store-account-password-reveal.md  | 131 ++++++++++
 .../migration.sql                             |  49 ++++
 furniture-3d-system/prisma/schema.prisma      |  14 ++
 .../check-store-account-password-reveal.sql   |  20 ++
 .../[id]/password/reveal/route.test.ts        |  88 +++++++
 .../[id]/password/reveal/route.ts             |  65 +++++
 .../src/proxy-store-account-reveal.test.ts    |  15 ++
 furniture-3d-system/src/proxy.ts              |   6 +
 ...tore-account-password-reveal.repository.ts |  80 ++++++
 ...store-account-password-reveal-transport.ts |  16 ++
 .../store-account-password-reveal.contract.ts |  29 +++
 ...re-account-password-reveal.service.test.ts | 111 +++++++++
 .../store-account-password-reveal.service.ts  |  71 ++++++
 .../store-account-password-reveal.test.ts     | 227 ++++++++++++++++++
 14 files changed, 922 insertions(+)
 create mode 100644 furniture-3d-system/docs/integrations/finance-store-account-password-reveal.md
 create mode 100644 furniture-3d-system/prisma/migrations/20260908120000_store_account_password_reveal/migration.sql
 create mode 100644 furniture-3d-system/scripts/sql/check-store-account-password-reveal.sql
 create mode 100644 furniture-3d-system/src/app/internal/store-accounts/[id]/password/reveal/route.test.ts
 create mode 100644 furniture-3d-system/src/app/internal/store-accounts/[id]/password/reveal/route.ts
 create mode 100644 furniture-3d-system/src/proxy-store-account-reveal.test.ts
 create mode 100644 furniture-3d-system/src/server/repositories/store-account-password-reveal.repository.ts
 create mode 100644 furniture-3d-system/src/server/services/store-account-password-reveal-transport.ts
 create mode 100644 furniture-3d-system/src/server/services/store-account-password-reveal.contract.ts
 create mode 100644 furniture-3d-system/src/server/services/store-account-password-reveal.service.test.ts
 create mode 100644 furniture-3d-system/src/server/services/store-account-password-reveal.service.ts
 create mode 100644 furniture-3d-system/tests/integration/store-account-password-reveal.test.ts

diff --git a/furniture-3d-system/docs/integrations/finance-store-account-password-reveal.md b/furniture-3d-system/docs/integrations/finance-store-account-password-reveal.md
new file mode 100644
index 00000000..2371e4e7
--- /dev/null
+++ b/furniture-3d-system/docs/integrations/finance-store-account-password-reveal.md
@@ -0,0 +1,131 @@
+# 财务系统店铺密码按需读取契约
+
+状态：代码和本地测试交付；生产迁移、配置、发布及真实接口验收须单独批准。
+
+## 存储事实与授权边界
+
+- 密码真相源是 `public."StoreAccount"."passwordCiphertext"`，使用现有 `src/lib/store-account-crypto.ts` 的 AES-256-GCM（随机 12 字节 IV、认证标签、`v1:` 封装）。不是明文或不可逆 Hash。
+- 生产密钥来自 `STORE_ACCOUNT_ENCRYPTION_KEY`，不从数据库读取，不复用财务服务认证凭据。已有银行账号加密也使用此密钥，轮换时必须同时处理。
+- 2026-09-08 对 `furniture3d_prod` 的只读核验：`accounts_v1` COUNT=958、DISTINCT id=958；957 条非空密文均可在生产主机内存中解密，空值 1、解密失败 0。过程只输出聚合，不导出密码或密文。
+- 普通 `store_account_reader` 可读视图、不能读取基表或密码列。此次迁移不增加其基表权限。
+- 本接口只信任专用服务身份 `finance-store-accounts`。财务系统必须在自身后端校验用户登录态、查看/复制权限及店铺范围，然后从可信会话中取 `requesterId`。不得把客户端传入的任意人员 ID 当成操作者。服务凭据仅保存在财务后端，禁止交给浏览器。
+- 不提供列表、批量密码导出或自动预取。列表只读取 `passwordConfigured`；每次明确的查看/复制操作单独调用接口。上游审计记录的用户 ID 是专用财务服务的身份断言，未授权请求中的 ID 不可信，`serviceId=null`。
+
+## HTTP 契约
+
+生产配置完成后的地址：
+
+`POST https://cp.jiansun.vip/internal/store-accounts/{id}/password/reveal`
+
+`id` 为 `accounts_v1.id`，仅接受单个 1–128 位字母、数字、下划线或连字符。无查询参数；禁止在 URL、请求体、请求头中传待读取密码。
+
+请求头：
+
+```http
+Authorization: Bearer <专用服务令牌>
+Content-Type: application/json
+```
+
+请求体（严格拒绝额外字段，最大 1024 字节，1 秒内读取完毕）：
+
+```json
+{ "requesterId": "finance-user-123", "purpose": "view" }
+```
+
+`purpose` 仅允许 `view` 或 `copy`。`requesterId` 是财务会话中的稳定人员标识，1–128 位 `[A-Za-z0-9_.:@-]`。不接受批量 ID、查询参数、普通登录 Cookie/JWT、普通数据库凭据或其他内部任务密钥。
+
+成功 `200`：
+
+```json
+{ "requestId": "<服务端生成的 UUID>", "password": "<仅本次响应体中的密码>" }
+```
+
+所有状态均返回 `Cache-Control: no-store`、`Pragma: no-cache`、`X-Content-Type-Options: nosniff`。`X-Request-Id` 与响应体、审计的追踪 ID 相同。不会在响应头中放密码。
+
+错误体：
+
+```json
+{ "requestId": "<UUID>", "error": { "code": "FORBIDDEN", "message": "请求被拒绝" } }
+```
+
+| HTTP | code | 含义 |
+|---|---|---|
+| 403 | FORBIDDEN | 服务认证失败、非 HTTPS、非法 ID/JSON/用途、额外参数或非 POST |
+| 404 | PASSWORD_NOT_FOUND | 账号不存在或没有可用密码，两者不区分 |
+| 429 | RATE_LIMITED | 任一限流窗口超限 |
+| 503 | UNAVAILABLE | 密钥/解密、数据库、限流或审计不可用；不返回内部异常 |
+
+审计或数据库故障优先返回 503，绝不在无法持久化成功审计时返回密码。数据库完全不可用时无法保存该次失败审计，由网关仅记录追踪 ID、状态与时间供运维关联。成功审计表示服务器已授权并生成响应，不等同于浏览器已经复制成功。
+
+## 限流和超时
+
+- 数据库滚动窗口：服务全部账号 30 次/分钟、300 次/24 小时；同一人员 10 次/分钟；同一账号 5 次/分钟。查看和复制共享额度，轮换令牌不重置服务身份或额度。
+- 已认证的成功、404、参数拒绝和解密失败均占额度；429 不延长窗口。额度检查与审计在同一数据库事务中用事务级锁串行化，跨进程/重启共享状态。
+- 429 不携带剩余数量或精确窗口，避免推测其他用户行为。客户端不得自动重试密码读取；提示用户稍后再试，持续超限联系管理员。
+- 财务客户端设置总超时 10 秒、禁用自动重定向和重试。后端池上限 4、连接获取 1 秒、SQL 执行 1.5 秒/客户端查询 2 秒、锁等待 1 秒，路由运行预算 10 秒。网关必须配置请求体 1 秒和总请求截止，防止慢请求占用。
+- 入口网关还需按来源 IP 对全部请求（包括未授权请求）限制为 60 次/分钟，返回 429 JSON 和 `no-store`；这项入口防滥用配置属于上线门禁。应用层数据库限流负责已认证的敏感读取。
+
+## 环境变量（仅名称及要求）
+
+| 名称 | 所在系统与要求 |
+|---|---|
+| STORE_ACCOUNT_ENCRYPTION_KEY | 上游已有独立加密密钥，至少 32 字符；生产不回退到 JWT_SECRET |
+| STORE_ACCOUNT_FINANCE_TOKEN | 上游专用服务令牌，密码学随机至少 32 字节，base64url 编码，43–128 字符；缺失时拒绝全部调用 |
+| STORE_ACCOUNT_FINANCE_TOKEN_PREVIOUS | 上游可选旧令牌，仅用于短时轮换；主令牌缺失时旧令牌也不生效 |
+| STORE_ACCOUNT_REVEAL_EDGE_TOKEN | 上游与可信 TLS 网关之间的独立随机凭据，base64url 43–128 字符；与财务令牌完全分离，不提供给财务系统；缺失时拒绝全部调用 |
+| DATABASE_URL | 上游现有数据库连接；仅专用不输出查询/异常的连接池读取密文、写审计 |
+| STORE_ACCOUNT_REVEAL_URL | 财务后端配置完整 HTTPS 地址模板 |
+| STORE_ACCOUNT_REVEAL_TOKEN | 财务后端保存与上游专用令牌对应的值 |
+| STORE_REVEAL_TEST_ADMIN_URL | 仅本地集成测试；必须指向回环地址、有建测试库/角色权限的 PostgreSQL |
+| STORE_REVEAL_TEST_POSTGRES_CONTAINER | 仅本地日志验收，指定本地 PostgreSQL 容器以只读扫描测试期间日志 |
+
+## HTTPS、日志和缓存上线门禁
+
+1. 财务后端至公开入口及跨主机的所有代理链路必须使用验证证书的 HTTPS，禁止 HTTP 跳转、跳过证书验证、明文 FRP/跨主机上游。当前 PR 不修改生产 TLS 拓扑；上线前逐跳核实，不满足即不启用令牌。
+2. 应用不以 URL 或未经认证的转发头证明 TLS。必须由受控网关在实际 HTTPS 入口覆盖 `X-Forwarded-Proto: https` 及 `X-Store-Reveal-Edge-Token`（值来自独立 `STORE_ACCOUNT_REVEAL_EDGE_TOKEN`），剥除客户端原有同名头；HTTP 入口直接拒绝，不能注入上述凭据。应用对网关凭据做定时安全比较，缺失/错误或协议不是 https 时拒绝。凭据仅上游和网关持有，不提供给财务系统；配置文件 0600，不通过 `nginx -T` 等诊断输出展示。仍需封闭应用直连并逐跳验证 TLS，独立凭据不代替网络加密。
+3. 对精确路径 `/internal/store-accounts/*/password/reveal` 禁止网关缓存、响应落盘缓冲、CDN缓存、请求/响应体及 Authorization 采集；包括 APM、WAF、异常上报、链路追踪和调试抓包。网关日志只允许时间、方法、路径（不带参数）、状态、耗时、追踪 ID。不要采集响应对象。
+4. 网关自己的 403/404/429/503 也使用脱敏 JSON、`Cache-Control: no-store` 和追踪 ID；不得返回上游诊断页。禁止将该路由接入通用 `withApi`/request logger；目前路由直接返回白名单响应，不记录异常对象。
+5. 数据库不执行明文解密，SQL 参数不包含明文密码。现有密码写入或密钥轮换时，关闭 PostgreSQL/pgAudit 的绑定参数及错误参数记录，防止记录密文。不要启用该连接池的 SQL 结果或参数追踪。
+6. 财务后端同样禁用正文采集、缓存及异常对象打印。浏览器仅在用户点击后获取，避免 localStorage/sessionStorage/Service Worker 持久化；显示或复制完清除页面内存状态，不把密码放入通知、埋点或消息队列。
+
+## 视图与审计迁移
+
+迁移：`prisma/migrations/20260908120000_store_account_password_reveal/migration.sql`。
+
+- 新增 `StoreAccountPasswordAccessAudit`，固定字段为请求追踪 ID、人员标识、服务身份、账号 ID、用途、HTTP状态、数据库时间；不关联用户/店铺外键，以保留未授权、不存在和删除账号的失败审计。状态 200 表示成功，其他状态表示失败。
+- 只在原视图存在时，以原视图查询作为子查询，在末尾追加 `passwordConfigured boolean`，保留原字段、筛选、每行内容、ID、所有者与 ACL；`EXISTS` 不会产生重复行。未配置外部视图的环境不擅自创建外部读入口。
+- `passwordConfigured` 表示存在格式完整的、非空 AES-GCM 密码封装。SQL 不接触密钥，所以不在每次列表查询时验证 GCM 标签/密钥健康；生产预检必须做主机内存中的解密聚合验证。密钥丢失或密文损坏属于 503 运维故障，不能把它伪装成未设置密码。
+- 无历史明文迁移，无现有密码或银行账号数据变更，无额外只读权限。审计数据增量写入，上线后按安全审计要求保留至少 365 天；此 PR 不创建自动删除任务。
+
+迁移前由 DBA 只读确认目标库、视图定义/所有者/ACL、字段顺序、行数与唯一性、密码聚合、普通读取账号和其成员角色权限。若生产仍以本次基线验收，COUNT 与 DISTINCT id 必须均为 958；若业务新增/删除则暂停并重新确认基线，不改数据凑数。
+
+备份与执行顺序（生产必须在明确批准后执行）：
+
+1. 备份当前 `main`/部署 SHA、现有视图 DDL/ACL/所有者及 `_prisma_migrations` 状态。生成目标库 `pg_dump -Fc` 备份并验证可读取；备份进入生产主机权限 0700 目录，文件 0600，不进入 Git 或共享日志。备份可能含密文，按敏感材料管理。
+2. 本次不换加密密钥；核实独立密钥在受限凭据存储中有可恢复副本，不在命令行、文档中显示。记录备份校验和、时间及恢复演练证据。
+3. 保持新财务令牌未配置，执行批准的该迁移，视图短时获得 DDL 锁（最多等 5 秒，执行预算 30 秒），新增审计表及索引；不回放未审查的其他迁移。
+4. 在同一只读快照比较迁移前后原字段行集、顺序/类型、行数/唯一性和权限；运行 `scripts/sql/check-store-account-password-reveal.sql`，确认最后字段 boolean，报告 true/false/null 聚合。预计当前数据为 957/1/0，但必须执行后实测。
+5. 按项目主线发布流程部署，完成逐跳 TLS、网关日志/限流/缓存检查后再配令牌。生产虚构账号的创建、调用与删除属于额外生产写入，需单独批准；不要调用真实账号作为测试。
+
+回滚：先移除财务令牌阻止新调用并回退应用 SHA。新增状态列与审计表可安全保留以避免丢失审计；旧应用不依赖它们。需要完整结构回退时，经 DBA 检查依赖后，在事务中以备份 DDL 重建旧视图并恢复原所有者/ACL（PostgreSQL 不允许 `CREATE OR REPLACE VIEW` 删除尾列，禁止随意 `DROP ... CASCADE`）。审计记录保留，不直接删表；按项目规则处理已应用迁移历史，禁止直接删除 `_prisma_migrations` 记录或用 `db push`。任何完整结构回退先在隔离库演练。
+
+## 密钥轮换
+
+服务令牌：在受限凭据系统生成新随机令牌；旧值暂放 `STORE_ACCOUNT_FINANCE_TOKEN_PREVIOUS`，新值放主变量，重启上游；更新财务后端，使用虚构账号验收；移除旧值并重启。两值对应同一服务身份，审计/额度不变。怀疑泄露时立即撤销旧值，宁可短暂拒绝请求。
+
+网关凭据：暂停此接口，在网关及上游同时更新 `STORE_ACCOUNT_REVEAL_EDGE_TOKEN` 后验收并恢复；不支持旧值并行。不得将网关凭据与服务令牌设成相同值。
+
+数据加密密钥：现有 `v1:` 不含 key ID，不能直接替换环境变量。必须另行批准维护窗口，暂停所有店铺密码及银行账号的写入/读取，备份对应表和旧密钥；用受控迁移进程在内存中旧钥解密、新钥重新 AES-GCM 加密，并在同一数据库事务中更新两类密文字段（SQL 永不接收明文）。验证全量解密聚合、行数及虚构账号后，协调所有应用实例切换新环境密钥，再恢复流量；失败时同时恢复密文备份和旧钥。关闭 SQL 参数/异常参数、APM及备份内容输出；本 PR 不执行此轮换，也不引入第二套密钥或把新旧密钥存入数据库。需要无停机轮换时，应另行实现带 key ID 的 Envelope Encryption/KMS 版本迁移。
+
+## 本次验证记录
+
+- 单元/HTTP/代理路由测试：34 项通过，含伪造 HTTPS URL/转发头和错误网关凭据拒绝。
+- 追加现有代理路由的 7 项回归，与 10 项集成测试合计 6 套件、51 项全部通过。
+- 隔离本地 PostgreSQL 集成测试：10 项通过，覆盖完整加解密与 HTTP handler、已提交审计、403/404/429/no-store、并发/跨实例限流、分钟/24小时配额、审计失败拒绝泄露、原字段及筛选保留、958/958 与 boolean 957/1/0、普通只读角色拒绝基表/密码/审计读取。
+- 开启本地测试连接的 PostgreSQL statement 日志，只在内存扫描 `docker logs`；应用日志、审计行、SQL请求与真实数据库日志均未检出随机测试密码。测试无需打印测试密码，断言只输出布尔结果。
+- Type-check 通过；范围内 ESLint 通过。全仓库主数据边界巡检有 6 项已有违规，均位于本次未修改模块；不得据此声称全仓库通过。
+- 生产仅完成只读基线核查；生产 `passwordConfigured` 尚未落库，生产接口尚未发布，因此没有生产新增字段/新接口的验收结论。
+
+运行：`npx jest --runInBand --runTestsByPath src/server/services/store-account-password-reveal.service.test.ts src/proxy-store-account-reveal.test.ts "src/app/internal/store-accounts/[id]/password/reveal/route.test.ts" tests/integration/store-account-password-reveal.test.ts`。未配置本地测试库变量时，集成套件明确 skip，不能算真实数据库验收通过。
+
+收口：**passed with warnings**。这是自审，不是独立复审。Route → Service → Repository 边界保持；未修改 UI；复用密码真相源、加密和专用服务认证，未通过明文视图绕开根因。剩余门禁为生产批准、备份/TLS拓扑/网关配置及发布后真实验收。
diff --git a/furniture-3d-system/prisma/migrations/20260908120000_store_account_password_reveal/migration.sql b/furniture-3d-system/prisma/migrations/20260908120000_store_account_password_reveal/migration.sql
new file mode 100644
index 00000000..dcdf674e
--- /dev/null
+++ b/furniture-3d-system/prisma/migrations/20260908120000_store_account_password_reveal/migration.sql
@@ -0,0 +1,49 @@
+BEGIN;
+SET LOCAL lock_timeout = '5s';
+SET LOCAL statement_timeout = '30s';
+
+CREATE TABLE public."StoreAccountPasswordAccessAudit" (
+  "requestId" UUID PRIMARY KEY,
+  "requesterId" VARCHAR(128),
+  "serviceId" VARCHAR(64),
+  "accountId" VARCHAR(128),
+  purpose VARCHAR(8) NOT NULL CHECK (purpose IN ('view', 'copy', 'unknown')),
+  status INTEGER NOT NULL CHECK (status IN (200, 403, 404, 429, 503)),
+  "createdAt" TIMESTAMPTZ(3) NOT NULL DEFAULT clock_timestamp()
+);
+CREATE INDEX "StoreAccountPasswordAccessAudit_serviceId_createdAt_idx"
+  ON public."StoreAccountPasswordAccessAudit" ("serviceId", "createdAt");
+CREATE INDEX "StoreAccountPasswordAccessAudit_accountId_createdAt_idx"
+  ON public."StoreAccountPasswordAccessAudit" ("accountId", "createdAt");
+REVOKE ALL ON public."StoreAccountPasswordAccessAudit" FROM PUBLIC;
+
+DO $migration$
+DECLARE
+  original_definition TEXT;
+BEGIN
+  IF EXISTS (SELECT 1 FROM pg_roles WHERE rolname = 'store_account_reader') THEN
+    REVOKE ALL ON public."StoreAccountPasswordAccessAudit" FROM store_account_reader;
+  END IF;
+  -- The external view is provisioned separately by the DBA. Do not create it or
+  -- broaden its grants in environments that have not opted into this integration.
+  IF to_regclass('external_store_accounts.accounts_v1') IS NULL THEN RETURN; END IF;
+  IF EXISTS (SELECT 1 FROM information_schema.columns
+    WHERE table_schema = 'external_store_accounts' AND table_name = 'accounts_v1'
+      AND column_name = 'passwordConfigured') THEN
+    RAISE EXCEPTION 'External account contract needs preflight review';
+  END IF;
+  original_definition := rtrim(pg_get_viewdef('external_store_accounts.accounts_v1'::regclass, true), E';\n\r ');
+  -- Keep the original query, projection, row filters, duplicates (if any), owner
+  -- and ACL. EXISTS does not multiply rows. No secret is exposed in this view.
+  EXECUTE format($view$
+    CREATE OR REPLACE VIEW external_store_accounts.accounts_v1 AS
+    SELECT original.*, EXISTS (
+      SELECT 1 FROM public."StoreAccount" credential
+      WHERE credential.id = original.id
+        AND credential."passwordCiphertext" ~ '^v1:[A-Za-z0-9_-]{16}\.[A-Za-z0-9_-]{22}\.[A-Za-z0-9_-]{2,}$'
+        AND length(split_part(credential."passwordCiphertext", '.', 3)) %% 4 <> 1
+    )::boolean AS "passwordConfigured"
+    FROM (%s) original
+  $view$, original_definition);
+END $migration$;
+COMMIT;
diff --git a/furniture-3d-system/prisma/schema.prisma b/furniture-3d-system/prisma/schema.prisma
index 39535777..fe1b9643 100644
--- a/furniture-3d-system/prisma/schema.prisma
+++ b/furniture-3d-system/prisma/schema.prisma
@@ -3597,6 +3597,20 @@ model StoreAccount {
   @@index([updatedAt])
 }
 
+// Dedicated append-only access audit. Never store password/ciphertext/request bodies.
+model StoreAccountPasswordAccessAudit {
+  requestId   String   @id @db.Uuid
+  requesterId String?  @db.VarChar(128)
+  serviceId   String?  @db.VarChar(64)
+  accountId   String?  @db.VarChar(128)
+  purpose     String   @db.VarChar(8)
+  status      Int
+  createdAt   DateTime @default(dbgenerated("clock_timestamp()")) @db.Timestamptz(3)
+
+  @@index([serviceId, createdAt])
+  @@index([accountId, createdAt])
+}
+
 model StoreAccountStoreProfile {
   id                      String   @id @default(cuid())
   storeName               String
diff --git a/furniture-3d-system/scripts/sql/check-store-account-password-reveal.sql b/furniture-3d-system/scripts/sql/check-store-account-password-reveal.sql
new file mode 100644
index 00000000..50b0d637
--- /dev/null
+++ b/furniture-3d-system/scripts/sql/check-store-account-password-reveal.sql
@@ -0,0 +1,20 @@
+-- Post-migration read-only acceptance. Contains no credential material or row data.
+BEGIN READ ONLY;
+SET LOCAL statement_timeout = '10s';
+SELECT jsonb_build_object(
+  'database', current_database(),
+  'count', count(*),
+  'distinctIds', count(DISTINCT id),
+  'passwordConfiguredTrue', count(*) FILTER (WHERE "passwordConfigured" IS TRUE),
+  'passwordConfiguredFalse', count(*) FILTER (WHERE "passwordConfigured" IS FALSE),
+  'passwordConfiguredNull', count(*) FILTER (WHERE "passwordConfigured" IS NULL),
+  'type', (SELECT data_type FROM information_schema.columns
+    WHERE table_schema='external_store_accounts' AND table_name='accounts_v1' AND column_name='passwordConfigured'),
+  'isLastColumn', (SELECT column_name='passwordConfigured' FROM information_schema.columns
+    WHERE table_schema='external_store_accounts' AND table_name='accounts_v1' ORDER BY ordinal_position DESC LIMIT 1),
+  'readerCanReadView', has_table_privilege('store_account_reader','external_store_accounts.accounts_v1','SELECT'),
+  'readerCanReadBase', has_table_privilege('store_account_reader','public."StoreAccount"','SELECT'),
+  'readerCanReadPassword', has_column_privilege('store_account_reader','public."StoreAccount"','passwordCiphertext','SELECT'),
+  'readerCanReadAudit', has_table_privilege('store_account_reader','public."StoreAccountPasswordAccessAudit"','SELECT')
+) FROM external_store_accounts.accounts_v1;
+ROLLBACK;
diff --git a/furniture-3d-system/src/app/internal/store-accounts/[id]/password/reveal/route.test.ts b/furniture-3d-system/src/app/internal/store-accounts/[id]/password/reveal/route.test.ts
new file mode 100644
index 00000000..597a81b8
--- /dev/null
+++ b/furniture-3d-system/src/app/internal/store-accounts/[id]/password/reveal/route.test.ts
@@ -0,0 +1,88 @@
+/** @jest-environment node */
+import { randomBytes } from 'node:crypto'
+import { POST, GET } from './route'
+
+jest.mock('server-only', () => ({}))
+const mockReveal = jest.fn()
+jest.mock('@/server/services/store-account-password-reveal.service', () => ({
+  StoreAccountPasswordRevealService: jest.fn().mockImplementation(() => ({ reveal: (...args: unknown[]) => mockReveal(...args) })),
+}))
+
+const path = 'https://example.test/internal/store-accounts/test-id/password/reveal'
+const context = { params: Promise.resolve({ id: 'test-id' }) }
+function request(url = path, body = JSON.stringify({ requesterId: 'u', purpose: 'view' })) {
+  return new Request(url, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body })
+}
+
+describe('secret HTTP response boundary', () => {
+  beforeEach(() => { mockReveal.mockReset(); delete process.env.STORE_ACCOUNT_REVEAL_EDGE_TOKEN })
+  afterAll(() => { delete process.env.STORE_ACCOUNT_REVEAL_EDGE_TOKEN })
+
+  it.each([200, 403, 404, 429, 503])('sets no-store for status %i and places no credential in headers', async status => {
+    const password = randomBytes(24).toString('base64url')
+    mockReveal.mockResolvedValue(status === 200 ? { status, password } : { status })
+    const response = await POST(request(), context)
+    expect(response.status).toBe(status)
+    expect(response.headers.get('cache-control')).toBe('no-store')
+    expect(JSON.stringify([...response.headers]).includes(password)).toBe(false)
+    const json = await response.json()
+    expect(typeof json.requestId).toBe('string')
+    expect(json.password === password).toBe(status === 200)
+    expect('password' in json).toBe(status === 200)
+  })
+
+  it('does not trust spoofed forwarded HTTPS by default', async () => {
+    mockReveal.mockResolvedValue({ status: 403 })
+    const req = request(path.replace('https:', 'http:'))
+    req.headers.set('x-forwarded-proto', 'https')
+    await POST(req, context)
+    expect(mockReveal.mock.calls[0][0].secure).toBe(false)
+  })
+
+  it('accepts HTTPS metadata only from an authenticated TLS edge', async () => {
+    const edgeToken = randomBytes(32).toString('base64url')
+    process.env.STORE_ACCOUNT_REVEAL_EDGE_TOKEN = edgeToken
+    mockReveal.mockResolvedValue({ status: 403 })
+    const req = request(path.replace('https:', 'http:'))
+    req.headers.set('x-forwarded-proto', 'https')
+    req.headers.set('x-store-reveal-edge-token', edgeToken)
+    await POST(req, context)
+    expect(mockReveal.mock.calls[0][0].secure).toBe(true)
+  })
+
+  it('does not treat a forwarded HTTPS URL as proof of a trusted TLS socket', async () => {
+    process.env.STORE_ACCOUNT_REVEAL_EDGE_TOKEN = randomBytes(32).toString('base64url')
+    mockReveal.mockResolvedValue({ status: 403 })
+    await POST(request(), context)
+    expect(mockReveal.mock.calls[0][0].secure).toBe(false)
+  })
+
+  it('rejects a wrong edge credential or an insecure edge assertion', async () => {
+    const edgeToken = randomBytes(32).toString('base64url')
+    process.env.STORE_ACCOUNT_REVEAL_EDGE_TOKEN = edgeToken
+    mockReveal.mockResolvedValue({ status: 403 })
+    const req = request()
+    req.headers.set('x-forwarded-proto', 'https')
+    req.headers.set('x-store-reveal-edge-token', randomBytes(32).toString('base64url'))
+    await POST(req, context)
+    expect(mockReveal.mock.calls[0][0].secure).toBe(false)
+    req.headers.set('x-store-reveal-edge-token', edgeToken)
+    req.headers.set('x-forwarded-proto', 'http')
+    await POST(req, context)
+    expect(mockReveal.mock.calls[1][0].secure).toBe(false)
+  })
+
+  it('rejects any query string and does not accept GET as a reveal action', async () => {
+    mockReveal.mockResolvedValue({ status: 403 })
+    await POST(request(path + '?purpose=copy'), context)
+    expect(mockReveal.mock.calls[0][0].secure).toBe(false)
+    await GET(new Request(path), context)
+    expect(mockReveal.mock.calls[1][0].post).toBe(false)
+  })
+
+  it.each(['{', 'a'.repeat(1025)])('bounds malformed and oversized request bodies (%#)', async body => {
+    mockReveal.mockResolvedValue({ status: 403 })
+    await POST(request(path, body), context)
+    expect(mockReveal.mock.calls[0][0].body).toBeNull()
+  })
+})
diff --git a/furniture-3d-system/src/app/internal/store-accounts/[id]/password/reveal/route.ts b/furniture-3d-system/src/app/internal/store-accounts/[id]/password/reveal/route.ts
new file mode 100644
index 00000000..4835b803
--- /dev/null
+++ b/furniture-3d-system/src/app/internal/store-accounts/[id]/password/reveal/route.ts
@@ -0,0 +1,65 @@
+import { randomUUID } from 'node:crypto'
+import { StoreAccountPasswordRevealService } from '@/server/services/store-account-password-reveal.service'
+import { hasTrustedRevealTransport } from '@/server/services/store-account-password-reveal-transport'
+
+export const runtime = 'nodejs'
+export const dynamic = 'force-dynamic'
+export const maxDuration = 10
+const service = new StoreAccountPasswordRevealService()
+const errors = {
+  403: ['FORBIDDEN', '请求被拒绝'],
+  404: ['PASSWORD_NOT_FOUND', '账号或可用密码不存在'],
+  429: ['RATE_LIMITED', '请求过于频繁'],
+  503: ['UNAVAILABLE', '服务暂不可用'],
+} as const
+
+async function readBody(request: Request): Promise<unknown> {
+  if (request.method !== 'POST' || !/^application\/json(?:\s*;|$)/i.test(request.headers.get('content-type') || '')) return null
+  const reader = request.body?.getReader()
+  if (!reader) return null
+  let timedOut = false
+  const timeout = setTimeout(() => {
+    timedOut = true
+    void reader.cancel().catch(() => {})
+  }, 1000)
+  try {
+    const chunks: Uint8Array[] = []
+    let size = 0
+    while (true) {
+      const { done, value } = await reader.read()
+      if (done) break
+      size += value.byteLength
+      if (size > 1024) { await reader.cancel(); return null }
+      chunks.push(value)
+    }
+    return timedOut ? null : JSON.parse(Buffer.concat(chunks).toString('utf8'))
+  } catch { return null } finally { clearTimeout(timeout); reader.releaseLock() }
+}
+
+export async function POST(request: Request, context: { params: Promise<{ id: string }> }) {
+  const requestId = randomUUID()
+  const url = new URL(request.url)
+  const secure = hasTrustedRevealTransport(request.headers)
+  const result = await service.reveal({
+    accountId: (await context.params).id, body: await readBody(request),
+    authorization: request.headers.get('authorization'),
+    secure: secure && !url.search, post: request.method === 'POST', requestId,
+  })
+  const headers = {
+    'Cache-Control': 'no-store', 'Pragma': 'no-cache',
+    'X-Content-Type-Options': 'nosniff', 'X-Request-Id': requestId,
+    'Strict-Transport-Security': 'max-age=31536000',
+  }
+  if (result.status === 200) {
+    return Response.json({ requestId, password: result.password }, { status: 200, headers })
+  }
+  const [code, message] = errors[result.status as keyof typeof errors]
+  return Response.json({ requestId, error: { code, message } }, { status: result.status, headers })
+}
+
+export const GET = POST
+export const PUT = POST
+export const PATCH = POST
+export const DELETE = POST
+export const OPTIONS = POST
+export const HEAD = POST
diff --git a/furniture-3d-system/src/proxy-store-account-reveal.test.ts b/furniture-3d-system/src/proxy-store-account-reveal.test.ts
new file mode 100644
index 00000000..dc4ce35e
--- /dev/null
+++ b/furniture-3d-system/src/proxy-store-account-reveal.test.ts
@@ -0,0 +1,15 @@
+/** @jest-environment node */
+import { NextRequest } from 'next/server'
+import { proxy } from './proxy'
+
+describe('finance endpoint proxy routing', () => {
+  it('passes the exact endpoint to its service authentication without a login redirect', async () => {
+    const response = await proxy(new NextRequest('https://example.test/internal/store-accounts/test-id/password/reveal'))
+    expect(response.headers.get('location')).toBeNull()
+    expect(response.headers.get('x-middleware-next')).toBe('1')
+  })
+  it('keeps other internal account paths behind browser authentication', async () => {
+    const response = await proxy(new NextRequest('https://example.test/internal/store-accounts/test-id'))
+    expect(new URL(response.headers.get('location')!).pathname).toBe('/login')
+  })
+})
diff --git a/furniture-3d-system/src/proxy.ts b/furniture-3d-system/src/proxy.ts
index 3ea1ab36..63e5abdb 100644
--- a/furniture-3d-system/src/proxy.ts
+++ b/furniture-3d-system/src/proxy.ts
@@ -81,6 +81,12 @@ interface WorkspaceTokenPayload {
 export async function proxy(request: NextRequest) {
   const { pathname } = request.nextUrl
 
+  // This exact machine endpoint authenticates its dedicated finance identity itself.
+  // Never redirect service credentials into the browser login flow.
+  if (/^\/internal\/store-accounts\/[^/]+\/password\/reveal\/?$/.test(pathname)) {
+    return NextResponse.next()
+  }
+
   if (
     OA_BOARD_LOCAL_PREVIEW_ENABLED &&
     (pathname === '/intake/oa-board' || pathname.startsWith('/intake/oa-board/'))
diff --git a/furniture-3d-system/src/server/repositories/store-account-password-reveal.repository.ts b/furniture-3d-system/src/server/repositories/store-account-password-reveal.repository.ts
new file mode 100644
index 00000000..8f54d054
--- /dev/null
+++ b/furniture-3d-system/src/server/repositories/store-account-password-reveal.repository.ts
@@ -0,0 +1,80 @@
+import 'server-only'
+import { Pool, type PoolClient } from 'pg'
+import {
+  REVEAL_LIMITS,
+  type RevealAudit, type RevealRepository, type RevealTransaction,
+} from '@/server/services/store-account-password-reveal.contract'
+
+// Dedicated, uninstrumented pool: neither query results nor driver errors are logged.
+// Passwords are SELECT results only, never SQL parameters or database-side plaintext.
+let pool: Pool | undefined
+function getPool() {
+  if (!pool) {
+    pool = new Pool({
+      connectionString: process.env.DATABASE_URL,
+      max: 4, connectionTimeoutMillis: 1000, idleTimeoutMillis: 10000,
+      statement_timeout: 1500, query_timeout: 2000,
+      application_name: 'store-password-reveal',
+    })
+    pool.on('error', () => { /* Never emit driver diagnostics on this secret path. */ })
+  }
+  return pool
+}
+
+class Transaction implements RevealTransaction {
+  constructor(private readonly client: PoolClient) {}
+
+  async limited(event: RevealAudit) {
+    // Serializes the decision AND its audit across all processes/instances.
+    await this.client.query('SELECT pg_advisory_xact_lock(1937010546, 1)')
+    const { rows: [counts] } = await this.client.query<{
+      serviceMinute: number; serviceDay: number; requesterMinute: number; accountMinute: number
+    }>(`SELECT
+      count(*) FILTER (WHERE "createdAt" > clock_timestamp() - interval '1 minute')::int AS "serviceMinute",
+      count(*)::int AS "serviceDay",
+      count(*) FILTER (WHERE "createdAt" > clock_timestamp() - interval '1 minute' AND "requesterId" = $2)::int AS "requesterMinute",
+      count(*) FILTER (WHERE "createdAt" > clock_timestamp() - interval '1 minute' AND "accountId" = $3)::int AS "accountMinute"
+      FROM public."StoreAccountPasswordAccessAudit"
+      WHERE "serviceId" = $1 AND status <> 429 AND "createdAt" > clock_timestamp() - interval '24 hours'`,
+    [event.serviceId, event.requesterId, event.accountId])
+    return (Object.keys(REVEAL_LIMITS) as Array<keyof typeof REVEAL_LIMITS>)
+      .some(key => counts[key] >= REVEAL_LIMITS[key])
+  }
+
+  async findPassword(accountId: string) {
+    const { rows } = await this.client.query<{ passwordCiphertext: string }>(
+      'SELECT "passwordCiphertext" FROM public."StoreAccount" WHERE id = $1', [accountId],
+    )
+    return rows[0]?.passwordCiphertext || null
+  }
+
+  async audit(event: RevealAudit) {
+    // Explicit allowlist: never spread request, response, account record or exception.
+    await this.client.query(`INSERT INTO public."StoreAccountPasswordAccessAudit"
+      ("requestId", "requesterId", "serviceId", "accountId", purpose, status)
+      VALUES ($1, $2, $3, $4, $5, $6)`,
+    [event.requestId, event.requesterId, event.serviceId, event.accountId, event.purpose, event.status])
+  }
+}
+
+export class StoreAccountPasswordRevealRepository implements RevealRepository {
+  constructor(private readonly poolFactory: () => Pool = getPool) {}
+
+  async transaction<T>(run: (tx: RevealTransaction) => Promise<T>): Promise<T> {
+    const client = await this.poolFactory().connect()
+    let broken = false
+    try {
+      await client.query('BEGIN')
+      await client.query("SET LOCAL lock_timeout = '1000ms'")
+      const result = await run(new Transaction(client))
+      await client.query('COMMIT')
+      return result
+    } catch {
+      try { await client.query('ROLLBACK') } catch { broken = true }
+      // No error cause: it might contain driver parameters or a crypto value.
+      throw new Error('PASSWORD_REVEAL_UNAVAILABLE')
+    } finally {
+      client.release(broken)
+    }
+  }
+}
diff --git a/furniture-3d-system/src/server/services/store-account-password-reveal-transport.ts b/furniture-3d-system/src/server/services/store-account-password-reveal-transport.ts
new file mode 100644
index 00000000..f4473c4c
--- /dev/null
+++ b/furniture-3d-system/src/server/services/store-account-password-reveal-transport.ts
@@ -0,0 +1,16 @@
+import 'server-only'
+import { createHash, timingSafeEqual } from 'node:crypto'
+
+// Next.js can construct Request.url from forwarded headers, so its URL protocol
+// cannot prove socket TLS. Only the trusted TLS edge may attest the transport.
+// The financial service must never receive this independent edge credential.
+export function hasTrustedRevealTransport(headers: Headers) {
+  const expected = process.env.STORE_ACCOUNT_REVEAL_EDGE_TOKEN
+  const received = headers.get('x-store-reveal-edge-token')
+  if (expected === process.env.STORE_ACCOUNT_FINANCE_TOKEN ||
+      expected === process.env.STORE_ACCOUNT_FINANCE_TOKEN_PREVIOUS) return false
+  if (!expected || !received || !/^[A-Za-z0-9_-]{43,128}$/.test(expected) ||
+      !/^[A-Za-z0-9_-]{43,128}$/.test(received) || headers.get('x-forwarded-proto') !== 'https') return false
+  const digest = (value: string) => createHash('sha256').update(value).digest()
+  return timingSafeEqual(digest(expected), digest(received))
+}
diff --git a/furniture-3d-system/src/server/services/store-account-password-reveal.contract.ts b/furniture-3d-system/src/server/services/store-account-password-reveal.contract.ts
new file mode 100644
index 00000000..28ee8baf
--- /dev/null
+++ b/furniture-3d-system/src/server/services/store-account-password-reveal.contract.ts
@@ -0,0 +1,29 @@
+import { z } from 'zod'
+
+export const revealInputSchema = z.object({
+  requesterId: z.string().regex(/^[A-Za-z0-9_.:@-]{1,128}$/),
+  purpose: z.enum(['view', 'copy']),
+}).strict()
+export const accountIdSchema = z.string().regex(/^[A-Za-z0-9_-]{1,128}$/)
+
+export const FINANCE_SERVICE_ID = 'finance-store-accounts'
+export const REVEAL_LIMITS = { serviceMinute: 30, serviceDay: 300, requesterMinute: 10, accountMinute: 5 } as const
+export type RevealInput = z.infer<typeof revealInputSchema>
+export type RevealStatus = 200 | 403 | 404 | 429 | 503
+export type RevealAudit = {
+  requestId: string
+  requesterId: string | null
+  serviceId: string | null
+  accountId: string | null
+  purpose: 'view' | 'copy' | 'unknown'
+  status: RevealStatus
+}
+export type RevealResult = { status: RevealStatus; password?: string }
+export interface RevealTransaction {
+  limited(audit: RevealAudit): Promise<boolean>
+  findPassword(accountId: string): Promise<string | null>
+  audit(event: RevealAudit): Promise<void>
+}
+export interface RevealRepository {
+  transaction<T>(run: (tx: RevealTransaction) => Promise<T>): Promise<T>
+}
diff --git a/furniture-3d-system/src/server/services/store-account-password-reveal.service.test.ts b/furniture-3d-system/src/server/services/store-account-password-reveal.service.test.ts
new file mode 100644
index 00000000..58f6c8d0
--- /dev/null
+++ b/furniture-3d-system/src/server/services/store-account-password-reveal.service.test.ts
@@ -0,0 +1,111 @@
+/** @jest-environment node */
+import { randomBytes, randomUUID } from 'node:crypto'
+import { encryptStoreAccountPassword } from '@/lib/store-account-crypto'
+import { StoreAccountPasswordRevealService } from './store-account-password-reveal.service'
+import type { RevealAudit, RevealTransaction } from './store-account-password-reveal.contract'
+
+jest.mock('server-only', () => ({}))
+
+describe('finance password reveal security boundary', () => {
+  const token = randomBytes(32).toString('base64url')
+  const syntheticPassword = randomBytes(24).toString('base64url')
+  let tx: jest.Mocked<RevealTransaction>
+  let events: RevealAudit[]
+  let service: StoreAccountPasswordRevealService
+  const request = (overrides = {}) => ({
+    accountId: 'synthetic-account', body: { requesterId: 'finance-user-1', purpose: 'view' },
+    authorization: `Bearer ${token}`, secure: true, post: true, requestId: randomUUID(), ...overrides,
+  })
+
+  beforeEach(() => {
+    process.env.STORE_ACCOUNT_ENCRYPTION_KEY = randomBytes(32).toString('base64url')
+    process.env.STORE_ACCOUNT_FINANCE_TOKEN = token
+    delete process.env.STORE_ACCOUNT_FINANCE_TOKEN_PREVIOUS
+    events = []
+    tx = {
+      limited: jest.fn().mockResolvedValue(false),
+      findPassword: jest.fn().mockResolvedValue(encryptStoreAccountPassword(syntheticPassword)),
+      audit: jest.fn(async event => { events.push(event) }),
+    }
+    service = new StoreAccountPasswordRevealService({ transaction: run => run(tx) })
+  })
+  afterAll(() => {
+    delete process.env.STORE_ACCOUNT_ENCRYPTION_KEY
+    delete process.env.STORE_ACCOUNT_FINANCE_TOKEN
+    delete process.env.STORE_ACCOUNT_FINANCE_TOKEN_PREVIOUS
+  })
+
+  it.each(['view', 'copy'])('decrypts a single synthetic account for %s and audits only metadata', async purpose => {
+    const result = await service.reveal(request({ body: { requesterId: 'finance-user-1', purpose } }))
+    expect(result.status).toBe(200)
+    // Boolean assertion prevents even a failed test diff from printing secrets.
+    expect(result.password === syntheticPassword).toBe(true)
+    expect(tx.findPassword).toHaveBeenCalledWith('synthetic-account')
+    expect(events).toHaveLength(1)
+    expect(Object.keys(events[0]).sort()).toEqual(['accountId', 'purpose', 'requestId', 'requesterId', 'serviceId', 'status'])
+    expect(events[0].serviceId).toBe('finance-store-accounts')
+    expect(events[0].status).toBe(200)
+    expect(JSON.stringify(events).includes(syntheticPassword)).toBe(false)
+  })
+
+  it.each([
+    { authorization: null }, { authorization: 'Bearer user-session' }, { secure: false }, { post: false },
+    { accountId: ['a', 'b'] }, { accountId: 'a,b' }, { accountId: '../a' },
+    { body: { requesterId: 'u', purpose: 'export' } },
+    { body: { requesterId: 'u', purpose: 'view', ids: ['a', 'b'] } },
+    { body: { purpose: 'view' } }, { body: null },
+  ])('rejects malformed, bulk, insecure or unauthorized input without selecting a credential (%#)', async overrides => {
+    const result = await service.reveal(request(overrides))
+    expect(result.status).toBe(403)
+    expect(result.password === undefined).toBe(true)
+    expect(tx.findPassword).not.toHaveBeenCalled()
+    expect(events[0].status).toBe(403)
+  })
+
+  it('fails closed when credentials are unconfigured', async () => {
+    delete process.env.STORE_ACCOUNT_FINANCE_TOKEN
+    expect((await service.reveal(request())).status).toBe(403)
+    expect(tx.findPassword).not.toHaveBeenCalled()
+  })
+
+  it('accepts the previous dedicated token only during rotation', async () => {
+    process.env.STORE_ACCOUNT_FINANCE_TOKEN_PREVIOUS = token
+    process.env.STORE_ACCOUNT_FINANCE_TOKEN = randomBytes(32).toString('base64url')
+    expect((await service.reveal(request())).status).toBe(200)
+    delete process.env.STORE_ACCOUNT_FINANCE_TOKEN_PREVIOUS
+    expect((await service.reveal(request())).status).toBe(403)
+  })
+
+  it.each([null, ''])('returns the same 404 for missing or empty passwords', async value => {
+    tx.findPassword.mockResolvedValue(value)
+    expect((await service.reveal(request())).status).toBe(404)
+    expect(events[0].status).toBe(404)
+  })
+
+  it('returns 429 before reading or decrypting when over the limit', async () => {
+    tx.limited.mockResolvedValue(true)
+    expect((await service.reveal(request())).status).toBe(429)
+    expect(tx.findPassword).not.toHaveBeenCalled()
+    expect(events[0].status).toBe(429)
+  })
+
+  it('suppresses sensitive exceptions and fails closed when audit is unavailable', async () => {
+    const logs = ['log', 'warn', 'error', 'info', 'debug'].map(method =>
+      jest.spyOn(console, method as 'log').mockImplementation(() => {}))
+    try {
+      tx.audit.mockRejectedValue(new Error(syntheticPassword))
+      const result = await service.reveal(request())
+      expect(result.status).toBe(503)
+      expect(result.password === undefined).toBe(true)
+      expect(logs.every(log => log.mock.calls.length === 0)).toBe(true)
+    } finally { logs.forEach(log => log.mockRestore()) }
+  })
+
+  it('records decryption failure without including the exception or credential', async () => {
+    tx.findPassword.mockResolvedValue('invalid-envelope')
+    const result = await service.reveal(request())
+    expect(result.status).toBe(503)
+    expect(events[0].status).toBe(503)
+    expect(JSON.stringify(events).includes('invalid-envelope')).toBe(false)
+  })
+})
diff --git a/furniture-3d-system/src/server/services/store-account-password-reveal.service.ts b/furniture-3d-system/src/server/services/store-account-password-reveal.service.ts
new file mode 100644
index 00000000..7a455e0b
--- /dev/null
+++ b/furniture-3d-system/src/server/services/store-account-password-reveal.service.ts
@@ -0,0 +1,71 @@
+import 'server-only'
+import { createHash, timingSafeEqual } from 'node:crypto'
+import { decryptStoreAccountPassword } from '@/lib/store-account-crypto'
+import { StoreAccountPasswordRevealRepository } from '@/server/repositories/store-account-password-reveal.repository'
+import {
+  accountIdSchema, FINANCE_SERVICE_ID, revealInputSchema,
+  type RevealAudit, type RevealRepository, type RevealResult,
+} from './store-account-password-reveal.contract'
+
+function authenticate(authorization: string | null) {
+  const received = authorization?.match(/^Bearer ([A-Za-z0-9_-]{43,128})$/)?.[1]
+  const primary = process.env.STORE_ACCOUNT_FINANCE_TOKEN
+  if (!received || !primary || !/^[A-Za-z0-9_-]{43,128}$/.test(primary)) return false
+  const digest = (s: string) => createHash('sha256').update(s).digest()
+  const candidate = digest(received)
+  // Only these dedicated credentials map to this identity. Session/JWT/DB tokens do not.
+  const tokens = [primary, process.env.STORE_ACCOUNT_FINANCE_TOKEN_PREVIOUS]
+  let matched = false
+  for (const token of tokens) {
+    if (token && /^[A-Za-z0-9_-]{43,128}$/.test(token)) {
+      matched = timingSafeEqual(candidate, digest(token)) || matched
+    }
+  }
+  return matched
+}
+
+export class StoreAccountPasswordRevealService {
+  constructor(
+    private readonly repository: RevealRepository = new StoreAccountPasswordRevealRepository(),
+    private readonly decrypt: (value: string) => string = decryptStoreAccountPassword,
+  ) {}
+
+  async reveal(input: {
+    accountId: unknown; body: unknown; authorization: string | null
+    secure: boolean; post: boolean; requestId: string
+  }): Promise<RevealResult> {
+    const account = accountIdSchema.safeParse(input.accountId)
+    const body = revealInputSchema.safeParse(input.body)
+    const authenticated = authenticate(input.authorization)
+    const event: RevealAudit = {
+      requestId: input.requestId,
+      requesterId: body.success ? body.data.requesterId : null,
+      serviceId: authenticated ? FINANCE_SERVICE_ID : null,
+      accountId: account.success ? account.data : null,
+      purpose: body.success ? body.data.purpose : 'unknown', status: 403,
+    }
+    try {
+      return await this.repository.transaction(async tx => {
+        let result: RevealResult = { status: 403 }
+        if (authenticated && await tx.limited(event)) {
+          result = { status: 429 }
+        } else if (authenticated && input.secure && input.post && account.success && body.success) {
+          const encrypted = await tx.findPassword(account.data)
+          if (!encrypted) result = { status: 404 }
+          else {
+            try {
+              // Audit commits before a plaintext response can leave this service.
+              const password = this.decrypt(encrypted)
+              result = password ? { status: 200, password } : { status: 404 }
+            } catch { result = { status: 503 } }
+          }
+        }
+        await tx.audit({ ...event, status: result.status })
+        return result
+      })
+    } catch {
+      // Failure to persist audit/limit is fail-closed. Never emit the underlying error.
+      return { status: 503 }
+    }
+  }
+}
diff --git a/furniture-3d-system/tests/integration/store-account-password-reveal.test.ts b/furniture-3d-system/tests/integration/store-account-password-reveal.test.ts
new file mode 100644
index 00000000..3a50cf93
--- /dev/null
+++ b/furniture-3d-system/tests/integration/store-account-password-reveal.test.ts
@@ -0,0 +1,227 @@
+/** @jest-environment node */
+import { randomBytes, randomUUID } from 'node:crypto'
+import { readFileSync } from 'node:fs'
+import { resolve } from 'node:path'
+import { spawnSync } from 'node:child_process'
+import { Pool } from 'pg'
+import { encryptStoreAccountPassword } from '@/lib/store-account-crypto'
+import { StoreAccountPasswordRevealRepository } from '@/server/repositories/store-account-password-reveal.repository'
+import type { StoreAccountPasswordRevealService as ServiceType } from '@/server/services/store-account-password-reveal.service'
+import { POST } from '@/app/internal/store-accounts/[id]/password/reveal/route'
+
+jest.mock('server-only', () => ({}))
+let mockService: ServiceType
+jest.mock('@/server/services/store-account-password-reveal.service', () => ({
+  StoreAccountPasswordRevealService: jest.fn().mockImplementation(() => ({
+    reveal: (...args: Parameters<ServiceType['reveal']>) => mockService.reveal(...args),
+  })),
+}))
+
+// Explicit opt-in, loopback only. Creates and removes only its own random fixture DB/role.
+const adminUrl = process.env.STORE_REVEAL_TEST_ADMIN_URL
+const integration = adminUrl ? describe : describe.skip
+integration('finance reveal with real PostgreSQL, migration and crypto', () => {
+  const suffix = randomBytes(8).toString('hex')
+  const dbName = `store_reveal_test_${suffix}`
+  const readerName = `store_reveal_reader_${suffix}`
+  const password = randomBytes(24).toString('base64url')
+  const token = randomBytes(32).toString('base64url')
+  const edgeToken = randomBytes(32).toString('base64url')
+  const startedAt = new Date().toISOString()
+  let admin: Pool
+  let db: Pool
+  let initialRows: string
+  let initialColumns: string[]
+  let databaseCreated = false
+  let roleCreated = false
+  let sqlContainsPassword = false
+  let consoleContainsPassword = false
+  let logSpies: jest.SpyInstance[] = []
+
+  async function call(id = 'synthetic-1', actor = 'finance-user', authorization: string | null = `Bearer ${token}`) {
+    const headers: Record<string, string> = {
+      'Content-Type': 'application/json',
+      'X-Forwarded-Proto': 'https', 'X-Store-Reveal-Edge-Token': edgeToken,
+    }
+    if (authorization) headers.Authorization = authorization
+    return POST(new Request(`https://example.test/internal/store-accounts/${id}/password/reveal`, {
+      method: 'POST', headers, body: JSON.stringify({ requesterId: actor, purpose: 'view' }),
+    }), { params: Promise.resolve({ id }) })
+  }
+
+  beforeAll(async () => {
+    const target = new URL(adminUrl!)
+    if (!['localhost', '127.0.0.1', '[::1]'].includes(target.hostname)) throw new Error('Local test database required')
+    admin = new Pool({ connectionString: adminUrl, max: 1, connectionTimeoutMillis: 2000 })
+    await admin.query(`CREATE DATABASE "${dbName}"`)
+    databaseCreated = true
+    await admin.query(`CREATE ROLE "${readerName}" NOLOGIN`)
+    roleCreated = true
+    target.pathname = `/${dbName}`
+    db = new Pool({ connectionString: target.toString(), max: 8,
+      // Enable actual server statement logs in this isolated test session only.
+      // Never log bind values, even on errors.
+      options: '-c log_statement=all -c log_parameter_max_length=0 -c log_parameter_max_length_on_error=0 -c log_min_error_statement=panic',
+      statement_timeout: 3000, connectionTimeoutMillis: 2000,
+    })
+    db.on('connect', client => {
+      const original = client.query.bind(client)
+      // Observe SQL sent to PostgreSQL in memory, output a boolean only.
+      client.query = ((...args: unknown[]) => {
+        sqlContainsPassword ||= JSON.stringify(args).includes(password)
+        return (original as (...args: unknown[]) => unknown)(...args)
+      }) as typeof client.query
+    })
+    logSpies = ['log', 'warn', 'error', 'info', 'debug'].map(method =>
+      jest.spyOn(console, method as 'log').mockImplementation((...args: unknown[]) => {
+        consoleContainsPassword ||= args.some(arg => String(arg).includes(password))
+      }))
+    process.env.STORE_ACCOUNT_ENCRYPTION_KEY = randomBytes(32).toString('base64url')
+    process.env.STORE_ACCOUNT_FINANCE_TOKEN = token
+    process.env.STORE_ACCOUNT_REVEAL_EDGE_TOKEN = edgeToken
+    await db.query(`CREATE TABLE public."StoreAccount" (id TEXT PRIMARY KEY, "storeName" TEXT,
+      "passwordCiphertext" TEXT NOT NULL DEFAULT '', visible BOOLEAN NOT NULL);
+      CREATE SCHEMA external_store_accounts;
+      CREATE VIEW external_store_accounts.accounts_v1 AS
+        SELECT id, "storeName" FROM public."StoreAccount" WHERE visible;
+      GRANT USAGE ON SCHEMA external_store_accounts TO "${readerName}";
+      GRANT SELECT ON external_store_accounts.accounts_v1 TO "${readerName}";`)
+    await db.query(`INSERT INTO public."StoreAccount"
+      SELECT 'synthetic-' || n, 'Synthetic store ' || n,
+        CASE WHEN n <= 957 THEN $1 ELSE '' END, n <= 958 FROM generate_series(1,960) n`,
+    [encryptStoreAccountPassword(password)])
+    initialRows = JSON.stringify((await db.query('SELECT * FROM external_store_accounts.accounts_v1 ORDER BY id')).rows)
+    initialColumns = (await db.query(`SELECT column_name FROM information_schema.columns
+      WHERE table_schema='external_store_accounts' AND table_name='accounts_v1' ORDER BY ordinal_position`)).rows.map(r => r.column_name)
+    await db.query(readFileSync(resolve('prisma/migrations/20260908120000_store_account_password_reveal/migration.sql'), 'utf8'))
+    const { StoreAccountPasswordRevealService } = jest.requireActual('@/server/services/store-account-password-reveal.service')
+    mockService = new StoreAccountPasswordRevealService(new StoreAccountPasswordRevealRepository(() => db))
+  }, 20000)
+
+  beforeEach(async () => { await db.query('TRUNCATE public."StoreAccountPasswordAccessAudit"') })
+
+  afterAll(async () => {
+    logSpies.forEach(spy => spy.mockRestore())
+    delete process.env.STORE_ACCOUNT_ENCRYPTION_KEY
+    delete process.env.STORE_ACCOUNT_FINANCE_TOKEN
+    delete process.env.STORE_ACCOUNT_REVEAL_EDGE_TOKEN
+    if (db) await db.end()
+    if (admin) {
+      // Names are generated above, never accepted from env or user input.
+      if (databaseCreated) await admin.query(`DROP DATABASE "${dbName}"`)
+      if (roleCreated) await admin.query(`DROP ROLE "${readerName}"`)
+      await admin.end()
+    }
+  })
+
+  it('preserves every original field and filter with 958 unique rows and a final boolean (957/1/0)', async () => {
+    const { rows: [stats] } = await db.query(`SELECT count(*)::int AS total, count(DISTINCT id)::int AS unique,
+      count(*) FILTER (WHERE "passwordConfigured" IS TRUE)::int AS yes,
+      count(*) FILTER (WHERE "passwordConfigured" IS FALSE)::int AS no,
+      count(*) FILTER (WHERE "passwordConfigured" IS NULL)::int AS unknown
+      FROM external_store_accounts.accounts_v1`)
+    expect(stats).toEqual({ total: 958, unique: 958, yes: 957, no: 1, unknown: 0 })
+    const { rows: columns } = await db.query(`SELECT column_name, data_type FROM information_schema.columns
+      WHERE table_schema='external_store_accounts' AND table_name='accounts_v1' ORDER BY ordinal_position`)
+    expect(columns.map(c => c.column_name)).toEqual([...initialColumns, 'passwordConfigured'])
+    expect(columns.at(-1)?.data_type).toBe('boolean')
+    expect(JSON.stringify((await db.query('SELECT id, "storeName" FROM external_store_accounts.accounts_v1 ORDER BY id')).rows) === initialRows).toBe(true)
+  })
+
+  it('returns correct synthetic plaintext through the HTTP handler only after audit commits', async () => {
+    const response = await call()
+    const body = await response.json()
+    expect(response.status).toBe(200)
+    expect(response.headers.get('cache-control')).toBe('no-store')
+    expect(body.password === password).toBe(true)
+    const { rows } = await db.query('SELECT * FROM public."StoreAccountPasswordAccessAudit" WHERE "requestId"=$1', [body.requestId])
+    expect(rows.length).toBe(1)
+    expect(rows[0].status).toBe(200)
+    expect(rows[0].requesterId).toBe('finance-user')
+    expect(rows[0].serviceId).toBe('finance-store-accounts')
+    expect(rows[0].accountId).toBe('synthetic-1')
+    expect(rows[0].purpose).toBe('view')
+    expect(rows[0].createdAt instanceof Date).toBe(true)
+    expect(JSON.stringify(rows).includes(password)).toBe(false)
+  })
+
+  it('persists 403 and 404 attempts and uses no-store on both', async () => {
+    const unauthorized = await call('synthetic-1', 'u', null)
+    const missing = await call('does-not-exist')
+    const empty = await call('synthetic-958')
+    expect([unauthorized.status, missing.status, empty.status]).toEqual([403, 404, 404])
+    expect([unauthorized, missing, empty].every(r => r.headers.get('cache-control') === 'no-store')).toBe(true)
+    const { rows } = await db.query('SELECT status FROM public."StoreAccountPasswordAccessAudit" ORDER BY "createdAt"')
+    expect(rows.map(r => r.status)).toEqual([403, 404, 404])
+  })
+
+  it('enforces account limits atomically across concurrent requests and service instances', async () => {
+    const responses = await Promise.all(Array.from({ length: 8 }, (_, n) => call('synthetic-1', `actor-${n}`)))
+    expect(responses.filter(r => r.status === 200).length).toBe(5)
+    expect(responses.filter(r => r.status === 429).length).toBe(3)
+    expect(responses.every(r => r.headers.get('cache-control') === 'no-store')).toBe(true)
+    const { StoreAccountPasswordRevealService } = jest.requireActual('@/server/services/store-account-password-reveal.service')
+    const restarted = new StoreAccountPasswordRevealService(new StoreAccountPasswordRevealRepository(() => db))
+    const result = await restarted.reveal({ accountId: 'synthetic-1', body: { requesterId: 'new-actor', purpose: 'copy' },
+      authorization: `Bearer ${token}`, post: true, secure: true, requestId: randomUUID() })
+    expect(result.status).toBe(429)
+  })
+
+  it('enforces requester limits even when the caller changes accounts', async () => {
+    const responses = []
+    for (let n = 1; n <= 11; n++) responses.push(await call(`synthetic-${n}`))
+    expect(responses.filter(r => r.status === 200).length).toBe(10)
+    expect(responses[10].status).toBe(429)
+  })
+
+  it.each([{ count: 30, age: '0 seconds' }, { count: 300, age: '2 hours' }])('enforces global service limits (%#)', async ({ count, age }) => {
+    for (let n = 0; n < count; n++) {
+      await db.query(`INSERT INTO public."StoreAccountPasswordAccessAudit"
+        ("requestId", "serviceId", purpose, status, "createdAt") VALUES ($1,'finance-store-accounts','view',404,clock_timestamp()-$2::interval)`,
+      [randomUUID(), age])
+    }
+    expect((await call('synthetic-10', 'new-user')).status).toBe(429)
+  })
+
+  it('returns 503 without plaintext when audit persistence fails', async () => {
+    await db.query(`ALTER TABLE public."StoreAccountPasswordAccessAudit" ADD CONSTRAINT test_reject_success CHECK(status <> 200)`)
+    try {
+      const response = await call()
+      expect(response.status).toBe(503)
+      expect((await response.text()).includes(password)).toBe(false)
+    } finally { await db.query('ALTER TABLE public."StoreAccountPasswordAccessAudit" DROP CONSTRAINT test_reject_success') }
+  })
+
+  it('does not widen the ordinary reader ACL to the base table, password or audit', async () => {
+    const client = await db.connect()
+    try {
+      await client.query(`SET ROLE "${readerName}"`)
+      expect((await client.query('SELECT count(*)::int AS total FROM external_store_accounts.accounts_v1')).rows[0].total).toBe(958)
+      for (const sql of [
+        'SELECT * FROM public."StoreAccount" LIMIT 0',
+        'SELECT "passwordCiphertext" FROM public."StoreAccount" LIMIT 0',
+        'SELECT * FROM public."StoreAccountPasswordAccessAudit" LIMIT 0',
+      ]) {
+        let denied = false
+        try { await client.query(sql) } catch (error) { denied = (error as { code: string }).code === '42501' }
+        expect(denied).toBe(true)
+      }
+    } finally { await client.query('RESET ROLE'); client.release() }
+  })
+
+  it('contains no synthetic plaintext in application, audit or actual PostgreSQL query logs', async () => {
+    await call()
+    expect(sqlContainsPassword).toBe(false)
+    expect(consoleContainsPassword).toBe(false)
+    expect(JSON.stringify((await db.query('SELECT * FROM public."StoreAccountPasswordAccessAudit"')).rows).includes(password)).toBe(false)
+    // Optional in CI; required for local acceptance when configured. Read output
+    // only into memory and assert booleans so logs and secrets cannot enter reports.
+    if (process.env.STORE_REVEAL_TEST_POSTGRES_CONTAINER) {
+      const logs = spawnSync('docker', ['logs', '--since', startedAt, process.env.STORE_REVEAL_TEST_POSTGRES_CONTAINER], { encoding: 'utf8', maxBuffer: 16 * 1024 * 1024 })
+      const output = String(logs.stdout) + String(logs.stderr)
+      expect(logs.status === 0).toBe(true)
+      expect(output.includes('StoreAccountPasswordAccessAudit')).toBe(true)
+      expect(output.includes(password)).toBe(false)
+    }
+  })
+})