From c643c09512bb90b653c54582301bfab3f7c2deca Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Mon, 18 May 2026 15:32:37 +0800
Subject: [PATCH 01/21] feat(intake): refine product list and sku workflow

---
 .../src/app/intake/IntakeClient.test.tsx      |  38 ++
 .../src/app/intake/IntakeClient.tsx           | 481 +++++++++++++++++-
 .../NonIntegratedDetailClient.tsx             |  80 ++-
 .../non-integrated/nonIntegratedStorage.ts    |   3 +
 .../src/lib/non-integrated-sku-export.ts      |   6 +-
 5 files changed, 580 insertions(+), 28 deletions(-)

diff --git a/furniture-3d-system/src/app/intake/IntakeClient.test.tsx b/furniture-3d-system/src/app/intake/IntakeClient.test.tsx
index 4cd934a3..86eea57b 100644
--- a/furniture-3d-system/src/app/intake/IntakeClient.test.tsx
+++ b/furniture-3d-system/src/app/intake/IntakeClient.test.tsx
@@ -473,6 +473,7 @@ describe('IntakeClient', () => {
   beforeEach(() => {
     jest.useRealTimers()
     window.localStorage.clear()
+    window.sessionStorage.clear()
     jest.restoreAllMocks()
     mockAoaToSheet.mockClear()
     mockBookNew.mockClear()
@@ -2310,6 +2311,43 @@ describe('IntakeClient', () => {
     )
   })
 
+  it('restores opened workspace tabs after leaving and returning to intake', async () => {
+    const actor = userEvent.setup()
+    const product = createNonIntegratedProduct()
+
+    window.localStorage.setItem(
+      NON_INTEGRATED_STORAGE_KEY,
+      JSON.stringify([product]),
+    )
+
+    const firstRender = renderSelector({
+      eligibleSkuList: [],
+      initialNonIntegratedProducts: [product],
+    })
+
+    await actor.click(screen.getByRole('button', { name: '修改' }))
+
+    expect(screen.getByRole('tab', { name: /DNZ0001/ })).toHaveAttribute(
+      'aria-selected',
+      'true',
+    )
+
+    firstRender.unmount()
+
+    renderSelector({
+      eligibleSkuList: [],
+      initialNonIntegratedProducts: [product],
+    })
+
+    expect(screen.getByRole('tab', { name: /DNZ0001/ })).toHaveAttribute(
+      'aria-selected',
+      'true',
+    )
+    expect(screen.getByTestId('embedded-non-integrated-detail')).toHaveTextContent(
+      'DNZ0001-1-edit',
+    )
+  })
+
   it('opens a separate workspace tab each time product edit is clicked', async () => {
     const actor = userEvent.setup()
 
diff --git a/furniture-3d-system/src/app/intake/IntakeClient.tsx b/furniture-3d-system/src/app/intake/IntakeClient.tsx
index 3f61153a..1e18a5bc 100644
--- a/furniture-3d-system/src/app/intake/IntakeClient.tsx
+++ b/furniture-3d-system/src/app/intake/IntakeClient.tsx
@@ -334,6 +334,70 @@ type IntakeWorkspaceTab =
     };
 
 const MAX_WORKSPACE_TABS_PER_PAGE = 3;
+const INTAKE_WORKSPACE_STATE_STORAGE_KEY = "intake:workspace-state:v1";
+
+type PersistedIntakeWorkspaceTab =
+  | {
+      id: string;
+      kind: "pendingEntry";
+      entryTab: IntakeEntryTab;
+    }
+  | {
+      id: string;
+      kind: "progressDashboard";
+    }
+  | {
+      id: string;
+      kind: "spuRuleLibrary";
+    }
+  | {
+      id: string;
+      kind: "productPatentLedger";
+      target?: ProductPatentLedgerTarget;
+    }
+  | {
+      id: string;
+      kind: "productPatentDashboard";
+    }
+  | {
+      id: string;
+      kind: "nonIntegratedProduct";
+      productId: string;
+      mode: WorkspaceProductMode;
+      productDevelopmentKind: ProductDevelopmentKind;
+      detailState?: WorkspaceProductDetailState;
+    }
+  | {
+      id: string;
+      kind: "newNonIntegratedProduct";
+      productDevelopmentKind: ProductDevelopmentKind;
+    }
+  | {
+      id: string;
+      kind: "bomLibrary";
+      bomLibrary: BomLibraryKey;
+    }
+  | {
+      id: string;
+      kind: "rawMaterialLibrary";
+      rawMaterialLibrary: RawMaterialLibraryKey;
+      selectedMaterialName?: string;
+    }
+  | {
+      id: string;
+      kind: "referenceEstimator";
+    };
+
+type PersistedIntakeWorkspaceState = {
+  activeTabId: string | null;
+  tabs: PersistedIntakeWorkspaceTab[];
+};
+
+type InitialIntakeWorkspaceState = {
+  activeTabId: string | null;
+  sequence: number;
+  tabs: IntakeWorkspaceTab[];
+};
 
 type WorkbenchSku = {
   id: string;
@@ -527,6 +591,17 @@ const TABLE_ACTION_BUTTON_PRIMARY = `${TABLE_ACTION_BUTTON_BASE} !border-zinc-95
 const INTAKE_PRIMARY_BUTTON_CLASS =
   "!border-zinc-950 !bg-zinc-950 !bg-none !text-white !shadow-none hover:!border-zinc-800 hover:!bg-zinc-800 focus:!border-zinc-600 disabled:!border-zinc-200 disabled:!bg-zinc-200 disabled:!text-zinc-400";
 type NonIntegratedQuickScope = "all" | "created" | "pending";
+type NonIntegratedProductKindFilter = "all" | "new" | "stock";
+type NonIntegratedListQuery = {
+  productKind: NonIntegratedProductKindFilter;
+  spu: string;
+  appearanceDesigner: string;
+  structureDesigner: string;
+  spuOwner: string;
+  planningOwner: string;
+  spaceDesigner: string;
+  purchaseOwner: string;
+};
 
 const BOM_LIBRARY_OPTIONS: {
   key: BomLibraryKey;
@@ -614,6 +689,30 @@ function getProductDevelopmentKind(
   return product.productDevelopmentKind === "series" ? "series" : "product";
 }
 
+function isNonIntegratedStockProduct(
+  product: Pick<
+    NonIntegratedProductRecord,
+    "formalSpuAssigned" | "openingReference" | "processTemplate" | "spu"
+  >,
+) {
+  const normalizedSpu = product.spu?.trim().toUpperCase() ?? "";
+  const normalizedTemporaryCode =
+    product.openingReference?.temporaryCode?.trim().toUpperCase() ?? "";
+  const normalizedProductName =
+    product.openingReference?.productName?.trim().toUpperCase() ?? "";
+
+  return (
+    product.processTemplate?.trim() === "存量商品" ||
+    product.openingReference?.currentStage?.trim() === "存量商品" ||
+    Boolean(
+      product.formalSpuAssigned &&
+        normalizedSpu &&
+        (normalizedSpu === normalizedTemporaryCode ||
+          normalizedSpu === normalizedProductName),
+    )
+  );
+}
+
 function getProductDevelopmentDetailLabel(
   product: NonIntegratedProductRecord,
 ) {
@@ -649,6 +748,285 @@ function createNewNonIntegratedProductWorkspaceTab(
   };
 }
 
+function getIntakeWorkspaceStateStorageKey(userId: string) {
+  return `${INTAKE_WORKSPACE_STATE_STORAGE_KEY}:${userId || "anonymous"}`;
+}
+
+function createDefaultIntakeWorkspaceState(): InitialIntakeWorkspaceState {
+  return {
+    tabs: [createPendingEntryWorkspaceTab("nonIntegrated")],
+    activeTabId: DEFAULT_WORKSPACE_TAB_ID,
+    sequence: 0,
+  };
+}
+
+function readWorkspaceTabSequence(tabId: string) {
+  const maybeSequence = Number(tabId.split(":").at(-1));
+  return Number.isFinite(maybeSequence) ? maybeSequence : 0;
+}
+
+function getMaxWorkspaceTabSequence(tabs: IntakeWorkspaceTab[]) {
+  return tabs.reduce(
+    (maxSequence, tab) =>
+      Math.max(maxSequence, readWorkspaceTabSequence(tab.id)),
+    0,
+  );
+}
+
+function normalizeWorkspaceProductDetailState(
+  value: unknown,
+): WorkspaceProductDetailState | undefined {
+  if (!value || typeof value !== "object") return undefined;
+
+  const record = value as Partial<WorkspaceProductDetailState>;
+  if (
+    (record.view === "detail" || record.view === "document") &&
+    record.category &&
+    NON_INTEGRATED_DOCUMENT_WORKSPACE_CATEGORIES.includes(record.category)
+  ) {
+    return {
+      view: record.view,
+      category: record.category,
+    };
+  }
+
+  return undefined;
+}
+
+function serializeIntakeWorkspaceTab(
+  tab: IntakeWorkspaceTab,
+): PersistedIntakeWorkspaceTab {
+  if (tab.kind === "pendingEntry") {
+    return { id: tab.id, kind: tab.kind, entryTab: tab.entryTab };
+  }
+  if (tab.kind === "nonIntegratedProduct") {
+    return {
+      id: tab.id,
+      kind: tab.kind,
+      productId: tab.productId,
+      mode: tab.mode,
+      productDevelopmentKind: tab.productDevelopmentKind,
+      detailState: tab.detailState,
+    };
+  }
+  if (tab.kind === "newNonIntegratedProduct") {
+    return {
+      id: tab.id,
+      kind: tab.kind,
+      productDevelopmentKind: tab.productDevelopmentKind,
+    };
+  }
+  if (tab.kind === "bomLibrary") {
+    return { id: tab.id, kind: tab.kind, bomLibrary: tab.bomLibrary };
+  }
+  if (tab.kind === "rawMaterialLibrary") {
+    return {
+      id: tab.id,
+      kind: tab.kind,
+      rawMaterialLibrary: tab.rawMaterialLibrary,
+      selectedMaterialName: tab.selectedMaterialName,
+    };
+  }
+  if (tab.kind === "productPatentLedger") {
+    return { id: tab.id, kind: tab.kind, target: tab.target };
+  }
+
+  return { id: tab.id, kind: tab.kind };
+}
+
+function restoreIntakeWorkspaceTab(
+  tab: PersistedIntakeWorkspaceTab,
+  productMap: Map<string, NonIntegratedProductRecord>,
+): IntakeWorkspaceTab | null {
+  if (!tab.id || typeof tab.id !== "string") return null;
+
+  if (tab.kind === "pendingEntry") {
+    if (tab.entryTab !== "integrated" && tab.entryTab !== "nonIntegrated") {
+      return null;
+    }
+    return createPendingEntryWorkspaceTab(tab.entryTab, tab.id);
+  }
+  if (tab.kind === "progressDashboard") {
+    return { id: tab.id, kind: tab.kind, label: "产品开发进度" };
+  }
+  if (tab.kind === "spuRuleLibrary") {
+    return { id: tab.id, kind: tab.kind, label: "SPU规则库" };
+  }
+  if (tab.kind === "productPatentLedger") {
+    return {
+      id: tab.id,
+      kind: tab.kind,
+      label: PRODUCT_PATENT_LEDGER_LABEL,
+      target: tab.target,
+    };
+  }
+  if (tab.kind === "productPatentDashboard") {
+    return {
+      id: tab.id,
+      kind: tab.kind,
+      label: PRODUCT_PATENT_DASHBOARD_LABEL,
+    };
+  }
+  if (tab.kind === "nonIntegratedProduct") {
+    const product = productMap.get(tab.productId);
+    if (!product) return null;
+    const productDevelopmentKind = getProductDevelopmentKind(product);
+    return {
+      id: tab.id,
+      kind: tab.kind,
+      label: getProductDevelopmentDetailLabel(product),
+      productId: product.id,
+      product,
+      mode: tab.mode === "view" ? "view" : "edit",
+      productDevelopmentKind,
+      detailState: normalizeWorkspaceProductDetailState(tab.detailState),
+    };
+  }
+  if (tab.kind === "newNonIntegratedProduct") {
+    const productDevelopmentKind =
+      tab.productDevelopmentKind === "series" ? "series" : "product";
+    return createNewNonIntegratedProductWorkspaceTab(
+      tab.id,
+      productDevelopmentKind,
+    );
+  }
+  if (tab.kind === "bomLibrary") {
+    const option = BOM_LIBRARY_OPTIONS.find(
+      (item) => item.key === tab.bomLibrary,
+    );
+    if (!option) return null;
+    return {
+      id: tab.id,
+      kind: tab.kind,
+      label: option.label,
+      bomLibrary: option.key,
+    };
+  }
+  if (tab.kind === "rawMaterialLibrary") {
+    const option = RAW_MATERIAL_LIBRARY_OPTIONS.find(
+      (item) => item.key === tab.rawMaterialLibrary,
+    );
+    if (!option) return null;
+    return {
+      id: tab.id,
+      kind: tab.kind,
+      label: option.label,
+      rawMaterialLibrary: option.key,
+      selectedMaterialName: tab.selectedMaterialName,
+    };
+  }
+  if (tab.kind === "referenceEstimator") {
+    return {
+      id: tab.id,
+      kind: tab.kind,
+      label: REFERENCE_ESTIMATOR_WORKSPACE_LABEL,
+    };
+  }
+
+  return null;
+}
+
+function readInitialIntakeWorkspaceState(params: {
+  products: NonIntegratedProductRecord[];
+  userId: string;
+  shouldRestore: boolean;
+}): InitialIntakeWorkspaceState {
+  if (!params.shouldRestore || typeof window === "undefined") {
+    return createDefaultIntakeWorkspaceState();
+  }
+
+  try {
+    const rawState = window.sessionStorage.getItem(
+      getIntakeWorkspaceStateStorageKey(params.userId),
+    );
+    if (!rawState) return createDefaultIntakeWorkspaceState();
+
+    const parsed = JSON.parse(rawState) as Partial<PersistedIntakeWorkspaceState>;
+    if (!Array.isArray(parsed.tabs)) {
+      return createDefaultIntakeWorkspaceState();
+    }
+
+    const productMap = new Map(
+      params.products.map((product) => [product.id, product]),
+    );
+    const tabs = parsed.tabs
+      .map((tab) =>
+        restoreIntakeWorkspaceTab(
+          tab as PersistedIntakeWorkspaceTab,
+          productMap,
+        ),
+      )
+      .filter((tab): tab is IntakeWorkspaceTab => Boolean(tab));
+
+    if (tabs.length === 0) return createDefaultIntakeWorkspaceState();
+
+    const activeTabId = tabs.some((tab) => tab.id === parsed.activeTabId)
+      ? parsed.activeTabId ?? tabs[0]?.id ?? null
+      : tabs[0]?.id ?? null;
+
+    return {
+      tabs,
+      activeTabId,
+      sequence: getMaxWorkspaceTabSequence(tabs),
+    };
+  } catch {
+    return createDefaultIntakeWorkspaceState();
+  }
+}
+
+function persistIntakeWorkspaceState(params: {
+  activeTabId: string | null;
+  shouldPersist: boolean;
+  tabs: IntakeWorkspaceTab[];
+  userId: string;
+}) {
+  if (!params.shouldPersist || typeof window === "undefined") return;
+
+  try {
+    const state: PersistedIntakeWorkspaceState = {
+      activeTabId: params.activeTabId,
+      tabs: params.tabs.map(serializeIntakeWorkspaceTab),
+    };
+    window.sessionStorage.setItem(
+      getIntakeWorkspaceStateStorageKey(params.userId),
+      JSON.stringify(state),
+    );
+  } catch {
+    // Ignore quota/private-mode failures; the UI can still rebuild the default tab.
+  }
+}
+
+function getWorkspaceTabInitialSection(tab: IntakeWorkspaceTab | null) {
+  if (!tab) return "pending";
+  if (
+    tab.kind === "pendingEntry" ||
+    tab.kind === "spuRuleLibrary" ||
+    tab.kind === "nonIntegratedProduct" ||
+    tab.kind === "newNonIntegratedProduct"
+  ) {
+    return "pending";
+  }
+  if (tab.kind === "progressDashboard") return "progress";
+  if (tab.kind === "productPatentLedger") return "patents";
+  if (tab.kind === "productPatentDashboard") return "patents";
+  if (tab.kind === "bomLibrary") return "bom";
+  if (tab.kind === "rawMaterialLibrary") return "rawMaterialLibrary";
+  return "referenceEstimator";
+}
+
+function getWorkspaceTabInitialPendingEntryTab(tab: IntakeWorkspaceTab | null) {
+  if (tab?.kind === "pendingEntry") return tab.entryTab;
+  if (
+    tab?.kind === "nonIntegratedProduct" ||
+    tab?.kind === "newNonIntegratedProduct"
+  ) {
+    return getPendingEntryTabFromProductDevelopmentKind(
+      tab.productDevelopmentKind,
+    );
+  }
+  return "nonIntegrated";
+}
+
 function getWorkspaceTabPageKey(tab: IntakeWorkspaceTab) {
   if (tab.kind === "pendingEntry") return `pending-entry:${tab.entryTab}`;
   if (tab.kind === "progressDashboard") return "product-progress:dashboard";
@@ -2047,7 +2425,8 @@ function NonIntegratedPendingDetail({
   const [isCopySubmitting, setIsCopySubmitting] = useState(false);
   const [activeQuickScope, setActiveQuickScope] =
     useState<NonIntegratedQuickScope>("all");
-  const [queryDraft, setQueryDraft] = useState({
+  const [queryDraft, setQueryDraft] = useState<NonIntegratedListQuery>({
+    productKind: "all",
     spu: "",
     appearanceDesigner: "",
     structureDesigner: "",
@@ -2056,7 +2435,8 @@ function NonIntegratedPendingDetail({
     spaceDesigner: "",
     purchaseOwner: "",
   });
-  const [appliedQuery, setAppliedQuery] = useState({
+  const [appliedQuery, setAppliedQuery] = useState<NonIntegratedListQuery>({
+    productKind: "all",
     spu: "",
     appearanceDesigner: "",
     structureDesigner: "",
@@ -2241,6 +2621,12 @@ function NonIntegratedPendingDetail({
       const documentWorkspaceCountByCategory =
         getDocumentWorkspaceCountByCategory(product);
       const people = getNonIntegratedListPeople(product);
+      const stockProduct = isNonIntegratedStockProduct(product);
+      const productKindMatched =
+        appliedQuery.productKind === "all" ||
+        (appliedQuery.productKind === "stock"
+          ? stockProduct
+          : !stockProduct);
       const spuMatched =
         normalizedSpuKeyword.length === 0 ||
         productDisplayName.includes(normalizedSpuKeyword) ||
@@ -2270,11 +2656,16 @@ function NonIntegratedPendingDetail({
               documentWorkspaceCountByCategory,
             ));
 
-      return spuMatched && peopleMatched && quickScopeMatched;
+      return (
+        productKindMatched &&
+        spuMatched &&
+        peopleMatched &&
+        quickScopeMatched
+      );
     });
   }, [activeQuickScope, appliedQuery, currentUser, products]);
   const filterFields: Array<{
-    key: keyof typeof queryDraft;
+    key: Exclude<keyof NonIntegratedListQuery, "productKind">;
     label: ReactNode;
     ariaLabel: string;
     placeholder: string;
@@ -2349,7 +2740,31 @@ function NonIntegratedPendingDetail({
               </button>
             ))}
           </div>
-          <div className="grid items-end gap-2 md:grid-cols-[repeat(7,minmax(0,1fr))_72px_104px]">
+          <div className="grid items-end gap-2 md:grid-cols-[104px_repeat(7,minmax(0,1fr))_72px_104px]">
+            <label className="space-y-1.5 text-xs text-apple-label-secondary">
+              <span>产品类型</span>
+              <select
+                aria-label="产品类型"
+                value={queryDraft.productKind}
+                onChange={(event) => {
+                  const productKind = event.target
+                    .value as NonIntegratedProductKindFilter;
+                  setQueryDraft((current) => ({
+                    ...current,
+                    productKind,
+                  }));
+                  setAppliedQuery((current) => ({
+                    ...current,
+                    productKind,
+                  }));
+                }}
+                className="h-8 w-full rounded-apple-md border border-apple-separator bg-apple-bg-secondary px-2.5 text-xs text-apple-label-primary outline-none"
+              >
+                <option value="all">全部</option>
+                <option value="new">新品</option>
+                <option value="stock">存量商品</option>
+              </select>
+            </label>
             {filterFields.map((filter) => (
               <label
                 key={filter.key}
@@ -7702,28 +8117,50 @@ export default function IntakeClient(props: IntakeClientProps) {
   const canDeleteNonIntegratedProducts = canDeleteIntakeProducts(
     props.user.role,
   );
-  const [activeSection, setActiveSection] = useState<IntakeSection>(
-    props.initialActiveSection ?? "pending",
+  const shouldPersistWorkspaceState = !isEditorMode(props);
+  const [initialWorkspaceState] = useState(() =>
+    readInitialIntakeWorkspaceState({
+      products: props.initialNonIntegratedProducts,
+      userId: props.user.id,
+      shouldRestore: shouldPersistWorkspaceState,
+    }),
+  );
+  const initialActiveWorkspaceTab =
+    initialWorkspaceState.tabs.find(
+      (tab) => tab.id === initialWorkspaceState.activeTabId,
+    ) ??
+    initialWorkspaceState.tabs[0] ??
+    null;
+  const [activeSection, setActiveSection] = useState<IntakeSection>(
+    props.initialActiveSection ??
+      getWorkspaceTabInitialSection(initialActiveWorkspaceTab),
+  );
+  const [pendingEntryTab, setPendingEntryTab] = useState<IntakeEntryTab>(
+    getWorkspaceTabInitialPendingEntryTab(initialActiveWorkspaceTab),
+  );
+  const [activeBomLibrary, setActiveBomLibrary] = useState<BomLibraryKey>(
+    initialActiveWorkspaceTab?.kind === "bomLibrary"
+      ? initialActiveWorkspaceTab.bomLibrary
+      : "materialLibrary",
   );
-  const [pendingEntryTab, setPendingEntryTab] =
-    useState<IntakeEntryTab>("nonIntegrated");
-  const [activeBomLibrary, setActiveBomLibrary] =
-    useState<BomLibraryKey>("materialLibrary");
   const [activeRawMaterialLibrary, setActiveRawMaterialLibrary] =
     useState<RawMaterialLibraryKey>(
-      props.initialActiveRawMaterialLibrary ?? "processConfig",
+      props.initialActiveRawMaterialLibrary ??
+        (initialActiveWorkspaceTab?.kind === "rawMaterialLibrary"
+          ? initialActiveWorkspaceTab.rawMaterialLibrary
+          : "processConfig"),
     );
   const [nonIntegratedProducts, setNonIntegratedProducts] = useState<
     NonIntegratedProductRecord[]
   >(props.initialNonIntegratedProducts);
   const selectedRawMaterialName = props.initialRawMaterialName?.trim() ?? "";
   const [workspaceTabs, setWorkspaceTabs] = useState<IntakeWorkspaceTab[]>(
-    () => [createPendingEntryWorkspaceTab("nonIntegrated")],
+    () => initialWorkspaceState.tabs,
   );
   const [activeWorkspaceTabId, setActiveWorkspaceTabId] = useState<
     string | null
-  >(DEFAULT_WORKSPACE_TAB_ID);
-  const workspaceTabSequenceRef = useRef(0);
+  >(initialWorkspaceState.activeTabId);
+  const workspaceTabSequenceRef = useRef(initialWorkspaceState.sequence);
   const initialOpenNewNonIntegratedProductRef = useRef(false);
 
   const activeWorkspaceTab =
@@ -7774,6 +8211,20 @@ export default function IntakeClient(props: IntakeClientProps) {
     setNonIntegratedProducts(props.initialNonIntegratedProducts);
   }, [props.initialNonIntegratedProducts]);
 
+  useEffect(() => {
+    persistIntakeWorkspaceState({
+      activeTabId: activeWorkspaceTabId,
+      shouldPersist: shouldPersistWorkspaceState,
+      tabs: workspaceTabs,
+      userId: props.user.id,
+    });
+  }, [
+    activeWorkspaceTabId,
+    props.user.id,
+    shouldPersistWorkspaceState,
+    workspaceTabs,
+  ]);
+
   function handleScopedProductsChange(
     productDevelopmentKind: ProductDevelopmentKind,
     nextProducts: NonIntegratedProductRecord[],
diff --git a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
index 8c6b55cb..6292e9a1 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
@@ -271,6 +271,7 @@ type SkuColumnWidthKey =
   | "nationalStandardCompliant"
   | "supplierName"
   | "manufacturerCode"
+  | "salesStatus"
   | "batchNo"
   | "dingTalkFlowNo";
 type ProductFactoryTabKey = "factoryInfo" | "skuInfo";
@@ -301,6 +302,7 @@ const SKU_BATCH_CHANGE_TYPE_OPTIONS: SkuBatchChangeType[] = [
   "转厂",
 ];
 const NATIONAL_STANDARD_COMPLIANCE_OPTIONS = ["是", "否"] as const;
+const SKU_SALES_STATUS_OPTIONS = ["销售", "停产", "退市"] as const;
 
 const SKU_COLUMN_DEFAULT_WIDTHS: Record<SkuColumnWidthKey, number> = {
   model: 96,
@@ -319,6 +321,7 @@ const SKU_COLUMN_DEFAULT_WIDTHS: Record<SkuColumnWidthKey, number> = {
   nationalStandardCompliant: 96,
   supplierName: 140,
   manufacturerCode: 96,
+  salesStatus: 96,
   batchNo: 64,
   dingTalkFlowNo: 120,
 };
@@ -1855,11 +1858,11 @@ const DOCUMENT_WORKSPACE_COPY: Record<
     emptyDescription: "可先上传卖点图或文案文件，再在这里集中预览。",
   },
   企划布局: {
-    description: "按 SKU 带出企划布局需要查看和维护的基础信息。",
-    noteLabel: "企划布局备注",
-    notePlaceholder: "可填写企划布局补充说明。",
-    emptyTitle: "当前还没有企划布局资料",
-    emptyDescription: "请先维护 SKU 信息，再在这里查看企划布局。",
+    description: "按 SKU 带出空间布局需要查看和维护的基础信息。",
+    noteLabel: "空间布局备注",
+    notePlaceholder: "可填写空间布局补充说明。",
+    emptyTitle: "当前还没有空间布局资料",
+    emptyDescription: "请先维护 SKU 信息，再在这里查看空间布局。",
   },
   安装方式: {
     description: "按款式集中维护安装图纸、安装视频和版本迭代资料。",
@@ -2632,6 +2635,7 @@ function createEmptySkuItem(): NonIntegratedSkuItem {
     nationalStandardCompliant: "",
     manufacturer: "",
     manufacturerCode: "",
+    salesStatus: "",
     tagMaterial: "",
     model3dFileName: "",
     model3dDataUrl: "",
@@ -4675,6 +4679,7 @@ function deriveSkuItem(
     ),
     manufacturer: item.manufacturer.trim(),
     manufacturerCode: item.manufacturerCode.trim().toUpperCase(),
+    salesStatus: item.salesStatus?.trim() ?? "",
     tagMaterial: formValues.tagMaterial.trim() || item.tagMaterial.trim(),
   };
 }
@@ -4734,6 +4739,7 @@ function buildSkuItemFromImportedRow(
     ),
     manufacturer,
     manufacturerCode,
+    salesStatus: row.salesStatus.trim(),
     tagMaterial: formValues.tagMaterial.trim() || baseItem.tagMaterial,
   };
 }
@@ -16712,6 +16718,7 @@ export default function NonIntegratedDetailClient({
             skuItems[index]?.nationalStandardCompliant?.trim() ?? "",
           manufacturer: skuItems[index]?.manufacturer?.trim() ?? "",
           manufacturerCode: skuItems[index]?.manufacturerCode?.trim() ?? "",
+          salesStatus: skuItems[index]?.salesStatus?.trim() ?? "",
           batchNo: `批次${item.batchNo || 1}`,
           batchChangeType: skuBatchChangeTypes[String(item.batchNo || 1)] ?? "",
           dingTalkFlowNo: skuBatchFlowNos[String(item.batchNo || 1)] ?? "",
@@ -18920,14 +18927,14 @@ export default function NonIntegratedDetailClient({
           onClick={() =>
             setSkuImagePreview({
               src: row.image,
-              alt: row.model || `企划布局图片${index + 1}`,
+              alt: row.model || `空间布局图片${index + 1}`,
             })
           }
         >
           {/* eslint-disable-next-line @next/next/no-img-element */}
           <img
             src={row.image}
-            alt={row.model || `企划布局图片${index + 1}`}
+            alt={row.model || `空间布局图片${index + 1}`}
             className="h-full w-full object-cover"
           />
         </button>
@@ -18962,7 +18969,7 @@ export default function NonIntegratedDetailClient({
           <Search className="h-3.5 w-3.5 shrink-0 text-apple-label-tertiary" />
           <input
             type="text"
-            aria-label={`企划布局${label}`}
+            aria-label={`空间布局${label}`}
             data-testid={`planning-layout-${field}-${row.skuId}`}
             list={isReadOnly ? undefined : listId}
             value={value}
@@ -19055,7 +19062,7 @@ export default function NonIntegratedDetailClient({
               <div className="relative ml-auto h-6 w-10 shrink-0">
                 <input
                   type="text"
-                  aria-label={`企划布局${label}`}
+                  aria-label={`空间布局${label}`}
                   data-testid={`planning-layout-${field}-draft-${row.skuId}`}
                   list={listId}
                   value={draftValue}
@@ -19235,7 +19242,7 @@ export default function NonIntegratedDetailClient({
         <div className="min-h-0 min-w-0 flex-1 overflow-auto p-3">
           {planningLayoutSkuRows.length === 0 ? (
             <div className="flex min-h-[260px] items-center justify-center rounded-apple-xl border border-dashed border-apple-separator text-sm text-apple-label-secondary">
-              当前还没有 SKU 信息，先维护 SKU 后再查看企划布局。
+              当前还没有 SKU 信息，先维护 SKU 后再查看空间布局。
             </div>
           ) : displayedPlanningLayoutSkuRows.length === 0 ? (
             <div className="flex min-h-[260px] items-center justify-center rounded-apple-xl border border-dashed border-apple-separator text-sm text-apple-label-secondary">
@@ -24013,7 +24020,7 @@ function renderFactoryQualityWorkspace() {
                                   ))}
                                 </datalist>
                                 <div className="overflow-x-auto">
-                                  <table className="min-w-[1860px] w-full text-left text-xs">
+                                  <table className="min-w-[1960px] w-full text-left text-xs">
                                     <thead className="bg-apple-bg-secondary/60 text-apple-label-secondary">
                                       <tr>
                                         {[
@@ -24035,6 +24042,7 @@ function renderFactoryQualityWorkspace() {
                                           "符合国标",
                                           "供应商名称",
                                           "供应商代码",
+                                          "销售状态",
                                           "创建批次",
                                           "钉钉流程号",
                                           ...(isReadOnly ? [] : ["操作"]),
@@ -24052,7 +24060,7 @@ function renderFactoryQualityWorkspace() {
                                       {displayedSkuItems.length === 0 ? (
                                         <tr>
                                           <td
-                                            colSpan={isReadOnly ? 20 : 21}
+                                            colSpan={isReadOnly ? 21 : 22}
                                             className="px-3 py-6 text-center text-xs text-apple-label-secondary"
                                           >
                                             这个批次还没有 SKU。请在最新批次下点击“新增SKU”录入本批内容。
@@ -24554,6 +24562,54 @@ function renderFactoryQualityWorkspace() {
                                                 onChange={() => {}}
                                               />
                                             </td>
+                                            <td className="px-2 py-2">
+                                              <SkuColumnResizableFrame
+                                                columnWidth={
+                                                  skuColumnWidths.salesStatus
+                                                }
+                                                minWidth={
+                                                  SKU_COLUMN_DEFAULT_WIDTHS.salesStatus
+                                                }
+                                                onColumnResize={(width) =>
+                                                  handleSkuColumnResize(
+                                                    "salesStatus",
+                                                    width,
+                                                  )
+                                                }
+                                                className="rounded border border-apple-separator bg-apple-bg-secondary"
+                                              >
+                                                <select
+                                                  aria-label={`${
+                                                    item.model ||
+                                                    `SKU ${index + 1}`
+                                                  } 销售状态`}
+                                                  value={item.salesStatus ?? ""}
+                                                  disabled={isReadOnly}
+                                                  onChange={(event) =>
+                                                    updateSkuItem(
+                                                      item.id,
+                                                      "salesStatus",
+                                                      event.target.value,
+                                                    )
+                                                  }
+                                                  className="h-8 w-full border-0 bg-transparent px-2 text-xs text-apple-label-primary outline-none disabled:bg-apple-bg-primary disabled:text-apple-label-secondary"
+                                                >
+                                                  <option value="">
+                                                    请选择
+                                                  </option>
+                                                  {SKU_SALES_STATUS_OPTIONS.map(
+                                                    (option) => (
+                                                      <option
+                                                        key={option}
+                                                        value={option}
+                                                      >
+                                                        {option}
+                                                      </option>
+                                                    ),
+                                                  )}
+                                                </select>
+                                              </SkuColumnResizableFrame>
+                                            </td>
                                             <td className="px-2 py-2">
                                               <SkuColumnResizableFrame
                                                 columnWidth={
diff --git a/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts b/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts
index c984ed23..6b73e499 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts
@@ -86,6 +86,7 @@ export function getNonIntegratedDocumentWorkspaceCategoryLabel(
   if (category === "产品实拍图") return "产品实拍";
   if (category === "产品模型") return "产品资料";
   if (category === "评审资料") return "样品评审";
+  if (category === "企划布局") return "空间布局";
   if (category === "工厂质检") return "首批质检";
   if (category === "检测报告") return "仓库抽检";
   return category;
@@ -304,6 +305,7 @@ export type NonIntegratedSkuItem = {
   nationalStandardCompliant: string;
   manufacturer: string;
   manufacturerCode: string;
+  salesStatus: string;
   tagMaterial: string;
   model3dFileName: string;
   model3dDataUrl: string;
@@ -1134,6 +1136,7 @@ function normalizeSkuItem(
     nationalStandardCompliant: normalizeString(item.nationalStandardCompliant),
     manufacturer: normalizeString(item.manufacturer),
     manufacturerCode: normalizeString(item.manufacturerCode),
+    salesStatus: normalizeString(item.salesStatus),
     tagMaterial: normalizeString(item.tagMaterial),
     model3dFileName: normalizeString(item.model3dFileName),
     model3dDataUrl: normalizeNonIntegratedAssetUrl(
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 3ce5bdf5..64887fe5 100644
--- a/furniture-3d-system/src/lib/non-integrated-sku-export.ts
+++ b/furniture-3d-system/src/lib/non-integrated-sku-export.ts
@@ -18,6 +18,7 @@ export type NonIntegratedSkuExportRow = {
   nationalStandardCompliant: string
   manufacturer: string
   manufacturerCode: string
+  salesStatus: string
   batchNo: string
   batchChangeType: string
   dingTalkFlowNo: string
@@ -51,6 +52,7 @@ export const NON_INTEGRATED_SKU_TEMPLATE_COLUMNS: {
   { key: 'nationalStandardCompliant', label: '符合国标', width: 12 },
   { key: 'manufacturer', label: '供应商名称', width: 18 },
   { key: 'manufacturerCode', label: '供应商代码', width: 14 },
+  { key: 'salesStatus', label: '销售状态', width: 12 },
   { key: 'batchNo', label: '创建批次', width: 12 },
   { key: 'batchChangeType', label: '新增类型', width: 14 },
   { key: 'dingTalkFlowNo', label: '钉钉流程号', width: 18 },
@@ -261,8 +263,10 @@ export async function parseNonIntegratedSkuWorkbook(file: File) {
     }
   })
 
+  const optionalLabels = new Set(['销售状态'])
   const missingLabels = NON_INTEGRATED_SKU_TEMPLATE_COLUMNS.filter(
-    (column) => !headerIndexByLabel.has(column.label),
+    (column) =>
+      !optionalLabels.has(column.label) && !headerIndexByLabel.has(column.label),
   ).map((column) => column.label)
   if (missingLabels.length > 0) {
     throw new Error(

From 1d668c58a3ef9a4f0f5ffe33e726fdcc50c02b53 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Mon, 18 May 2026 17:40:20 +0800
Subject: [PATCH 02/21] fix(intake): improve product list pagination

---
 .../app/api/intake/non-integrated/route.ts    |  47 ++-
 .../src/app/intake/IntakeClient.tsx           | 318 +++++++++++++++++-
 .../intake/non-integrated/nonIntegratedApi.ts |  43 ++-
 furniture-3d-system/src/app/intake/page.tsx   |   9 +-
 ...ntake-non-integrated-product.repository.ts |  49 ++-
 .../intake-non-integrated-product.service.ts  | 261 ++++++++++++++
 6 files changed, 693 insertions(+), 34 deletions(-)

diff --git a/furniture-3d-system/src/app/api/intake/non-integrated/route.ts b/furniture-3d-system/src/app/api/intake/non-integrated/route.ts
index 4e721fec..ffa20f44 100644
--- a/furniture-3d-system/src/app/api/intake/non-integrated/route.ts
+++ b/furniture-3d-system/src/app/api/intake/non-integrated/route.ts
@@ -1,15 +1,56 @@
 import { NextRequest } from 'next/server'
 import { AppError, ErrorCode } from '@/server/core/errors'
 import { handleRequest, jsonError, jsonSuccess } from '@/server/core/response'
-import { intakeNonIntegratedProductService } from '@/server/services/intake-non-integrated-product.service'
+import {
+  intakeNonIntegratedProductService,
+  type IntakeNonIntegratedProductListParams,
+} from '@/server/services/intake-non-integrated-product.service'
+
+function readListParams(request: NextRequest): IntakeNonIntegratedProductListParams {
+  const searchParams = request.nextUrl.searchParams
+  const productDevelopmentKind = searchParams.get('productDevelopmentKind')
+
+  return {
+    page: Number(searchParams.get('page') ?? '1'),
+    pageSize: Number(searchParams.get('pageSize') ?? '50'),
+    productDevelopmentKind:
+      productDevelopmentKind === 'series'
+        ? 'series'
+        : productDevelopmentKind === 'product'
+          ? 'product'
+          : undefined,
+    productKind:
+      searchParams.get('productKind') === 'stock'
+        ? 'stock'
+        : searchParams.get('productKind') === 'new'
+          ? 'new'
+          : 'all',
+    quickScope:
+      searchParams.get('quickScope') === 'created'
+        ? 'created'
+        : searchParams.get('quickScope') === 'pending'
+          ? 'pending'
+          : 'all',
+    spu: searchParams.get('spu') ?? '',
+    appearanceDesigner: searchParams.get('appearanceDesigner') ?? '',
+    structureDesigner: searchParams.get('structureDesigner') ?? '',
+    spuOwner: searchParams.get('spuOwner') ?? '',
+    planningOwner: searchParams.get('planningOwner') ?? '',
+    spaceDesigner: searchParams.get('spaceDesigner') ?? '',
+    purchaseOwner: searchParams.get('purchaseOwner') ?? '',
+  }
+}
 
 export async function GET(request: NextRequest) {
   return handleRequest(
     request,
     async (ctx) => {
       try {
-        const products = await intakeNonIntegratedProductService.list(ctx.user)
-        return jsonSuccess({ products }, 200, ctx.requestId)
+        const result = await intakeNonIntegratedProductService.listPage(
+          ctx.user,
+          readListParams(request),
+        )
+        return jsonSuccess(result, 200, ctx.requestId)
       } catch (error) {
         if (error instanceof AppError) {
           return jsonError(error.code, error.message, error.statusCode, ctx.requestId)
diff --git a/furniture-3d-system/src/app/intake/IntakeClient.tsx b/furniture-3d-system/src/app/intake/IntakeClient.tsx
index 6ed41e58..6b29400a 100644
--- a/furniture-3d-system/src/app/intake/IntakeClient.tsx
+++ b/furniture-3d-system/src/app/intake/IntakeClient.tsx
@@ -75,7 +75,10 @@ import {
 } from "./seriesComponentDetails";
 import {
   deleteSharedNonIntegratedProduct,
+  getSharedNonIntegratedProductById,
+  listSharedNonIntegratedProductPage,
   saveSharedNonIntegratedProduct,
+  type NonIntegratedProductPageInfo,
 } from "./non-integrated/nonIntegratedApi";
 import {
   canEditAnyNonIntegratedWorkspace,
@@ -583,7 +586,7 @@ function isProductCreatedByCurrentUser(
   );
 }
 
-const PENDING_PAGE_SIZE = 25;
+const PENDING_PAGE_SIZE = 50;
 const TABLE_ACTION_BUTTON_BASE =
   "!h-8 !min-h-8 !w-8 !rounded-md !px-0 !py-0 !shadow-none";
 const TABLE_ACTION_BUTTON_SECONDARY = `${TABLE_ACTION_BUTTON_BASE} !border-zinc-200 !bg-white !text-zinc-500 hover:!border-zinc-300 hover:!bg-zinc-50 hover:!text-zinc-950 focus:!border-zinc-400 disabled:!border-zinc-100 disabled:!bg-zinc-50 disabled:!text-zinc-300`;
@@ -2413,6 +2416,12 @@ function NonIntegratedPendingDetail({
   const router = useRouter();
   const [products, setProducts] =
     useState<NonIntegratedProductRecord[]>(initialProducts);
+  const [currentPage, setCurrentPage] = useState(1);
+  const [pageJumpInput, setPageJumpInput] = useState("1");
+  const [pageInfo, setPageInfo] =
+    useState<NonIntegratedProductPageInfo | null>(null);
+  const [isListLoading, setIsListLoading] = useState(false);
+  const [listErrorMessage, setListErrorMessage] = useState("");
   const [previewProduct, setPreviewProduct] = useState<{
     src: string;
     alt: string;
@@ -2457,7 +2466,6 @@ function NonIntegratedPendingDetail({
 
   useEffect(() => {
     if (shouldUseSharedNonIntegratedApi) {
-      setProducts(initialProducts);
       return;
     }
 
@@ -2474,6 +2482,56 @@ function NonIntegratedPendingDetail({
       window.removeEventListener(NON_INTEGRATED_PRODUCTS_UPDATED, syncProducts);
   }, [initialProducts, productDevelopmentKind, shouldUseSharedNonIntegratedApi]);
 
+  useEffect(() => {
+    setCurrentPage(1);
+  }, [productDevelopmentKind]);
+
+  useEffect(() => {
+    if (!shouldUseSharedNonIntegratedApi) return;
+
+    let cancelled = false;
+    setIsListLoading(true);
+    setListErrorMessage("");
+
+    listSharedNonIntegratedProductPage({
+      page: currentPage,
+      pageSize: PENDING_PAGE_SIZE,
+      productDevelopmentKind,
+      quickScope: activeQuickScope,
+      ...appliedQuery,
+    })
+      .then((data) => {
+        if (cancelled) return;
+
+        setProducts(data.products);
+        setPageInfo(data.pageInfo);
+      })
+      .catch((error) => {
+        if (cancelled) return;
+
+        setListErrorMessage(
+          error instanceof Error ? error.message : "列表加载失败，请稍后再试",
+        );
+        setProducts([]);
+        setPageInfo(null);
+      })
+      .finally(() => {
+        if (!cancelled) {
+          setIsListLoading(false);
+        }
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [
+    activeQuickScope,
+    appliedQuery,
+    currentPage,
+    productDevelopmentKind,
+    shouldUseSharedNonIntegratedApi,
+  ]);
+
   async function handleDelete(product: NonIntegratedProductRecord) {
     const productLabel = product.spu?.trim() || "当前产品";
 
@@ -2664,6 +2722,34 @@ function NonIntegratedPendingDetail({
       );
     });
   }, [activeQuickScope, appliedQuery, currentUser, products]);
+  const totalRows = shouldUseSharedNonIntegratedApi
+    ? (pageInfo?.total ?? filteredProducts.length)
+    : filteredProducts.length;
+  const totalPages = shouldUseSharedNonIntegratedApi
+    ? (pageInfo?.totalPages ?? 1)
+    : Math.max(1, Math.ceil(filteredProducts.length / PENDING_PAGE_SIZE));
+  const safeCurrentPage = Math.min(currentPage, totalPages);
+  const visibleProducts = shouldUseSharedNonIntegratedApi
+    ? filteredProducts
+    : filteredProducts.slice(
+        (safeCurrentPage - 1) * PENDING_PAGE_SIZE,
+        safeCurrentPage * PENDING_PAGE_SIZE,
+      );
+
+  useEffect(() => {
+    setPageJumpInput(String(safeCurrentPage));
+  }, [safeCurrentPage]);
+
+  function commitPageJump(value = pageJumpInput) {
+    const parsedPage = Number.parseInt(value.trim(), 10);
+    const nextPage = Number.isFinite(parsedPage)
+      ? Math.min(totalPages, Math.max(1, parsedPage))
+      : safeCurrentPage;
+
+    setCurrentPage(nextPage);
+    setPageJumpInput(String(nextPage));
+  }
+
   const filterFields: Array<{
     key: Exclude<keyof NonIntegratedListQuery, "productKind">;
     label: ReactNode;
@@ -2729,7 +2815,10 @@ function NonIntegratedPendingDetail({
                 key={scope.key}
                 type="button"
                 aria-pressed={activeQuickScope === scope.key}
-                onClick={() => setActiveQuickScope(scope.key)}
+                onClick={() => {
+                  setActiveQuickScope(scope.key);
+                  setCurrentPage(1);
+                }}
                 className={`h-7 rounded-apple-md px-3 text-xs font-apple-medium ${
                   activeQuickScope === scope.key
                     ? "bg-zinc-950 text-white"
@@ -2757,6 +2846,7 @@ function NonIntegratedPendingDetail({
                     ...current,
                     productKind,
                   }));
+                  setCurrentPage(1);
                 }}
                 className="h-8 w-full rounded-apple-md border border-apple-separator bg-apple-bg-secondary px-2.5 text-xs text-apple-label-primary outline-none"
               >
@@ -2789,7 +2879,10 @@ function NonIntegratedPendingDetail({
               <Button
                 size="small"
                 className={`h-8 w-full text-xs ${INTAKE_PRIMARY_BUTTON_CLASS}`}
-                onClick={() => setAppliedQuery(queryDraft)}
+                onClick={() => {
+                  setAppliedQuery(queryDraft);
+                  setCurrentPage(1);
+                }}
               >
                 查询
               </Button>
@@ -2808,9 +2901,9 @@ function NonIntegratedPendingDetail({
         </div>
       </div>
 
-      <div className="min-h-0 flex-1 overflow-auto p-4">
-        <div className="rounded-apple-lg border border-apple-separator bg-apple-bg-primary">
-          <div className="overflow-x-auto overflow-y-hidden pb-3">
+      <div className="min-h-0 flex-1 p-4">
+        <div className="flex h-full min-h-0 flex-col rounded-apple-lg border border-apple-separator bg-apple-bg-primary">
+          <div className="min-h-0 flex-1 overflow-auto pb-3">
             <table
               className={`w-full text-left text-xs ${
                 isSeriesDevelopmentList ? "min-w-[2020px]" : "min-w-[1880px]"
@@ -2872,19 +2965,22 @@ function NonIntegratedPendingDetail({
                 </tr>
               </thead>
               <tbody>
-                {filteredProducts.length === 0 ? (
+                {visibleProducts.length === 0 ? (
                   <tr>
                     <td
                       colSpan={listColumnCount}
                       className="px-4 py-10 text-center text-xs text-apple-label-secondary"
                     >
-                      {products.length === 0
-                        ? emptyMessage
-                        : "当前查询条件下没有找到资料。"}
+                      {isListLoading
+                        ? "正在加载资料..."
+                        : listErrorMessage ||
+                          (products.length === 0
+                            ? emptyMessage
+                            : "当前查询条件下没有找到资料。")}
                     </td>
                   </tr>
                 ) : (
-                  filteredProducts.map((product, index) => {
+                  visibleProducts.map((product, index) => {
                     const productDisplayName =
                       getNonIntegratedProductDisplayName(product);
                     const documentWorkspaceCountByCategory =
@@ -2916,7 +3012,7 @@ function NonIntegratedPendingDetail({
                         className="border-b border-apple-separator"
                       >
                         <td className="px-3 py-3 text-apple-label-secondary whitespace-nowrap">
-                          {index + 1}
+                          {(safeCurrentPage - 1) * PENDING_PAGE_SIZE + index + 1}
                         </td>
                         <td className="px-3 py-3 whitespace-nowrap">
                           <button
@@ -3087,6 +3183,57 @@ function NonIntegratedPendingDetail({
               </tbody>
             </table>
           </div>
+          {totalRows > 0 ? (
+            <div className="grid grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-3 border-t border-apple-separator px-4 py-3 text-xs text-apple-label-secondary">
+              <Button
+                variant="plain"
+                size="small"
+                className="h-8 px-3 text-xs"
+                onClick={() =>
+                  setCurrentPage((page) => Math.max(1, page - 1))
+                }
+                disabled={safeCurrentPage === 1 || isListLoading}
+              >
+                上一页
+              </Button>
+              <div className="flex min-w-0 flex-wrap items-center justify-center gap-x-2 gap-y-1 text-center">
+                <span>共 {totalRows} 条</span>
+                <span>第</span>
+                <input
+                  aria-label="跳转页码"
+                  inputMode="numeric"
+                  pattern="[0-9]*"
+                  value={pageJumpInput}
+                  onChange={(event) =>
+                    setPageJumpInput(event.target.value.replace(/\D/g, ""))
+                  }
+                  onBlur={() => commitPageJump()}
+                  onKeyDown={(event) => {
+                    if (event.key === "Enter") {
+                      event.preventDefault();
+                      commitPageJump();
+                    }
+                  }}
+                  disabled={isListLoading}
+                  className="h-8 w-12 rounded-apple-md border border-apple-separator bg-apple-bg-primary px-2 text-center text-xs text-apple-label-primary outline-none focus:border-zinc-400 disabled:bg-apple-bg-secondary disabled:text-apple-label-secondary"
+                />
+                <span>/ {totalPages} 页</span>
+                <span>每页 {PENDING_PAGE_SIZE} 条</span>
+                {isListLoading ? <span>加载中...</span> : null}
+              </div>
+              <Button
+                variant="plain"
+                size="small"
+                className="h-8 px-3 text-xs"
+                onClick={() =>
+                  setCurrentPage((page) => Math.min(totalPages, page + 1))
+                }
+                disabled={safeCurrentPage === totalPages || isListLoading}
+              >
+                下一页
+              </Button>
+            </div>
+          ) : null}
         </div>
       </div>
       {previewProduct ? (
@@ -8118,6 +8265,7 @@ export default function IntakeClient(props: IntakeClientProps) {
     props.user.role,
   );
   const shouldPersistWorkspaceState = !isEditorMode(props);
+  const shouldUseSharedNonIntegratedApi = process.env.NODE_ENV !== "test";
   const [initialWorkspaceState] = useState(() =>
     readInitialIntakeWorkspaceState({
       products: props.initialNonIntegratedProducts,
@@ -8160,11 +8308,25 @@ export default function IntakeClient(props: IntakeClientProps) {
   const [activeWorkspaceTabId, setActiveWorkspaceTabId] = useState<
     string | null
   >(initialWorkspaceState.activeTabId);
+  const [loadedProductWorkspaceTabIds, setLoadedProductWorkspaceTabIds] =
+    useState<Set<string>>(() => new Set());
+  const [productWorkspaceLoadErrors, setProductWorkspaceLoadErrors] = useState<
+    Record<string, string>
+  >({});
   const workspaceTabSequenceRef = useRef(initialWorkspaceState.sequence);
+  const productWorkspaceLoadingRef = useRef<Set<string>>(new Set());
   const initialOpenNewNonIntegratedProductRef = useRef(false);
 
   const activeWorkspaceTab =
     workspaceTabs.find((tab) => tab.id === activeWorkspaceTabId) ?? null;
+  const activeProductWorkspaceNeedsFullLoad =
+    shouldUseSharedNonIntegratedApi &&
+    activeWorkspaceTab?.kind === "nonIntegratedProduct" &&
+    !loadedProductWorkspaceTabIds.has(activeWorkspaceTab.id);
+  const activeProductWorkspaceLoadError =
+    activeWorkspaceTab?.kind === "nonIntegratedProduct"
+      ? productWorkspaceLoadErrors[activeWorkspaceTab.id] ?? ""
+      : "";
   const activeProductWorkspaceTabId =
     activeWorkspaceTab?.kind === "nonIntegratedProduct"
       ? activeWorkspaceTab.id
@@ -8267,6 +8429,87 @@ export default function IntakeClient(props: IntakeClientProps) {
     );
   }
 
+  const markProductWorkspaceTabLoaded = useCallback((tabId: string) => {
+    setLoadedProductWorkspaceTabIds((current) => {
+      if (current.has(tabId)) return current;
+      const next = new Set(current);
+      next.add(tabId);
+      return next;
+    });
+  }, []);
+
+  const applyLoadedProductWorkspace = useCallback((
+    tabId: string,
+    product: NonIntegratedProductRecord,
+  ) => {
+    setNonIntegratedProducts((current) => {
+      const existingIndex = current.findIndex((item) => item.id === product.id);
+      if (existingIndex < 0) return current;
+
+      return current.map((item) => (item.id === product.id ? product : item));
+    });
+    setWorkspaceTabs((current) =>
+      current.map((tab) =>
+        tab.id === tabId && tab.kind === "nonIntegratedProduct"
+          ? {
+              ...tab,
+              label: getProductDevelopmentDetailLabel(product),
+              productId: product.id,
+              product,
+              productDevelopmentKind: getProductDevelopmentKind(product),
+            }
+          : tab,
+      ),
+    );
+    markProductWorkspaceTabLoaded(tabId);
+  }, [markProductWorkspaceTabLoaded]);
+
+  useEffect(() => {
+    if (
+      !shouldUseSharedNonIntegratedApi ||
+      activeWorkspaceTab?.kind !== "nonIntegratedProduct" ||
+      !activeProductWorkspaceNeedsFullLoad ||
+      activeProductWorkspaceLoadError ||
+      productWorkspaceLoadingRef.current.has(activeWorkspaceTab.id)
+    ) {
+      return;
+    }
+
+    const tabId = activeWorkspaceTab.id;
+    const productId = activeWorkspaceTab.productId;
+    let cancelled = false;
+
+    productWorkspaceLoadingRef.current.add(tabId);
+    getSharedNonIntegratedProductById(productId)
+      .then((product) => {
+        if (cancelled) return;
+        applyLoadedProductWorkspace(tabId, product);
+      })
+      .catch((error) => {
+        if (cancelled) return;
+        setProductWorkspaceLoadErrors((current) => ({
+          ...current,
+          [tabId]:
+            error instanceof Error
+              ? error.message
+              : "完整产品资料加载失败，请稍后重试。",
+        }));
+      })
+      .finally(() => {
+        productWorkspaceLoadingRef.current.delete(tabId);
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [
+    activeProductWorkspaceLoadError,
+    activeProductWorkspaceNeedsFullLoad,
+    activeWorkspaceTab,
+    applyLoadedProductWorkspace,
+    shouldUseSharedNonIntegratedApi,
+  ]);
+
   function replaceCreateWorkspaceWithProduct(
     savedProduct: NonIntegratedProductRecord,
     mode: WorkspaceProductMode,
@@ -8276,11 +8519,12 @@ export default function IntakeClient(props: IntakeClientProps) {
       !canOpenNonIntegratedProductForEdit(savedProduct, props.user)
         ? "view"
         : mode;
+    const nextTabId = createWorkspaceTabId(
+      "non-integrated-product",
+      `${savedProduct.id}:${effectiveMode}`,
+    );
     const nextTab: IntakeWorkspaceTab = {
-      id: createWorkspaceTabId(
-        "non-integrated-product",
-        `${savedProduct.id}:${effectiveMode}`,
-      ),
+      id: nextTabId,
       kind: "nonIntegratedProduct",
       label: getProductDevelopmentDetailLabel(savedProduct),
       productId: savedProduct.id,
@@ -8299,6 +8543,7 @@ export default function IntakeClient(props: IntakeClientProps) {
         nextTab,
       ).tabs,
     );
+    markProductWorkspaceTabLoaded(activeTab.id);
     syncWorkspaceState(activeTab);
   }
 
@@ -8410,6 +8655,9 @@ export default function IntakeClient(props: IntakeClientProps) {
       label: "SPU规则库",
     };
     openWorkspaceTab(nextTab);
+    if (!shouldUseSharedNonIntegratedApi) {
+      markProductWorkspaceTabLoaded(tabId);
+    }
   }
 
   function openProductWorkspace(
@@ -8627,7 +8875,41 @@ export default function IntakeClient(props: IntakeClientProps) {
     let activeContent = mainContent;
 
     if (activeWorkspaceTab?.kind === "nonIntegratedProduct") {
-      activeContent = (
+      activeContent = activeProductWorkspaceNeedsFullLoad ? (
+        <div className="flex h-full min-h-[420px] items-center justify-center px-6 text-center">
+          <div className="space-y-3">
+            <p className="text-sm font-medium text-apple-label-primary">
+              {activeProductWorkspaceLoadError
+                ? "完整产品资料加载失败"
+                : "正在加载完整 SKU 资料..."}
+            </p>
+            {activeProductWorkspaceLoadError ? (
+              <>
+                <p className="max-w-md text-xs text-apple-label-secondary">
+                  {activeProductWorkspaceLoadError}
+                </p>
+                <Button
+                  size="small"
+                  variant="gray"
+                  onClick={() =>
+                    setProductWorkspaceLoadErrors((current) => {
+                      const next = { ...current };
+                      delete next[activeWorkspaceTab.id];
+                      return next;
+                    })
+                  }
+                >
+                  重新加载
+                </Button>
+              </>
+            ) : (
+              <p className="text-xs text-apple-label-secondary">
+                为避免自动保存覆盖 SKU，加载完成前暂不进入详情编辑。
+              </p>
+            )}
+          </div>
+        </div>
+      ) : (
         <NonIntegratedDetailClient
           embedded
           key={activeWorkspaceTab.id}
diff --git a/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedApi.ts b/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedApi.ts
index 0463ee18..15a85ca7 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedApi.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedApi.ts
@@ -21,6 +21,28 @@ export type NonIntegratedUploadProgressHandler = (
   progress: NonIntegratedUploadProgress,
 ) => void
 
+export type NonIntegratedProductPageInfo = {
+  page: number
+  pageSize: number
+  total: number
+  totalPages: number
+}
+
+export type NonIntegratedProductListParams = {
+  page?: number
+  pageSize?: number
+  productDevelopmentKind?: 'product' | 'series'
+  productKind?: 'all' | 'new' | 'stock'
+  quickScope?: 'all' | 'created' | 'pending'
+  spu?: string
+  appearanceDesigner?: string
+  structureDesigner?: string
+  spuOwner?: string
+  planningOwner?: string
+  spaceDesigner?: string
+  purchaseOwner?: string
+}
+
 type UploadSharedNonIntegratedFileResponse = {
   product: NonIntegratedProductRecord
   file: NonIntegratedProductRecord['uploadFiles'][number]
@@ -185,13 +207,28 @@ async function postFormData(
 }
 
 export async function listSharedNonIntegratedProducts() {
-  const response = await fetchWithTimeout('/api/intake/non-integrated', {
+  const data = await listSharedNonIntegratedProductPage()
+  return data.products
+}
+
+export async function listSharedNonIntegratedProductPage(
+  params: NonIntegratedProductListParams = {},
+) {
+  const searchParams = new URLSearchParams()
+  Object.entries(params).forEach(([key, value]) => {
+    if (value === undefined || value === null || value === '') return
+    searchParams.set(key, String(value))
+  })
+  const query = searchParams.toString()
+  const response = await fetchWithTimeout(`/api/intake/non-integrated${query ? `?${query}` : ''}`, {
     method: 'GET',
     cache: 'no-store',
   })
 
-  const data = await readApiData<{ products: NonIntegratedProductRecord[] }>(response)
-  return data.products
+  return readApiData<{
+    products: NonIntegratedProductRecord[]
+    pageInfo: NonIntegratedProductPageInfo
+  }>(response)
 }
 
 export async function getSharedNonIntegratedProductById(id: string) {
diff --git a/furniture-3d-system/src/app/intake/page.tsx b/furniture-3d-system/src/app/intake/page.tsx
index 3d49a0e4..7f03af53 100644
--- a/furniture-3d-system/src/app/intake/page.tsx
+++ b/furniture-3d-system/src/app/intake/page.tsx
@@ -73,7 +73,7 @@ export default async function IntakePage({
     materialLibraryFinishes,
     materialLibraryCategories,
     materialLibraryDictionaries,
-    initialNonIntegratedProducts,
+    initialNonIntegratedProductPage,
   ] = await Promise.all([
     draftGroupService.list(),
     warehouseService.listLocations(),
@@ -81,8 +81,13 @@ export default async function IntakePage({
     materialService.findAll({ limit: 500 }),
     materialService.findAllCategories(),
     assetCenterService.getSubstrateDictionaryBundle(),
-    intakeNonIntegratedProductService.list(authUser),
+    intakeNonIntegratedProductService.listPage(authUser, {
+      page: 1,
+      pageSize: 50,
+      productDevelopmentKind: 'product',
+    }),
   ])
+  const initialNonIntegratedProducts = initialNonIntegratedProductPage.products
 
   const eligibleDraftGroups = draftGroups.filter((group) =>
     isDraftGroupEligibleForIntake(group.status),
diff --git a/furniture-3d-system/src/server/repositories/intake-non-integrated-product.repository.ts b/furniture-3d-system/src/server/repositories/intake-non-integrated-product.repository.ts
index 146ea496..70eaa7ed 100644
--- a/furniture-3d-system/src/server/repositories/intake-non-integrated-product.repository.ts
+++ b/furniture-3d-system/src/server/repositories/intake-non-integrated-product.repository.ts
@@ -12,22 +12,55 @@ class IntakeNonIntegratedProductRepositoryClass extends BaseRepository<
 > {
   protected modelName = 'intakeNonIntegratedProduct'
 
+  private buildActiveWhere(scopeWhere?: Prisma.IntakeNonIntegratedProductWhereInput) {
+    return {
+      deletedAt: null,
+      ...(scopeWhere
+        ? {
+            AND: [scopeWhere],
+          }
+        : {}),
+    } satisfies Prisma.IntakeNonIntegratedProductWhereInput
+  }
+
   async listActive(scopeWhere?: Prisma.IntakeNonIntegratedProductWhereInput) {
     return this.prisma.intakeNonIntegratedProduct.findMany({
-      where: {
-        deletedAt: null,
-        ...(scopeWhere
-          ? {
-              AND: [scopeWhere],
-            }
-          : {}),
-      },
+      where: this.buildActiveWhere(scopeWhere),
       orderBy: {
         createdAt: 'desc',
       },
     })
   }
 
+  async listActivePage(params: {
+    page: number
+    pageSize: number
+    scopeWhere?: Prisma.IntakeNonIntegratedProductWhereInput
+    filterWhere?: Prisma.IntakeNonIntegratedProductWhereInput
+  }) {
+    const activeWhere = this.buildActiveWhere(params.scopeWhere)
+    const where = params.filterWhere
+      ? ({
+          AND: [activeWhere, params.filterWhere],
+        } satisfies Prisma.IntakeNonIntegratedProductWhereInput)
+      : activeWhere
+    const skip = (params.page - 1) * params.pageSize
+
+    const [records, total] = await this.prisma.$transaction([
+      this.prisma.intakeNonIntegratedProduct.findMany({
+        where,
+        orderBy: {
+          createdAt: 'desc',
+        },
+        skip,
+        take: params.pageSize,
+      }),
+      this.prisma.intakeNonIntegratedProduct.count({ where }),
+    ])
+
+    return { records, total }
+  }
+
   async findActiveById(id: string) {
     return this.prisma.intakeNonIntegratedProduct.findFirst({
       where: {
diff --git a/furniture-3d-system/src/server/services/intake-non-integrated-product.service.ts b/furniture-3d-system/src/server/services/intake-non-integrated-product.service.ts
index 570e4f2d..763dc5d2 100644
--- a/furniture-3d-system/src/server/services/intake-non-integrated-product.service.ts
+++ b/furniture-3d-system/src/server/services/intake-non-integrated-product.service.ts
@@ -90,6 +90,24 @@ type IntakeNonIntegratedRecord = NonNullable<
   Awaited<ReturnType<IntakeNonIntegratedProductRepositoryClass['findActiveById']>>
 >
 
+export type IntakeNonIntegratedProductListParams = {
+  page?: number
+  pageSize?: number
+  productDevelopmentKind?: 'product' | 'series'
+  productKind?: 'all' | 'new' | 'stock'
+  quickScope?: 'all' | 'created' | 'pending'
+  spu?: string
+  appearanceDesigner?: string
+  structureDesigner?: string
+  spuOwner?: string
+  planningOwner?: string
+  spaceDesigner?: string
+  purchaseOwner?: string
+}
+
+const DEFAULT_LIST_PAGE_SIZE = 50
+const MAX_LIST_PAGE_SIZE = 100
+
 type ResolveUploadFileForPreviewResult = {
   record: IntakeNonIntegratedRecord
   product: SharedNonIntegratedProductRecord
@@ -462,6 +480,218 @@ function trimOptionalString<T extends string>(value: unknown): T | undefined {
     : undefined
 }
 
+function normalizeListPage(value: unknown) {
+  const page = Number(value)
+  return Number.isFinite(page) && page > 0 ? Math.floor(page) : 1
+}
+
+function normalizeListPageSize(value: unknown) {
+  const pageSize = Number(value)
+  if (!Number.isFinite(pageSize) || pageSize <= 0) {
+    return DEFAULT_LIST_PAGE_SIZE
+  }
+
+  return Math.min(MAX_LIST_PAGE_SIZE, Math.max(1, Math.floor(pageSize)))
+}
+
+function trimListFilter(value: unknown) {
+  return typeof value === 'string' ? value.trim() : ''
+}
+
+function jsonTextEquals(path: string[], value: string): Prisma.IntakeNonIntegratedProductWhereInput {
+  return {
+    payload: {
+      path,
+      equals: value,
+    },
+  }
+}
+
+function jsonTextContains(
+  path: string[],
+  value: string,
+): Prisma.IntakeNonIntegratedProductWhereInput {
+  return {
+    payload: {
+      path,
+      string_contains: value,
+      mode: 'insensitive',
+    },
+  }
+}
+
+function buildTextContainsAny(
+  value: string,
+  conditions: Prisma.IntakeNonIntegratedProductWhereInput[],
+): Prisma.IntakeNonIntegratedProductWhereInput | null {
+  const keyword = value.trim()
+  if (!keyword) return null
+
+  return {
+    OR: conditions,
+  }
+}
+
+function buildStockProductWhere(): Prisma.IntakeNonIntegratedProductWhereInput {
+  return {
+    OR: [
+      jsonTextEquals(['processTemplate'], '存量商品'),
+      jsonTextEquals(['openingReference', 'currentStage'], '存量商品'),
+    ],
+  }
+}
+
+function buildDevelopmentKindWhere(
+  productDevelopmentKind: IntakeNonIntegratedProductListParams['productDevelopmentKind'],
+): Prisma.IntakeNonIntegratedProductWhereInput | null {
+  if (productDevelopmentKind === 'series') {
+    return jsonTextEquals(['productDevelopmentKind'], 'series')
+  }
+
+  if (productDevelopmentKind === 'product') {
+    return {
+      NOT: jsonTextEquals(['productDevelopmentKind'], 'series'),
+    }
+  }
+
+  return null
+}
+
+function buildProductKindWhere(
+  productKind: IntakeNonIntegratedProductListParams['productKind'],
+): Prisma.IntakeNonIntegratedProductWhereInput | null {
+  const stockWhere = buildStockProductWhere()
+
+  if (productKind === 'stock') {
+    return stockWhere
+  }
+
+  if (productKind === 'new') {
+    return {
+      NOT: stockWhere,
+    }
+  }
+
+  return null
+}
+
+function buildSpuSearchWhere(spu: string): Prisma.IntakeNonIntegratedProductWhereInput | null {
+  const keyword = trimListFilter(spu)
+  if (!keyword) return null
+
+  const normalizedKeyword = keyword.toUpperCase()
+  const baseKeyword = stripNonIntegratedBrandPrefix(keyword)
+
+  return {
+    OR: [
+      { spu: { contains: normalizedKeyword, mode: 'insensitive' } },
+      { spuBase: { contains: baseKeyword || normalizedKeyword, mode: 'insensitive' } },
+      jsonTextContains(['openingReference', 'productName'], keyword),
+      jsonTextContains(['openingReference', 'temporaryCode'], keyword),
+    ],
+  }
+}
+
+function buildPeopleSearchWhere(
+  params: IntakeNonIntegratedProductListParams,
+): Prisma.IntakeNonIntegratedProductWhereInput[] {
+  const appearanceDesigner = trimListFilter(params.appearanceDesigner)
+  const structureDesigner = trimListFilter(params.structureDesigner)
+  const spuOwner = trimListFilter(params.spuOwner)
+  const planningOwner = trimListFilter(params.planningOwner)
+  const spaceDesigner = trimListFilter(params.spaceDesigner)
+  const purchaseOwner = trimListFilter(params.purchaseOwner)
+  const filters: Array<Prisma.IntakeNonIntegratedProductWhereInput | null> = [
+    buildTextContainsAny(appearanceDesigner, [
+      { designer: { contains: appearanceDesigner, mode: 'insensitive' } },
+      jsonTextContains(['designer'], appearanceDesigner),
+      jsonTextContains(['openingReference', 'designer'], appearanceDesigner),
+    ]),
+    buildTextContainsAny(structureDesigner, [
+      jsonTextContains(['openingReference', 'structureDesigner'], structureDesigner),
+    ]),
+    buildTextContainsAny(spuOwner, [
+      { operator: { contains: spuOwner, mode: 'insensitive' } },
+      jsonTextContains(['spuOwner'], spuOwner),
+      jsonTextContains(['operationsOwner'], spuOwner),
+    ]),
+    buildTextContainsAny(planningOwner, [
+      jsonTextContains(['productPlanning'], planningOwner),
+      jsonTextContains(['openingReference', 'planningOwner'], planningOwner),
+    ]),
+    buildTextContainsAny(spaceDesigner, [
+      jsonTextContains(['visualPlanning'], spaceDesigner),
+      jsonTextContains(['visualDirector'], spaceDesigner),
+    ]),
+    buildTextContainsAny(purchaseOwner, [
+      { purchaser: { contains: purchaseOwner, mode: 'insensitive' } },
+      jsonTextContains(['purchaseOwner'], purchaseOwner),
+    ]),
+  ]
+
+  return filters.filter(
+    (filter): filter is Prisma.IntakeNonIntegratedProductWhereInput => filter !== null,
+  )
+}
+
+function buildQuickScopeWhere(
+  quickScope: IntakeNonIntegratedProductListParams['quickScope'],
+  user: AuthUser,
+): Prisma.IntakeNonIntegratedProductWhereInput | null {
+  if (quickScope === 'created') {
+    const creatorConditions: Prisma.IntakeNonIntegratedProductWhereInput[] = [
+      { createdBy: user.id },
+    ]
+    if (user.name.trim()) {
+      creatorConditions.push({ createdBy: user.name.trim() })
+    }
+
+    return { OR: creatorConditions }
+  }
+
+  if (quickScope === 'pending' && user.name.trim()) {
+    const userName = user.name.trim()
+    return {
+      OR: [
+        { designer: { contains: userName, mode: 'insensitive' } },
+        { operator: { contains: userName, mode: 'insensitive' } },
+        { purchaser: { contains: userName, mode: 'insensitive' } },
+        jsonTextContains(['designer'], userName),
+        jsonTextContains(['openingReference', 'designer'], userName),
+        jsonTextContains(['openingReference', 'structureDesigner'], userName),
+        jsonTextContains(['spuOwner'], userName),
+        jsonTextContains(['operationsOwner'], userName),
+        jsonTextContains(['productPlanning'], userName),
+        jsonTextContains(['openingReference', 'planningOwner'], userName),
+        jsonTextContains(['visualPlanning'], userName),
+        jsonTextContains(['visualDirector'], userName),
+        jsonTextContains(['purchaseOwner'], userName),
+      ],
+    }
+  }
+
+  return null
+}
+
+function buildListFilterWhere(
+  params: IntakeNonIntegratedProductListParams,
+  user: AuthUser,
+): Prisma.IntakeNonIntegratedProductWhereInput | undefined {
+  const filters = [
+    buildDevelopmentKindWhere(params.productDevelopmentKind),
+    buildProductKindWhere(params.productKind),
+    buildSpuSearchWhere(params.spu ?? ''),
+    buildQuickScopeWhere(params.quickScope, user),
+    ...buildPeopleSearchWhere(params),
+  ].filter((filter): filter is Prisma.IntakeNonIntegratedProductWhereInput => filter !== null)
+
+  if (filters.length === 0) {
+    return undefined
+  }
+
+  return { AND: filters }
+}
+
 function pickUploadFileMetadata(input: AttachUploadFileInput): AttachUploadFileMetadata {
   const productDataGroup = trimOptionalString<NonNullable<NonIntegratedUploadFile['productDataGroup']>>(
     input.productDataGroup,
@@ -543,6 +773,37 @@ class IntakeNonIntegratedProductService {
       .filter((record): record is SharedNonIntegratedProductRecord => record !== null)
   }
 
+  async listPage(user: AuthUser, params: IntakeNonIntegratedProductListParams = {}) {
+    const page = normalizeListPage(params.page)
+    const pageSize = normalizeListPageSize(params.pageSize)
+    const { records, total } = await this.repository.listActivePage({
+      page,
+      pageSize,
+      scopeWhere: intakeNonIntegratedScopeService.buildReadScopeWhere(user),
+      filterWhere: buildListFilterWhere(params, user),
+    })
+    const products = records
+      .map((record) =>
+        buildHydratedProductRecord(record.payload, {
+          createdAt: record.createdAt,
+          updatedAt: record.updatedAt,
+          createdBy: record.createdBy,
+          updatedBy: record.updatedBy,
+        }),
+      )
+      .filter((record): record is SharedNonIntegratedProductRecord => record !== null)
+
+    return {
+      products,
+      pageInfo: {
+        page,
+        pageSize,
+        total,
+        totalPages: Math.max(1, Math.ceil(total / pageSize)),
+      },
+    }
+  }
+
   async getById(id: string, user: AuthUser) {
     const record = await this.repository.findActiveById(id)
     if (!record) {

From 271a7b86ad403dcc6707ee8db23d1373ddbfd2d7 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Mon, 18 May 2026 18:57:31 +0800
Subject: [PATCH 03/21] feat(intake): split stock product entry

---
 .../src/app/intake/IntakeClient.tsx           | 290 +++++++++++++-----
 .../NonIntegratedDetailClient.test.tsx        |  13 +-
 .../NonIntegratedDetailClient.tsx             |   4 +-
 3 files changed, 230 insertions(+), 77 deletions(-)

diff --git a/furniture-3d-system/src/app/intake/IntakeClient.tsx b/furniture-3d-system/src/app/intake/IntakeClient.tsx
index 6b29400a..81fa62fd 100644
--- a/furniture-3d-system/src/app/intake/IntakeClient.tsx
+++ b/furniture-3d-system/src/app/intake/IntakeClient.tsx
@@ -229,10 +229,11 @@ type IntakeSection =
   | "referenceEstimator"
   | "patents"
   | null;
-type IntakeEntryTab = "integrated" | "nonIntegrated";
+type IntakeEntryTab = "integrated" | "nonIntegrated" | "stock";
 type ProductDevelopmentKind = NonNullable<
   NonIntegratedProductRecord["productDevelopmentKind"]
 >;
+type NewNonIntegratedCreateKind = "new" | "stock";
 type BomLibraryKey =
   | "materialLibrary"
   | "edgeBandingLibrary"
@@ -316,6 +317,7 @@ type IntakeWorkspaceTab =
       kind: "newNonIntegratedProduct";
       label: string;
       productDevelopmentKind: ProductDevelopmentKind;
+      initialCreateProductKind?: NewNonIntegratedCreateKind;
     }
   | {
       id: string;
@@ -374,6 +376,7 @@ type PersistedIntakeWorkspaceTab =
       id: string;
       kind: "newNonIntegratedProduct";
       productDevelopmentKind: ProductDevelopmentKind;
+      initialCreateProductKind?: NewNonIntegratedCreateKind;
     }
   | {
       id: string;
@@ -677,7 +680,9 @@ const REFERENCE_ESTIMATOR_GROUP_LABEL = "预估成本测算";
 const REFERENCE_ESTIMATOR_WORKSPACE_LABEL = "参考图预估成本";
 
 function getPendingEntryTabLabel(tab: IntakeEntryTab) {
-  return tab === "integrated" ? "系列产品开发明细" : "产品开发明细";
+  if (tab === "integrated") return "系列产品开发明细";
+  if (tab === "stock") return "存量商品明细";
+  return "产品开发明细";
 }
 
 function getPendingEntryTabFromProductDevelopmentKind(
@@ -716,12 +721,27 @@ function isNonIntegratedStockProduct(
   );
 }
 
+function getPendingEntryTabFromProduct(product: NonIntegratedProductRecord) {
+  if (getProductDevelopmentKind(product) === "series") return "integrated";
+  return isNonIntegratedStockProduct(product) ? "stock" : "nonIntegrated";
+}
+
+function getPendingEntryTabFromNewProductTab(tab: {
+  productDevelopmentKind: ProductDevelopmentKind;
+  initialCreateProductKind?: NewNonIntegratedCreateKind;
+}) {
+  if (tab.productDevelopmentKind === "series") return "integrated";
+  return tab.initialCreateProductKind === "stock" ? "stock" : "nonIntegrated";
+}
+
 function getProductDevelopmentDetailLabel(
   product: NonIntegratedProductRecord,
 ) {
   const suffix =
     getProductDevelopmentKind(product) === "series"
       ? "系列产品开发明细"
+      : isNonIntegratedStockProduct(product)
+        ? "存量商品明细"
       : "产品开发明细";
 
   return `${getNonIntegratedProductDisplayName(product)}${suffix}`;
@@ -742,12 +762,22 @@ function createPendingEntryWorkspaceTab(
 function createNewNonIntegratedProductWorkspaceTab(
   id = "new-non-integrated:default",
   productDevelopmentKind: ProductDevelopmentKind = "product",
+  initialCreateProductKind: NewNonIntegratedCreateKind = "new",
 ): IntakeWorkspaceTab {
+  const isStockCreate = initialCreateProductKind === "stock";
   return {
     id,
     kind: "newNonIntegratedProduct",
-    label: productDevelopmentKind === "series" ? "新增系列产品" : "新增产品",
+    label:
+      productDevelopmentKind === "series"
+        ? isStockCreate
+          ? "新增存量系列产品"
+          : "新增系列产品"
+        : isStockCreate
+          ? "新增存量商品"
+          : "新增产品",
     productDevelopmentKind,
+    initialCreateProductKind,
   };
 }
 
@@ -817,6 +847,7 @@ function serializeIntakeWorkspaceTab(
       id: tab.id,
       kind: tab.kind,
       productDevelopmentKind: tab.productDevelopmentKind,
+      initialCreateProductKind: tab.initialCreateProductKind,
     };
   }
   if (tab.kind === "bomLibrary") {
@@ -844,7 +875,11 @@ function restoreIntakeWorkspaceTab(
   if (!tab.id || typeof tab.id !== "string") return null;
 
   if (tab.kind === "pendingEntry") {
-    if (tab.entryTab !== "integrated" && tab.entryTab !== "nonIntegrated") {
+    if (
+      tab.entryTab !== "integrated" &&
+      tab.entryTab !== "nonIntegrated" &&
+      tab.entryTab !== "stock"
+    ) {
       return null;
     }
     return createPendingEntryWorkspaceTab(tab.entryTab, tab.id);
@@ -888,9 +923,12 @@ function restoreIntakeWorkspaceTab(
   if (tab.kind === "newNonIntegratedProduct") {
     const productDevelopmentKind =
       tab.productDevelopmentKind === "series" ? "series" : "product";
+    const initialCreateProductKind =
+      tab.initialCreateProductKind === "stock" ? "stock" : "new";
     return createNewNonIntegratedProductWorkspaceTab(
       tab.id,
       productDevelopmentKind,
+      initialCreateProductKind,
     );
   }
   if (tab.kind === "bomLibrary") {
@@ -1019,13 +1057,11 @@ function getWorkspaceTabInitialSection(tab: IntakeWorkspaceTab | null) {
 
 function getWorkspaceTabInitialPendingEntryTab(tab: IntakeWorkspaceTab | null) {
   if (tab?.kind === "pendingEntry") return tab.entryTab;
-  if (
-    tab?.kind === "nonIntegratedProduct" ||
-    tab?.kind === "newNonIntegratedProduct"
-  ) {
-    return getPendingEntryTabFromProductDevelopmentKind(
-      tab.productDevelopmentKind,
-    );
+  if (tab?.kind === "nonIntegratedProduct") {
+    return getPendingEntryTabFromProduct(tab.product);
+  }
+  if (tab?.kind === "newNonIntegratedProduct") {
+    return getPendingEntryTabFromNewProductTab(tab);
   }
   return "nonIntegrated";
 }
@@ -1048,7 +1084,9 @@ function getWorkspaceTabPageKey(tab: IntakeWorkspaceTab) {
     return `non-integrated-product:${tab.productId}:${tab.mode}`;
   }
   if (tab.kind === "newNonIntegratedProduct") {
-    return `new-non-integrated:${tab.productDevelopmentKind}`;
+    return `new-non-integrated:${tab.productDevelopmentKind}:${
+      tab.initialCreateProductKind ?? "new"
+    }`;
   }
   if (tab.kind === "bomLibrary") return `bom-library:${tab.bomLibrary}`;
   if (tab.kind === "rawMaterialLibrary") {
@@ -2396,6 +2434,8 @@ function NonIntegratedPendingDetail({
   canDeleteProducts,
   currentUser,
   productDevelopmentKind = "product",
+  fixedProductKind,
+  createButtonLabel = "新增产品",
   emptyMessage = "当前还没有非集成产品，点击右上角“新增产品”开始维护资料。",
   onProductsChange,
   onOpenProductWorkspace,
@@ -2405,6 +2445,8 @@ function NonIntegratedPendingDetail({
   canDeleteProducts: boolean;
   currentUser: IntakeProductPermissionUser;
   productDevelopmentKind?: ProductDevelopmentKind;
+  fixedProductKind?: NonIntegratedProductKindFilter;
+  createButtonLabel?: string;
   emptyMessage?: string;
   onProductsChange?: (products: NonIntegratedProductRecord[]) => void;
   onOpenProductWorkspace?: (
@@ -2434,8 +2476,9 @@ function NonIntegratedPendingDetail({
   const [isCopySubmitting, setIsCopySubmitting] = useState(false);
   const [activeQuickScope, setActiveQuickScope] =
     useState<NonIntegratedQuickScope>("all");
+  const initialProductKind = fixedProductKind ?? "all";
   const [queryDraft, setQueryDraft] = useState<NonIntegratedListQuery>({
-    productKind: "all",
+    productKind: initialProductKind,
     spu: "",
     appearanceDesigner: "",
     structureDesigner: "",
@@ -2445,7 +2488,7 @@ function NonIntegratedPendingDetail({
     purchaseOwner: "",
   });
   const [appliedQuery, setAppliedQuery] = useState<NonIntegratedListQuery>({
-    productKind: "all",
+    productKind: initialProductKind,
     spu: "",
     appearanceDesigner: "",
     structureDesigner: "",
@@ -2455,6 +2498,8 @@ function NonIntegratedPendingDetail({
     purchaseOwner: "",
   });
   const shouldUseSharedNonIntegratedApi = process.env.NODE_ENV !== "test";
+  const effectiveProductKind = fixedProductKind ?? appliedQuery.productKind;
+  const showProductKindFilter = !fixedProductKind;
 
   function scopeProductsByDevelopmentKind(
     nextProducts: NonIntegratedProductRecord[],
@@ -2484,7 +2529,17 @@ function NonIntegratedPendingDetail({
 
   useEffect(() => {
     setCurrentPage(1);
-  }, [productDevelopmentKind]);
+  }, [fixedProductKind, productDevelopmentKind]);
+
+  useEffect(() => {
+    if (!fixedProductKind) return;
+
+    setQueryDraft((current) => ({ ...current, productKind: fixedProductKind }));
+    setAppliedQuery((current) => ({
+      ...current,
+      productKind: fixedProductKind,
+    }));
+  }, [fixedProductKind]);
 
   useEffect(() => {
     if (!shouldUseSharedNonIntegratedApi) return;
@@ -2499,6 +2554,7 @@ function NonIntegratedPendingDetail({
       productDevelopmentKind,
       quickScope: activeQuickScope,
       ...appliedQuery,
+      productKind: effectiveProductKind,
     })
       .then((data) => {
         if (cancelled) return;
@@ -2528,6 +2584,7 @@ function NonIntegratedPendingDetail({
     activeQuickScope,
     appliedQuery,
     currentPage,
+    effectiveProductKind,
     productDevelopmentKind,
     shouldUseSharedNonIntegratedApi,
   ]);
@@ -2681,8 +2738,8 @@ function NonIntegratedPendingDetail({
       const people = getNonIntegratedListPeople(product);
       const stockProduct = isNonIntegratedStockProduct(product);
       const productKindMatched =
-        appliedQuery.productKind === "all" ||
-        (appliedQuery.productKind === "stock"
+        effectiveProductKind === "all" ||
+        (effectiveProductKind === "stock"
           ? stockProduct
           : !stockProduct);
       const spuMatched =
@@ -2721,7 +2778,7 @@ function NonIntegratedPendingDetail({
         quickScopeMatched
       );
     });
-  }, [activeQuickScope, appliedQuery, currentUser, products]);
+  }, [activeQuickScope, appliedQuery, currentUser, effectiveProductKind, products]);
   const totalRows = shouldUseSharedNonIntegratedApi
     ? (pageInfo?.total ?? filteredProducts.length)
     : filteredProducts.length;
@@ -2829,32 +2886,40 @@ function NonIntegratedPendingDetail({
               </button>
             ))}
           </div>
-          <div className="grid items-end gap-2 md:grid-cols-[104px_repeat(7,minmax(0,1fr))_72px_104px]">
-            <label className="space-y-1.5 text-xs text-apple-label-secondary">
-              <span>产品类型</span>
-              <select
-                aria-label="产品类型"
-                value={queryDraft.productKind}
-                onChange={(event) => {
-                  const productKind = event.target
-                    .value as NonIntegratedProductKindFilter;
-                  setQueryDraft((current) => ({
-                    ...current,
-                    productKind,
-                  }));
-                  setAppliedQuery((current) => ({
-                    ...current,
-                    productKind,
-                  }));
-                  setCurrentPage(1);
-                }}
-                className="h-8 w-full rounded-apple-md border border-apple-separator bg-apple-bg-secondary px-2.5 text-xs text-apple-label-primary outline-none"
-              >
-                <option value="all">全部</option>
-                <option value="new">新品</option>
-                <option value="stock">存量商品</option>
-              </select>
-            </label>
+          <div
+            className={`grid items-end gap-2 ${
+              showProductKindFilter
+                ? "md:grid-cols-[104px_repeat(7,minmax(0,1fr))_72px_104px]"
+                : "md:grid-cols-[repeat(7,minmax(0,1fr))_72px_104px]"
+            }`}
+          >
+            {showProductKindFilter ? (
+              <label className="space-y-1.5 text-xs text-apple-label-secondary">
+                <span>产品类型</span>
+                <select
+                  aria-label="产品类型"
+                  value={queryDraft.productKind}
+                  onChange={(event) => {
+                    const productKind = event.target
+                      .value as NonIntegratedProductKindFilter;
+                    setQueryDraft((current) => ({
+                      ...current,
+                      productKind,
+                    }));
+                    setAppliedQuery((current) => ({
+                      ...current,
+                      productKind,
+                    }));
+                    setCurrentPage(1);
+                  }}
+                  className="h-8 w-full rounded-apple-md border border-apple-separator bg-apple-bg-secondary px-2.5 text-xs text-apple-label-primary outline-none"
+                >
+                  <option value="all">全部</option>
+                  <option value="new">新品</option>
+                  <option value="stock">存量商品</option>
+                </select>
+              </label>
+            ) : null}
             {filterFields.map((filter) => (
               <label
                 key={filter.key}
@@ -2894,7 +2959,7 @@ function NonIntegratedPendingDetail({
                 onClick={onOpenNewNonIntegratedProductWorkspace}
               >
                 <Plus className="h-3.5 w-3.5" aria-hidden="true" />
-                新增产品
+                {createButtonLabel}
               </Button>
             </div>
           </div>
@@ -8097,6 +8162,17 @@ function FormalIntakeWorkbench({
           >
             <span>产品开发进度</span>
           </button>
+          <button
+            type="button"
+            onClick={() => onPendingEntryTabChange("stock")}
+            className={`flex w-full items-center rounded-apple-lg border px-3 py-2 text-left text-xs transition ${
+              pendingEntryTab === "stock" && activeSection === "pending"
+                ? "border-apple-blue bg-apple-blue/10 text-apple-blue"
+                : "border-apple-separator bg-apple-bg-secondary text-apple-label-secondary"
+            }`}
+          >
+            <span>{getPendingEntryTabLabel("stock")}</span>
+          </button>
         </div>
       </AccordionSection>
 
@@ -8390,13 +8466,24 @@ export default function IntakeClient(props: IntakeClientProps) {
   function handleScopedProductsChange(
     productDevelopmentKind: ProductDevelopmentKind,
     nextProducts: NonIntegratedProductRecord[],
+    productKindFilter?: NonIntegratedProductKindFilter,
   ) {
     setNonIntegratedProducts((current) => [
       ...nextProducts,
-      ...current.filter(
-        (product) =>
-          getProductDevelopmentKind(product) !== productDevelopmentKind,
-      ),
+      ...current.filter((product) => {
+        if (getProductDevelopmentKind(product) !== productDevelopmentKind) {
+          return true;
+        }
+
+        if (productDevelopmentKind !== "product") {
+          return false;
+        }
+
+        const stockProduct = isNonIntegratedStockProduct(product);
+        if (productKindFilter === "stock") return !stockProduct;
+        if (productKindFilter === "new") return stockProduct;
+        return false;
+      }),
     ]);
   }
 
@@ -8574,14 +8661,10 @@ export default function IntakeClient(props: IntakeClientProps) {
       setActiveSection("patents");
     } else if (tab.kind === "nonIntegratedProduct") {
       setActiveSection("pending");
-      setPendingEntryTab(
-        getPendingEntryTabFromProductDevelopmentKind(tab.productDevelopmentKind),
-      );
+      setPendingEntryTab(getPendingEntryTabFromProduct(tab.product));
     } else if (tab.kind === "newNonIntegratedProduct") {
       setActiveSection("pending");
-      setPendingEntryTab(
-        getPendingEntryTabFromProductDevelopmentKind(tab.productDevelopmentKind),
-      );
+      setPendingEntryTab(getPendingEntryTabFromNewProductTab(tab));
     } else if (tab.kind === "bomLibrary") {
       setActiveSection("bom");
       setActiveBomLibrary(tab.bomLibrary);
@@ -8655,9 +8738,6 @@ export default function IntakeClient(props: IntakeClientProps) {
       label: "SPU规则库",
     };
     openWorkspaceTab(nextTab);
-    if (!shouldUseSharedNonIntegratedApi) {
-      markProductWorkspaceTabLoaded(tabId);
-    }
   }
 
   function openProductWorkspace(
@@ -8697,15 +8777,20 @@ export default function IntakeClient(props: IntakeClientProps) {
         : undefined,
     };
     openWorkspaceTab(nextTab);
+    if (!shouldUseSharedNonIntegratedApi) {
+      markProductWorkspaceTabLoaded(tabId);
+    }
   }
 
   function openNewNonIntegratedProductWorkspace(
     productDevelopmentKind: ProductDevelopmentKind = "product",
+    initialCreateProductKind: NewNonIntegratedCreateKind = "new",
   ) {
     const existingTab = workspaceTabs.find(
       (tab) =>
         tab.kind === "newNonIntegratedProduct" &&
-        tab.productDevelopmentKind === productDevelopmentKind,
+        tab.productDevelopmentKind === productDevelopmentKind &&
+        (tab.initialCreateProductKind ?? "new") === initialCreateProductKind,
     );
     if (existingTab) {
       syncWorkspaceState(existingTab);
@@ -8715,16 +8800,18 @@ export default function IntakeClient(props: IntakeClientProps) {
     const nextTab = createNewNonIntegratedProductWorkspaceTab(
       createWorkspaceTabId("new-non-integrated", productDevelopmentKind),
       productDevelopmentKind,
+      initialCreateProductKind,
     );
     openWorkspaceTab(nextTab);
   }
 
   function activatePendingEntryListWorkspace(
     productDevelopmentKind: ProductDevelopmentKind = "product",
+    entryTabOverride?: IntakeEntryTab,
   ) {
-    const entryTab = getPendingEntryTabFromProductDevelopmentKind(
-      productDevelopmentKind,
-    );
+    const entryTab =
+      entryTabOverride ??
+      getPendingEntryTabFromProductDevelopmentKind(productDevelopmentKind);
     const existingTab = workspaceTabs.find(
       (tab) => tab.kind === "pendingEntry" && tab.entryTab === entryTab,
     );
@@ -8769,9 +8856,10 @@ export default function IntakeClient(props: IntakeClientProps) {
       closingTab?.kind === "newNonIntegratedProduct"
         ? closingTab.productDevelopmentKind
         : "product";
-    const entryTab = getPendingEntryTabFromProductDevelopmentKind(
-      productDevelopmentKind,
-    );
+    const entryTab =
+      closingTab?.kind === "newNonIntegratedProduct"
+        ? getPendingEntryTabFromNewProductTab(closingTab)
+        : getPendingEntryTabFromProductDevelopmentKind(productDevelopmentKind);
     const listTab =
       workspaceTabs.find(
         (tab) => tab.kind === "pendingEntry" && tab.entryTab === entryTab,
@@ -8938,6 +9026,7 @@ export default function IntakeClient(props: IntakeClientProps) {
           onReturnToList={() =>
             activatePendingEntryListWorkspace(
               activeWorkspaceTab.productDevelopmentKind,
+              getPendingEntryTabFromProduct(activeWorkspaceTab.product),
             )
           }
         />
@@ -8988,6 +9077,9 @@ export default function IntakeClient(props: IntakeClientProps) {
           key={activeWorkspaceTab.id}
           mode="create"
           productDevelopmentKind={activeWorkspaceTab.productDevelopmentKind}
+          initialCreateProductKind={
+            activeWorkspaceTab.initialCreateProductKind ?? "new"
+          }
           seriesNameOptions={seriesNameOptions}
           existingSeriesNames={existingSeriesNames}
           seriesDraftSkuOptions={seriesDraftSkuOptions}
@@ -9055,11 +9147,21 @@ export default function IntakeClient(props: IntakeClientProps) {
       eligibleSkuList: props.eligibleSkuList,
     });
     const productDevelopmentProducts = nonIntegratedProducts.filter(
-      (product) => getProductDevelopmentKind(product) === "product",
+      (product) =>
+        getProductDevelopmentKind(product) === "product" &&
+        !isNonIntegratedStockProduct(product),
+    );
+    const stockDevelopmentProducts = nonIntegratedProducts.filter(
+      (product) =>
+        getProductDevelopmentKind(product) === "product" &&
+        isNonIntegratedStockProduct(product),
     );
     const seriesDevelopmentProducts = nonIntegratedProducts.filter(
       (product) => getProductDevelopmentKind(product) === "series",
     );
+    const progressProducts = nonIntegratedProducts.filter(
+      (product) => !isNonIntegratedStockProduct(product),
+    );
 
     let leftContent: React.ReactNode = <EmptyDetail />;
     if (activeSection === "pending") {
@@ -9079,14 +9181,32 @@ export default function IntakeClient(props: IntakeClientProps) {
               openNewNonIntegratedProductWorkspace("series")
             }
           />
+        ) : pendingEntryTab === "stock" ? (
+          <NonIntegratedPendingDetail
+            initialProducts={stockDevelopmentProducts}
+            canDeleteProducts={canDeleteNonIntegratedProducts}
+            currentUser={props.user}
+            productDevelopmentKind="product"
+            fixedProductKind="stock"
+            createButtonLabel="新增存量商品"
+            emptyMessage="当前还没有存量商品，点击右上角“新增存量商品”开始维护存量资料。"
+            onProductsChange={(nextProducts) =>
+              handleScopedProductsChange("product", nextProducts, "stock")
+            }
+            onOpenProductWorkspace={openProductWorkspace}
+            onOpenNewNonIntegratedProductWorkspace={() =>
+              openNewNonIntegratedProductWorkspace("product", "stock")
+            }
+          />
         ) : (
           <NonIntegratedPendingDetail
             initialProducts={productDevelopmentProducts}
             canDeleteProducts={canDeleteNonIntegratedProducts}
             currentUser={props.user}
             productDevelopmentKind="product"
+            fixedProductKind="new"
             onProductsChange={(nextProducts) =>
-              handleScopedProductsChange("product", nextProducts)
+              handleScopedProductsChange("product", nextProducts, "new")
             }
             onOpenProductWorkspace={openProductWorkspace}
             onOpenNewNonIntegratedProductWorkspace={() =>
@@ -9098,7 +9218,7 @@ export default function IntakeClient(props: IntakeClientProps) {
       leftContent = (
         <ProductDevelopmentProgressDashboard
           integratedRows={skuList}
-          nonIntegratedProducts={nonIntegratedProducts}
+          nonIntegratedProducts={progressProducts}
           currentUser={props.user}
           onOpenProductWorkspace={openProductWorkspace}
         />
@@ -9179,11 +9299,21 @@ export default function IntakeClient(props: IntakeClientProps) {
 
   const skuList = buildIntegratedSeriesRows({ detail: props.detail });
   const productDevelopmentProducts = nonIntegratedProducts.filter(
-    (product) => getProductDevelopmentKind(product) === "product",
+    (product) =>
+      getProductDevelopmentKind(product) === "product" &&
+      !isNonIntegratedStockProduct(product),
+  );
+  const stockDevelopmentProducts = nonIntegratedProducts.filter(
+    (product) =>
+      getProductDevelopmentKind(product) === "product" &&
+      isNonIntegratedStockProduct(product),
   );
   const seriesDevelopmentProducts = nonIntegratedProducts.filter(
     (product) => getProductDevelopmentKind(product) === "series",
   );
+  const progressProducts = nonIntegratedProducts.filter(
+    (product) => !isNonIntegratedStockProduct(product),
+  );
   let leftContent: React.ReactNode = <EmptyDetail />;
   if (activeSection === "pending") {
     leftContent =
@@ -9202,14 +9332,32 @@ export default function IntakeClient(props: IntakeClientProps) {
             openNewNonIntegratedProductWorkspace("series")
           }
         />
+      ) : pendingEntryTab === "stock" ? (
+        <NonIntegratedPendingDetail
+          initialProducts={stockDevelopmentProducts}
+          canDeleteProducts={canDeleteNonIntegratedProducts}
+          currentUser={props.user}
+          productDevelopmentKind="product"
+          fixedProductKind="stock"
+          createButtonLabel="新增存量商品"
+          emptyMessage="当前还没有存量商品，点击右上角“新增存量商品”开始维护存量资料。"
+          onProductsChange={(nextProducts) =>
+            handleScopedProductsChange("product", nextProducts, "stock")
+          }
+          onOpenProductWorkspace={openProductWorkspace}
+          onOpenNewNonIntegratedProductWorkspace={() =>
+            openNewNonIntegratedProductWorkspace("product", "stock")
+          }
+        />
       ) : (
         <NonIntegratedPendingDetail
           initialProducts={productDevelopmentProducts}
           canDeleteProducts={canDeleteNonIntegratedProducts}
           currentUser={props.user}
           productDevelopmentKind="product"
+          fixedProductKind="new"
           onProductsChange={(nextProducts) =>
-            handleScopedProductsChange("product", nextProducts)
+            handleScopedProductsChange("product", nextProducts, "new")
           }
           onOpenProductWorkspace={openProductWorkspace}
           onOpenNewNonIntegratedProductWorkspace={() =>
@@ -9221,7 +9369,7 @@ export default function IntakeClient(props: IntakeClientProps) {
     leftContent = (
       <ProductDevelopmentProgressDashboard
         integratedRows={skuList}
-        nonIntegratedProducts={nonIntegratedProducts}
+        nonIntegratedProducts={progressProducts}
         currentUser={props.user}
         onOpenProductWorkspace={openProductWorkspace}
       />
diff --git a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
index b9d67450..3d89c63a 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
@@ -514,6 +514,7 @@ describe("NonIntegratedDetailClient", () => {
         productDevelopmentKind="series"
         seriesNameOptions={["单板桌系列"]}
         currentUserRole="DESIGNER"
+        currentUserBusinessRoles={["DESIGN"]}
         currentUserId="creator-user-id"
         currentUserName="Creator"
       />,
@@ -609,6 +610,7 @@ describe("NonIntegratedDetailClient", () => {
           },
         ]}
         currentUserRole="DESIGNER"
+        currentUserBusinessRoles={["DESIGN"]}
         currentUserId="creator-user-id"
         currentUserName="Creator"
       />,
@@ -774,11 +776,12 @@ describe("NonIntegratedDetailClient", () => {
       expect(mockedSaveSharedNonIntegratedProduct).toHaveBeenCalledTimes(1),
     );
 
-    expect(mockedUploadDetachedNonIntegratedFile).toHaveBeenCalledWith(
-      undefined,
-      expect.objectContaining({ name: "remote-preview.png" }),
-      expect.any(Function),
-    );
+    expect(mockedUploadDetachedNonIntegratedFile).toHaveBeenCalledTimes(1);
+    const [, uploadedFile, uploadProgressHandler] =
+      mockedUploadDetachedNonIntegratedFile.mock.calls[0] ?? [];
+    expect(uploadedFile).toBeInstanceOf(File);
+    expect(uploadedFile.name).toBe("remote-preview.png");
+    expect(uploadProgressHandler).toBeUndefined();
     expect(mockedSaveSharedNonIntegratedProduct.mock.calls[0]?.[0]).toEqual(
       expect.objectContaining({
         previewImage: "http://test.local/remote-preview.png",
diff --git a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
index 6292e9a1..dca9f51e 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
@@ -8703,6 +8703,7 @@ export default function NonIntegratedDetailClient({
   mode,
   productId,
   initialProduct = null,
+  initialCreateProductKind = "new",
   initialDocumentWorkspaceCategory,
   initialDocumentWorkspaceView,
   embedded = false,
@@ -8727,6 +8728,7 @@ export default function NonIntegratedDetailClient({
   mode: "create" | "edit" | "view";
   productId?: string;
   initialProduct?: NonIntegratedProductRecord | null;
+  initialCreateProductKind?: CreateProductKind;
   initialDocumentWorkspaceCategory?: DocumentWorkspaceCategory;
   initialDocumentWorkspaceView?: DocumentWorkspaceView;
   embedded?: boolean;
@@ -8843,7 +8845,7 @@ export default function NonIntegratedDetailClient({
   const [activeComponentSkuCategory, setActiveComponentSkuCategory] =
     useState<ComponentSkuCategoryKey>("all");
   const [createProductKind, setCreateProductKind] =
-    useState<CreateProductKind>("new");
+    useState<CreateProductKind>(initialCreateProductKind);
   const [stockProductSpu, setStockProductSpu] = useState("");
   const [formValues, setFormValues] = useState(() =>
     createFormValuesFromProduct(existingProduct),

From 0640dd8decde2080597d80da02cb30f8cc2a425a Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Mon, 18 May 2026 19:41:48 +0800
Subject: [PATCH 04/21] =?UTF-8?q?fix(asset-center):=20=E6=B8=85=E7=90=86?=
 =?UTF-8?q?=E7=B3=BB=E5=88=97=E6=8E=A5=E5=8F=A3=E6=96=87=E4=BB=B6=E5=B0=BE?=
 =?UTF-8?q?=E7=A9=BA=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/app/api/asset-center/series/[id]/route.ts                | 1 -
 1 file changed, 1 deletion(-)

diff --git a/furniture-3d-system/src/app/api/asset-center/series/[id]/route.ts b/furniture-3d-system/src/app/api/asset-center/series/[id]/route.ts
index 5ac75266..abc3a46a 100644
--- a/furniture-3d-system/src/app/api/asset-center/series/[id]/route.ts
+++ b/furniture-3d-system/src/app/api/asset-center/series/[id]/route.ts
@@ -39,4 +39,3 @@ export async function PUT(
     { requireAuth: true, requireInternalContentWrite: true },
   )
 }
-

From 48557987e0ef66f0b9a33a7fa276948c2933c94e Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Mon, 18 May 2026 19:54:58 +0800
Subject: [PATCH 05/21] =?UTF-8?q?fix(deploy):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=95=9C=E5=83=8F=E6=9E=84=E5=BB=BA=E5=9F=BA?=
 =?UTF-8?q?=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 furniture-3d-system/.dockerignore                             | 3 +--
 furniture-3d-system/Dockerfile                                | 4 ++--
 .../local-packages/npm-cache/node_modules/.gitkeep            | 1 +
 furniture-3d-system/local-packages/prisma-engines/.gitkeep    | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 furniture-3d-system/local-packages/npm-cache/node_modules/.gitkeep
 create mode 100644 furniture-3d-system/local-packages/prisma-engines/.gitkeep

diff --git a/furniture-3d-system/.dockerignore b/furniture-3d-system/.dockerignore
index 1da91c56..1502ae8b 100644
--- a/furniture-3d-system/.dockerignore
+++ b/furniture-3d-system/.dockerignore
@@ -75,7 +75,6 @@ dist
 
 # Gatsby文件
 .cache/
-public
 
 # Vuepress构建输出
 .vuepress/dist
@@ -225,4 +224,4 @@ PROJECT_SETUP_COMPLETE.md
 产品安装展示系统-*.md
 开发部署计划.md
 项目*.md
-架构*.md
\ No newline at end of file
+架构*.md
diff --git a/furniture-3d-system/Dockerfile b/furniture-3d-system/Dockerfile
index f1088d30..cd704097 100644
--- a/furniture-3d-system/Dockerfile
+++ b/furniture-3d-system/Dockerfile
@@ -7,7 +7,7 @@
 # ============================================
 # 阶段 1: 基础镜像
 # ============================================
-FROM node:18-alpine AS base
+FROM node:24-alpine AS base
 
 # 使用阿里云镜像源加速（中国网络优化）
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
@@ -237,4 +237,4 @@ HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
     CMD curl -f http://localhost:3000/api/health || exit 1
 
 # 启动应用
-CMD ["node", "server.js"]
\ No newline at end of file
+CMD ["node", "server.js"]
diff --git a/furniture-3d-system/local-packages/npm-cache/node_modules/.gitkeep b/furniture-3d-system/local-packages/npm-cache/node_modules/.gitkeep
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/furniture-3d-system/local-packages/npm-cache/node_modules/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/furniture-3d-system/local-packages/prisma-engines/.gitkeep b/furniture-3d-system/local-packages/prisma-engines/.gitkeep
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/furniture-3d-system/local-packages/prisma-engines/.gitkeep
@@ -0,0 +1 @@
+

From aaae569af1f999e95da3000bc5c9efe2e20f42a9 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Mon, 18 May 2026 19:58:48 +0800
Subject: [PATCH 06/21] =?UTF-8?q?fix(deploy):=20=E8=B7=B3=E8=BF=87=20Puppe?=
 =?UTF-8?q?teer=20=E6=9E=84=E5=BB=BA=E6=9C=9F=E6=B5=8F=E8=A7=88=E5=99=A8?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 furniture-3d-system/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/furniture-3d-system/Dockerfile b/furniture-3d-system/Dockerfile
index cd704097..ead39d9a 100644
--- a/furniture-3d-system/Dockerfile
+++ b/furniture-3d-system/Dockerfile
@@ -82,6 +82,7 @@ ENV PRISMA_SCHEMA_ENGINE_CACHE_FILE_NAME=${PRISMA_SCHEMA_ENGINE_CACHE_FILE_NAME}
 ENV DATABASE_URL=${DATABASE_URL}
 ENV NEXTAUTH_URL=${NEXTAUTH_URL}
 ENV NEXT_PUBLIC_APP_URL=${NEXT_PUBLIC_APP_URL}
+ENV PUPPETEER_SKIP_DOWNLOAD=true
 ENV NEXT_TELEMETRY_DISABLED=1
 ENV NODE_ENV=production
 ENV PRISMA_ENGINES_CHECKSUM_IGNORE_MISSING=1

From 09606adcb962e40318bcaf95e51463295cbebae6 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Mon, 18 May 2026 19:59:57 +0800
Subject: [PATCH 07/21] fix(intake): keep stock products in product development
 list

---
 .../src/app/intake/IntakeClient.tsx           | 135 +++++++++---------
 .../intake-non-integrated-product.service.ts  |  11 +-
 2 files changed, 75 insertions(+), 71 deletions(-)

diff --git a/furniture-3d-system/src/app/intake/IntakeClient.tsx b/furniture-3d-system/src/app/intake/IntakeClient.tsx
index 81fa62fd..3fd6f849 100644
--- a/furniture-3d-system/src/app/intake/IntakeClient.tsx
+++ b/furniture-3d-system/src/app/intake/IntakeClient.tsx
@@ -697,33 +697,55 @@ function getProductDevelopmentKind(
   return product.productDevelopmentKind === "series" ? "series" : "product";
 }
 
-function isNonIntegratedStockProduct(
+function readOptionalRecordString(value: unknown) {
+  return typeof value === "string" ? value.trim() : "";
+}
+
+function readOptionalNestedString(
+  value: unknown,
+  key: string,
+) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return "";
+  return readOptionalRecordString((value as Record<string, unknown>)[key]);
+}
+
+function isJstSkuSourceMarker(value: string) {
+  const normalizedValue = value.trim().toLowerCase().replace(/-/g, "_");
+  return normalizedValue === "jst_sku" || normalizedValue === "jstsku";
+}
+
+function isJstSkuImportedStockProduct(
   product: Pick<
     NonIntegratedProductRecord,
-    "formalSpuAssigned" | "openingReference" | "processTemplate" | "spu"
-  >,
+    | "id"
+    | "formalSpuAssigned"
+    | "openingReference"
+    | "productDevelopmentKind"
+    | "spu"
+  > &
+    Record<string, unknown>,
 ) {
-  const normalizedSpu = product.spu?.trim().toUpperCase() ?? "";
-  const normalizedTemporaryCode =
-    product.openingReference?.temporaryCode?.trim().toUpperCase() ?? "";
-  const normalizedProductName =
-    product.openingReference?.productName?.trim().toUpperCase() ?? "";
+  if (getProductDevelopmentKind(product) !== "product") return false;
+  if (product.id.trim().startsWith("jst-stock-")) return true;
 
-  return (
-    product.processTemplate?.trim() === "存量商品" ||
-    product.openingReference?.currentStage?.trim() === "存量商品" ||
-    Boolean(
-      product.formalSpuAssigned &&
-        normalizedSpu &&
-        (normalizedSpu === normalizedTemporaryCode ||
-          normalizedSpu === normalizedProductName),
-    )
-  );
+  const metadata = product.metadata;
+  const sourceCandidates = [
+    readOptionalRecordString(product.source),
+    readOptionalRecordString(product.sourceTable),
+    readOptionalRecordString(product.importSource),
+    readOptionalRecordString(product.externalSource),
+    readOptionalNestedString(metadata, "source"),
+    readOptionalNestedString(metadata, "sourceTable"),
+    readOptionalNestedString(metadata, "importSource"),
+    readOptionalNestedString(metadata, "externalSource"),
+  ];
+
+  return sourceCandidates.some(isJstSkuSourceMarker);
 }
 
 function getPendingEntryTabFromProduct(product: NonIntegratedProductRecord) {
   if (getProductDevelopmentKind(product) === "series") return "integrated";
-  return isNonIntegratedStockProduct(product) ? "stock" : "nonIntegrated";
+  return isJstSkuImportedStockProduct(product) ? "stock" : "nonIntegrated";
 }
 
 function getPendingEntryTabFromNewProductTab(tab: {
@@ -740,7 +762,7 @@ function getProductDevelopmentDetailLabel(
   const suffix =
     getProductDevelopmentKind(product) === "series"
       ? "系列产品开发明细"
-      : isNonIntegratedStockProduct(product)
+      : isJstSkuImportedStockProduct(product)
         ? "存量商品明细"
       : "产品开发明细";
 
@@ -2499,7 +2521,7 @@ function NonIntegratedPendingDetail({
   });
   const shouldUseSharedNonIntegratedApi = process.env.NODE_ENV !== "test";
   const effectiveProductKind = fixedProductKind ?? appliedQuery.productKind;
-  const showProductKindFilter = !fixedProductKind;
+  const hasCreateAction = Boolean(onOpenNewNonIntegratedProductWorkspace);
 
   function scopeProductsByDevelopmentKind(
     nextProducts: NonIntegratedProductRecord[],
@@ -2736,7 +2758,7 @@ function NonIntegratedPendingDetail({
       const documentWorkspaceCountByCategory =
         getDocumentWorkspaceCountByCategory(product);
       const people = getNonIntegratedListPeople(product);
-      const stockProduct = isNonIntegratedStockProduct(product);
+      const stockProduct = isJstSkuImportedStockProduct(product);
       const productKindMatched =
         effectiveProductKind === "all" ||
         (effectiveProductKind === "stock"
@@ -2888,38 +2910,11 @@ function NonIntegratedPendingDetail({
           </div>
           <div
             className={`grid items-end gap-2 ${
-              showProductKindFilter
-                ? "md:grid-cols-[104px_repeat(7,minmax(0,1fr))_72px_104px]"
-                : "md:grid-cols-[repeat(7,minmax(0,1fr))_72px_104px]"
+              hasCreateAction
+                ? "md:grid-cols-[repeat(7,minmax(0,1fr))_72px_104px]"
+                : "md:grid-cols-[repeat(7,minmax(0,1fr))_72px]"
             }`}
           >
-            {showProductKindFilter ? (
-              <label className="space-y-1.5 text-xs text-apple-label-secondary">
-                <span>产品类型</span>
-                <select
-                  aria-label="产品类型"
-                  value={queryDraft.productKind}
-                  onChange={(event) => {
-                    const productKind = event.target
-                      .value as NonIntegratedProductKindFilter;
-                    setQueryDraft((current) => ({
-                      ...current,
-                      productKind,
-                    }));
-                    setAppliedQuery((current) => ({
-                      ...current,
-                      productKind,
-                    }));
-                    setCurrentPage(1);
-                  }}
-                  className="h-8 w-full rounded-apple-md border border-apple-separator bg-apple-bg-secondary px-2.5 text-xs text-apple-label-primary outline-none"
-                >
-                  <option value="all">全部</option>
-                  <option value="new">新品</option>
-                  <option value="stock">存量商品</option>
-                </select>
-              </label>
-            ) : null}
             {filterFields.map((filter) => (
               <label
                 key={filter.key}
@@ -2952,16 +2947,18 @@ function NonIntegratedPendingDetail({
                 查询
               </Button>
             </div>
-            <div className="flex items-end justify-end">
-              <Button
-                size="small"
-                className={`h-8 w-full px-3 text-xs ${INTAKE_PRIMARY_BUTTON_CLASS}`}
-                onClick={onOpenNewNonIntegratedProductWorkspace}
-              >
-                <Plus className="h-3.5 w-3.5" aria-hidden="true" />
-                {createButtonLabel}
-              </Button>
-            </div>
+            {hasCreateAction ? (
+              <div className="flex items-end justify-end">
+                <Button
+                  size="small"
+                  className={`h-8 w-full px-3 text-xs ${INTAKE_PRIMARY_BUTTON_CLASS}`}
+                  onClick={onOpenNewNonIntegratedProductWorkspace}
+                >
+                  <Plus className="h-3.5 w-3.5" aria-hidden="true" />
+                  {createButtonLabel}
+                </Button>
+              </div>
+            ) : null}
           </div>
         </div>
       </div>
@@ -8479,7 +8476,7 @@ export default function IntakeClient(props: IntakeClientProps) {
           return false;
         }
 
-        const stockProduct = isNonIntegratedStockProduct(product);
+        const stockProduct = isJstSkuImportedStockProduct(product);
         if (productKindFilter === "stock") return !stockProduct;
         if (productKindFilter === "new") return stockProduct;
         return false;
@@ -9149,18 +9146,18 @@ export default function IntakeClient(props: IntakeClientProps) {
     const productDevelopmentProducts = nonIntegratedProducts.filter(
       (product) =>
         getProductDevelopmentKind(product) === "product" &&
-        !isNonIntegratedStockProduct(product),
+        !isJstSkuImportedStockProduct(product),
     );
     const stockDevelopmentProducts = nonIntegratedProducts.filter(
       (product) =>
         getProductDevelopmentKind(product) === "product" &&
-        isNonIntegratedStockProduct(product),
+        isJstSkuImportedStockProduct(product),
     );
     const seriesDevelopmentProducts = nonIntegratedProducts.filter(
       (product) => getProductDevelopmentKind(product) === "series",
     );
     const progressProducts = nonIntegratedProducts.filter(
-      (product) => !isNonIntegratedStockProduct(product),
+      (product) => !isJstSkuImportedStockProduct(product),
     );
 
     let leftContent: React.ReactNode = <EmptyDetail />;
@@ -9301,18 +9298,18 @@ export default function IntakeClient(props: IntakeClientProps) {
   const productDevelopmentProducts = nonIntegratedProducts.filter(
     (product) =>
       getProductDevelopmentKind(product) === "product" &&
-      !isNonIntegratedStockProduct(product),
+      !isJstSkuImportedStockProduct(product),
   );
   const stockDevelopmentProducts = nonIntegratedProducts.filter(
     (product) =>
       getProductDevelopmentKind(product) === "product" &&
-      isNonIntegratedStockProduct(product),
+      isJstSkuImportedStockProduct(product),
   );
   const seriesDevelopmentProducts = nonIntegratedProducts.filter(
     (product) => getProductDevelopmentKind(product) === "series",
   );
   const progressProducts = nonIntegratedProducts.filter(
-    (product) => !isNonIntegratedStockProduct(product),
+    (product) => !isJstSkuImportedStockProduct(product),
   );
   let leftContent: React.ReactNode = <EmptyDetail />;
   if (activeSection === "pending") {
diff --git a/furniture-3d-system/src/server/services/intake-non-integrated-product.service.ts b/furniture-3d-system/src/server/services/intake-non-integrated-product.service.ts
index 763dc5d2..61d2a774 100644
--- a/furniture-3d-system/src/server/services/intake-non-integrated-product.service.ts
+++ b/furniture-3d-system/src/server/services/intake-non-integrated-product.service.ts
@@ -535,8 +535,15 @@ function buildTextContainsAny(
 function buildStockProductWhere(): Prisma.IntakeNonIntegratedProductWhereInput {
   return {
     OR: [
-      jsonTextEquals(['processTemplate'], '存量商品'),
-      jsonTextEquals(['openingReference', 'currentStage'], '存量商品'),
+      { id: { startsWith: 'jst-stock-' } },
+      jsonTextEquals(['source'], 'jst_sku'),
+      jsonTextEquals(['sourceTable'], 'jst_sku'),
+      jsonTextEquals(['importSource'], 'jst_sku'),
+      jsonTextEquals(['externalSource'], 'jst_sku'),
+      jsonTextEquals(['metadata', 'source'], 'jst_sku'),
+      jsonTextEquals(['metadata', 'sourceTable'], 'jst_sku'),
+      jsonTextEquals(['metadata', 'importSource'], 'jst_sku'),
+      jsonTextEquals(['metadata', 'externalSource'], 'jst_sku'),
     ],
   }
 }

From 6bf85d79c664811e3cce58dcfcc39d301a7c872b Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Mon, 18 May 2026 20:07:33 +0800
Subject: [PATCH 08/21] =?UTF-8?q?fix(deploy):=20=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=AE=98=E6=96=B9=20Alpine=20=E5=8C=85=E6=BA=90=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA=E9=95=9C=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 furniture-3d-system/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/furniture-3d-system/Dockerfile b/furniture-3d-system/Dockerfile
index ead39d9a..72be4eda 100644
--- a/furniture-3d-system/Dockerfile
+++ b/furniture-3d-system/Dockerfile
@@ -9,8 +9,7 @@
 # ============================================
 FROM node:24-alpine AS base
 
-# 使用阿里云镜像源加速（中国网络优化）
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+# 保留官方 Alpine 源，避免镜像站同步滞后导致 apk 包 404。
 
 # ============================================
 # 阶段 2: 依赖安装 (deps)

From b9be83d84a17e4c13d1c18af3cea660c45301cbd Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Mon, 18 May 2026 20:14:33 +0800
Subject: [PATCH 09/21] =?UTF-8?q?fix(deploy):=20=E4=BC=A0=E5=85=A5?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=9C=9F=E5=85=AC=E5=BC=80=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 furniture-3d-system/Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/furniture-3d-system/Dockerfile b/furniture-3d-system/Dockerfile
index 72be4eda..12ef1d38 100644
--- a/furniture-3d-system/Dockerfile
+++ b/furniture-3d-system/Dockerfile
@@ -70,6 +70,8 @@ FROM base AS builder
 ARG DATABASE_URL="postgresql://user:password@localhost:5432/placeholder_db?schema=public"
 ARG NEXTAUTH_URL=""
 ARG NEXT_PUBLIC_APP_URL=""
+ARG S3_ENDPOINT=""
+ARG S3_PUBLIC_DOMAIN=""
 
 # Prisma 引擎缓存配置
 ARG PRISMA_ENGINE_CACHE_FILE_NAME="libquery_engine-linux-musl-openssl-3.0.x.so.node"
@@ -81,6 +83,8 @@ ENV PRISMA_SCHEMA_ENGINE_CACHE_FILE_NAME=${PRISMA_SCHEMA_ENGINE_CACHE_FILE_NAME}
 ENV DATABASE_URL=${DATABASE_URL}
 ENV NEXTAUTH_URL=${NEXTAUTH_URL}
 ENV NEXT_PUBLIC_APP_URL=${NEXT_PUBLIC_APP_URL}
+ENV S3_ENDPOINT=${S3_ENDPOINT}
+ENV S3_PUBLIC_DOMAIN=${S3_PUBLIC_DOMAIN}
 ENV PUPPETEER_SKIP_DOWNLOAD=true
 ENV NEXT_TELEMETRY_DISABLED=1
 ENV NODE_ENV=production

From a18fdd8fbbbf115388bc1fe79a73c681f746e535 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Mon, 18 May 2026 20:21:05 +0800
Subject: [PATCH 10/21] =?UTF-8?q?fix(deploy):=20=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=9C=9F=E5=AD=98=E5=82=A8=E5=8D=A0=E4=BD=8D?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 furniture-3d-system/Dockerfile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/furniture-3d-system/Dockerfile b/furniture-3d-system/Dockerfile
index 12ef1d38..b0f9e17a 100644
--- a/furniture-3d-system/Dockerfile
+++ b/furniture-3d-system/Dockerfile
@@ -70,8 +70,11 @@ FROM base AS builder
 ARG DATABASE_URL="postgresql://user:password@localhost:5432/placeholder_db?schema=public"
 ARG NEXTAUTH_URL=""
 ARG NEXT_PUBLIC_APP_URL=""
-ARG S3_ENDPOINT=""
-ARG S3_PUBLIC_DOMAIN=""
+ARG S3_ENDPOINT="http://localhost:9000"
+ARG S3_PUBLIC_DOMAIN="http://localhost:9000/furniture-3d-models"
+ARG S3_BUCKET="furniture-3d-models"
+ARG S3_ACCESS_KEY="build-only"
+ARG S3_SECRET_KEY="build-only"
 
 # Prisma 引擎缓存配置
 ARG PRISMA_ENGINE_CACHE_FILE_NAME="libquery_engine-linux-musl-openssl-3.0.x.so.node"
@@ -85,6 +88,9 @@ ENV NEXTAUTH_URL=${NEXTAUTH_URL}
 ENV NEXT_PUBLIC_APP_URL=${NEXT_PUBLIC_APP_URL}
 ENV S3_ENDPOINT=${S3_ENDPOINT}
 ENV S3_PUBLIC_DOMAIN=${S3_PUBLIC_DOMAIN}
+ENV S3_BUCKET=${S3_BUCKET}
+ENV S3_ACCESS_KEY=${S3_ACCESS_KEY}
+ENV S3_SECRET_KEY=${S3_SECRET_KEY}
 ENV PUPPETEER_SKIP_DOWNLOAD=true
 ENV NEXT_TELEMETRY_DISABLED=1
 ENV NODE_ENV=production

From fd79dcae56b370ad545563d2dad3592b50297485 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Tue, 19 May 2026 08:58:07 +0800
Subject: [PATCH 11/21] fix(intake): defer workspace tab restore until client
 mount

---
 .../src/app/intake/IntakeClient.tsx           | 42 ++++++++++++++++---
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/furniture-3d-system/src/app/intake/IntakeClient.tsx b/furniture-3d-system/src/app/intake/IntakeClient.tsx
index fdf50bdd..6dc9d6db 100644
--- a/furniture-3d-system/src/app/intake/IntakeClient.tsx
+++ b/furniture-3d-system/src/app/intake/IntakeClient.tsx
@@ -8352,11 +8352,7 @@ export default function IntakeClient(props: IntakeClientProps) {
   const shouldPersistWorkspaceState = !isEditorMode(props);
   const shouldUseSharedNonIntegratedApi = process.env.NODE_ENV !== "test";
   const [initialWorkspaceState] = useState(() =>
-    readInitialIntakeWorkspaceState({
-      products: props.initialNonIntegratedProducts,
-      userId: props.user.id,
-      shouldRestore: shouldPersistWorkspaceState,
-    }),
+    createDefaultIntakeWorkspaceState(),
   );
   const initialActiveWorkspaceTab =
     initialWorkspaceState.tabs.find(
@@ -8401,6 +8397,10 @@ export default function IntakeClient(props: IntakeClientProps) {
   const workspaceTabSequenceRef = useRef(initialWorkspaceState.sequence);
   const productWorkspaceLoadingRef = useRef<Set<string>>(new Set());
   const initialOpenNewNonIntegratedProductRef = useRef(false);
+  const workspaceStateRestoredRef = useRef(false);
+  const [workspaceStateReady, setWorkspaceStateReady] = useState(
+    () => !shouldPersistWorkspaceState,
+  );
 
   const activeWorkspaceTab =
     workspaceTabs.find((tab) => tab.id === activeWorkspaceTabId) ?? null;
@@ -8458,10 +8458,39 @@ export default function IntakeClient(props: IntakeClientProps) {
     setNonIntegratedProducts(props.initialNonIntegratedProducts);
   }, [props.initialNonIntegratedProducts]);
 
+  useEffect(() => {
+    if (!shouldPersistWorkspaceState) {
+      setWorkspaceStateReady(true);
+      return;
+    }
+
+    if (workspaceStateRestoredRef.current) return;
+    workspaceStateRestoredRef.current = true;
+
+    const restoredState = readInitialIntakeWorkspaceState({
+      products: props.initialNonIntegratedProducts,
+      userId: props.user.id,
+      shouldRestore: true,
+    });
+    const restoredActiveTab =
+      restoredState.tabs.find((tab) => tab.id === restoredState.activeTabId) ??
+      restoredState.tabs[0] ??
+      null;
+
+    workspaceTabSequenceRef.current = restoredState.sequence;
+    setWorkspaceTabs(restoredState.tabs);
+    syncWorkspaceState(restoredActiveTab);
+    setWorkspaceStateReady(true);
+  }, [
+    props.initialNonIntegratedProducts,
+    props.user.id,
+    shouldPersistWorkspaceState,
+  ]);
+
   useEffect(() => {
     persistIntakeWorkspaceState({
       activeTabId: activeWorkspaceTabId,
-      shouldPersist: shouldPersistWorkspaceState,
+      shouldPersist: shouldPersistWorkspaceState && workspaceStateReady,
       tabs: workspaceTabs,
       userId: props.user.id,
     });
@@ -8470,6 +8499,7 @@ export default function IntakeClient(props: IntakeClientProps) {
     props.user.id,
     shouldPersistWorkspaceState,
     workspaceTabs,
+    workspaceStateReady,
   ]);
 
   function handleScopedProductsChange(

From 30e1d2f5b538d13b8a04e529826949d69c4c0811 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Tue, 19 May 2026 09:11:06 +0800
Subject: [PATCH 12/21] fix(intake): reset persisted workspace tab cache

---
 furniture-3d-system/src/app/intake/IntakeClient.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/furniture-3d-system/src/app/intake/IntakeClient.tsx b/furniture-3d-system/src/app/intake/IntakeClient.tsx
index 6dc9d6db..59488785 100644
--- a/furniture-3d-system/src/app/intake/IntakeClient.tsx
+++ b/furniture-3d-system/src/app/intake/IntakeClient.tsx
@@ -339,7 +339,7 @@ type IntakeWorkspaceTab =
     };
 
 const MAX_WORKSPACE_TABS_PER_PAGE = 3;
-const INTAKE_WORKSPACE_STATE_STORAGE_KEY = "intake:workspace-state:v1";
+const INTAKE_WORKSPACE_STATE_STORAGE_KEY = "intake:workspace-state:v2";
 
 type PersistedIntakeWorkspaceTab =
   | {

From 668391f9834503a5d1c3b1d2eb332c49ae3eca53 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Tue, 19 May 2026 11:33:01 +0800
Subject: [PATCH 13/21] feat: sync and filter jst sku stock products

---
 furniture-3d-system/package-lock.json         |  16 +-
 furniture-3d-system/package.json              |   4 +-
 .../scripts/sync-jst-sku-stock-products.ts    | 107 +++
 .../app/api/intake/non-integrated/route.ts    |   6 +
 .../src/app/intake/IntakeClient.test.tsx      |   8 +-
 .../src/app/intake/IntakeClient.tsx           | 264 ++++++-
 .../NonIntegratedDetailClient.test.tsx        |  36 +
 .../NonIntegratedDetailClient.tsx             | 159 ++--
 .../intake/non-integrated/nonIntegratedApi.ts |   6 +
 .../non-integrated/nonIntegratedStorage.ts    |   8 +
 .../intake-non-integrated-product.service.ts  | 162 +++-
 .../services/jst-sku-stock-sync.service.ts    | 744 ++++++++++++++++++
 12 files changed, 1428 insertions(+), 92 deletions(-)
 create mode 100644 furniture-3d-system/scripts/sync-jst-sku-stock-products.ts
 create mode 100644 furniture-3d-system/src/server/services/jst-sku-stock-sync.service.ts

diff --git a/furniture-3d-system/package-lock.json b/furniture-3d-system/package-lock.json
index 4a591dc8..61a3ff44 100644
--- a/furniture-3d-system/package-lock.json
+++ b/furniture-3d-system/package-lock.json
@@ -34,6 +34,7 @@
         "jszip": "^3.10.1",
         "lucide-react": "^0.563.0",
         "mssql": "^12.5.0",
+        "mysql2": "^3.15.3",
         "nanoid": "^5.1.6",
         "next": "^16.1.6",
         "obj2gltf": "^3.2.0",
@@ -3016,7 +3017,6 @@
       "resolved": "https://registry.npmmirror.com/@img/colour/-/colour-1.0.0.tgz",
       "integrity": "sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==",
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=18"
       }
@@ -7521,7 +7521,6 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz",
       "integrity": "sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 6.0.0"
@@ -9031,7 +9030,6 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmmirror.com/detect-libc/-/detect-libc-2.1.2.tgz",
       "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
-      "devOptional": true,
       "license": "Apache-2.0",
       "engines": {
         "node": ">=8"
@@ -10698,7 +10696,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
       "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-property": "^1.0.2"
@@ -11710,7 +11707,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
       "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/is-regex": {
@@ -13844,7 +13840,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/lru.min/-/lru.min-1.1.3.tgz",
       "integrity": "sha512-Lkk/vx6ak3rYkRR0Nhu4lFUT2VDnQSxBe8Hbl7f36358p6ow8Bnvr8lrLt98H8J1aGxfhbX4Fs5tYg2+FTwr5Q==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "bun": ">=1.0.0",
@@ -14170,7 +14165,6 @@
       "version": "3.15.3",
       "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.15.3.tgz",
       "integrity": "sha512-FBrGau0IXmuqg4haEZRBfHNWB5mUARw6hNwPDXXGg0XzVJ50mr/9hb267lvpVMnhZ1FON3qNd4Xfcez1rbFwSg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "aws-ssl-profiles": "^1.1.1",
@@ -14191,7 +14185,6 @@
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz",
       "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
@@ -14208,7 +14201,6 @@
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.6.tgz",
       "integrity": "sha512-Tz09sEL2EEuv5fFowm419c1+a/jSMiBjI9gHxVLrVdbUkkNUUfjsVYs9pVZu5oCon/kmRh9TfLEObFtkVxmY0w==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "lru.min": "^1.1.0"
@@ -16156,8 +16148,7 @@
     "node_modules/seq-queue": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz",
-      "integrity": "sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==",
-      "dev": true
+      "integrity": "sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q=="
     },
     "node_modules/set-function-length": {
       "version": "1.2.2",
@@ -16220,7 +16211,6 @@
       "integrity": "sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==",
       "hasInstallScript": true,
       "license": "Apache-2.0",
-      "optional": true,
       "dependencies": {
         "@img/colour": "^1.0.0",
         "detect-libc": "^2.1.2",
@@ -16264,7 +16254,6 @@
       "resolved": "https://registry.npmmirror.com/semver/-/semver-7.7.3.tgz",
       "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
       "license": "ISC",
-      "optional": true,
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -16486,7 +16475,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz",
       "integrity": "sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
diff --git a/furniture-3d-system/package.json b/furniture-3d-system/package.json
index ec311144..f5d5dd9e 100644
--- a/furniture-3d-system/package.json
+++ b/furniture-3d-system/package.json
@@ -25,7 +25,8 @@
     "demo:refresh": "npm run prisma:push && npm run demo:update",
     "thumbnails:backfill": "tsx scripts/backfill-asset-variant-thumbnails.ts",
     "materials:sync-textures": "tsx scripts/sync-material-textures.ts",
-    "materials:sync-standard": "tsx scripts/sync-standard-finishes.ts"
+    "materials:sync-standard": "tsx scripts/sync-standard-finishes.ts",
+    "sync:jst-sku-stock": "tsx scripts/sync-jst-sku-stock-products.ts"
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.948.0",
@@ -54,6 +55,7 @@
     "jszip": "^3.10.1",
     "lucide-react": "^0.563.0",
     "mssql": "^12.5.0",
+    "mysql2": "^3.15.3",
     "nanoid": "^5.1.6",
     "next": "^16.1.6",
     "obj2gltf": "^3.2.0",
diff --git a/furniture-3d-system/scripts/sync-jst-sku-stock-products.ts b/furniture-3d-system/scripts/sync-jst-sku-stock-products.ts
new file mode 100644
index 00000000..dcb4e085
--- /dev/null
+++ b/furniture-3d-system/scripts/sync-jst-sku-stock-products.ts
@@ -0,0 +1,107 @@
+import 'dotenv/config'
+import { prisma } from '../src/lib/prisma'
+import { syncJstSkuStockProducts } from '../src/server/services/jst-sku-stock-sync.service'
+
+type CliOptions = {
+  apply: boolean
+  batchSize?: number
+  limit?: number
+  help: boolean
+}
+
+function readNumberArg(value: string | undefined, name: string) {
+  if (!value) return undefined
+
+  const parsed = Number(value)
+  if (!Number.isFinite(parsed) || parsed <= 0) {
+    throw new Error(`${name} must be a positive number`)
+  }
+
+  return Math.floor(parsed)
+}
+
+function parseArgs(argv: string[]): CliOptions {
+  const options: CliOptions = {
+    apply: false,
+    help: false,
+  }
+
+  argv.forEach((arg) => {
+    if (arg === '--apply') {
+      options.apply = true
+      return
+    }
+
+    if (arg === '--dry-run') {
+      options.apply = false
+      return
+    }
+
+    if (arg === '--help' || arg === '-h') {
+      options.help = true
+      return
+    }
+
+    if (arg.startsWith('--batch-size=')) {
+      options.batchSize = readNumberArg(arg.split('=')[1], '--batch-size')
+      return
+    }
+
+    if (arg.startsWith('--limit=')) {
+      options.limit = readNumberArg(arg.split('=')[1], '--limit')
+      return
+    }
+
+    throw new Error(`Unknown argument: ${arg}`)
+  })
+
+  return options
+}
+
+function printHelp() {
+  console.log(`
+Usage:
+  npm run sync:jst-sku-stock -- [--dry-run] [--apply] [--limit=100] [--batch-size=500]
+
+Default mode is --dry-run. Use --apply only when you want to write changes.
+
+Required environment variables:
+  DATABASE_URL
+  JST_SKU_DB_HOST
+  JST_SKU_DB_PORT
+  JST_SKU_DB_NAME
+  JST_SKU_DB_USER
+  JST_SKU_DB_PASSWORD
+
+Optional environment variables:
+  JST_SKU_DB_CHARSET=utf8mb4
+  JST_SKU_DB_SSL=false
+  JST_SKU_SYNC_USER_ID=jst_sku_sync
+
+Supported alternative:
+  JST_SKU_DATABASE_URL=mysql://user:password@host:port/database
+`.trim())
+}
+
+async function main() {
+  const options = parseArgs(process.argv.slice(2))
+  if (options.help) {
+    printHelp()
+    return
+  }
+
+  const result = await syncJstSkuStockProducts({
+    apply: options.apply,
+    batchSize: options.batchSize,
+    limit: options.limit,
+  })
+
+  console.log(JSON.stringify(result, null, 2))
+}
+
+main().catch((error) => {
+  console.error(error instanceof Error ? error.message : String(error))
+  process.exitCode = 1
+}).finally(async () => {
+  await prisma.$disconnect()
+})
diff --git a/furniture-3d-system/src/app/api/intake/non-integrated/route.ts b/furniture-3d-system/src/app/api/intake/non-integrated/route.ts
index ffa20f44..21641e68 100644
--- a/furniture-3d-system/src/app/api/intake/non-integrated/route.ts
+++ b/furniture-3d-system/src/app/api/intake/non-integrated/route.ts
@@ -38,6 +38,12 @@ function readListParams(request: NextRequest): IntakeNonIntegratedProductListPar
     planningOwner: searchParams.get('planningOwner') ?? '',
     spaceDesigner: searchParams.get('spaceDesigner') ?? '',
     purchaseOwner: searchParams.get('purchaseOwner') ?? '',
+    stockSku: searchParams.get('stockSku') ?? '',
+    stockCategory: searchParams.get('stockCategory') ?? '',
+    stockItemType: searchParams.get('stockItemType') ?? '',
+    stockSalesStatus: searchParams.get('stockSalesStatus') ?? '',
+    stockEnabledStatus: searchParams.get('stockEnabledStatus') ?? '',
+    stockDataScope: searchParams.get('stockDataScope') ?? '',
   }
 }
 
diff --git a/furniture-3d-system/src/app/intake/IntakeClient.test.tsx b/furniture-3d-system/src/app/intake/IntakeClient.test.tsx
index 7496d585..67826f6c 100644
--- a/furniture-3d-system/src/app/intake/IntakeClient.test.tsx
+++ b/furniture-3d-system/src/app/intake/IntakeClient.test.tsx
@@ -2402,6 +2402,10 @@ describe('IntakeClient', () => {
 
       await actor.click(screen.getAllByRole('tab')[0])
     }
+    const beforeCopyTabs = screen.getAllByRole('tab')
+    expect(
+      beforeCopyTabs.filter((tab) => tab.textContent?.startsWith('SZ0230')),
+    ).toHaveLength(2)
 
     const listRow = screen.getByText('SZ0230').closest('tr')
     expect(listRow).not.toBeNull()
@@ -2418,8 +2422,8 @@ describe('IntakeClient', () => {
     })
 
     const tabs = screen.getAllByRole('tab')
-    expect(tabs).toHaveLength(5)
-    expect(tabs.filter((tab) => tab.textContent?.startsWith('SZ0230'))).toHaveLength(3)
+    expect(tabs).toHaveLength(4)
+    expect(tabs.filter((tab) => tab.textContent?.startsWith('SZ0230'))).toHaveLength(2)
     expect(tabs.some((tab) => tab.textContent?.includes(expectedSpu))).toBe(true)
     expect(push).not.toHaveBeenCalled()
   })
diff --git a/furniture-3d-system/src/app/intake/IntakeClient.tsx b/furniture-3d-system/src/app/intake/IntakeClient.tsx
index 59488785..f6917ac8 100644
--- a/furniture-3d-system/src/app/intake/IntakeClient.tsx
+++ b/furniture-3d-system/src/app/intake/IntakeClient.tsx
@@ -338,7 +338,7 @@ type IntakeWorkspaceTab =
       label: string;
     };
 
-const MAX_WORKSPACE_TABS_PER_PAGE = 3;
+const MAX_WORKSPACE_TABS_PER_PAGE = 2;
 const INTAKE_WORKSPACE_STATE_STORAGE_KEY = "intake:workspace-state:v2";
 
 type PersistedIntakeWorkspaceTab =
@@ -607,6 +607,12 @@ type NonIntegratedListQuery = {
   planningOwner: string;
   spaceDesigner: string;
   purchaseOwner: string;
+  stockSku: string;
+  stockCategory: string;
+  stockItemType: string;
+  stockSalesStatus: string;
+  stockEnabledStatus: string;
+  stockDataScope: string;
 };
 
 const BOM_LIBRARY_OPTIONS: {
@@ -709,6 +715,104 @@ function readOptionalNestedString(
   return readOptionalRecordString((value as Record<string, unknown>)[key]);
 }
 
+function readStockSourceString(
+  product: Record<string, unknown>,
+  key: string,
+) {
+  return readOptionalNestedString(product.metadata, key);
+}
+
+function readFirstSkuString(
+  product: Pick<NonIntegratedProductRecord, "skuItems">,
+  key: keyof NonIntegratedProductRecord["skuItems"][number],
+) {
+  const firstSku = product.skuItems[0];
+  return firstSku ? readOptionalRecordString(firstSku[key]) : "";
+}
+
+function matchesOptionalText(value: string, keyword: string) {
+  const normalizedKeyword = keyword.trim().toUpperCase();
+  if (!normalizedKeyword) return true;
+
+  return value.trim().toUpperCase().includes(normalizedKeyword);
+}
+
+function matchesExactFilter(value: string, filterValue: string) {
+  const normalizedFilter = filterValue.trim();
+  if (!normalizedFilter || normalizedFilter === "all") return true;
+  if (normalizedFilter === "__empty") return value.trim().length === 0;
+
+  return value.trim() === normalizedFilter;
+}
+
+function isNormalJstSkuSpu(product: NonIntegratedProductRecord) {
+  const sourceItemType = readStockSourceString(product, "sourceItemType");
+  const sourceCategory = readStockSourceString(product, "sourceCategory");
+
+  return (
+    sourceItemType === "成品" &&
+    sourceCategory.length > 0 &&
+    !sourceCategory.startsWith("其他 -")
+  );
+}
+
+function isNormalOnSaleJstSku(product: NonIntegratedProductRecord) {
+  return (
+    isNormalJstSkuSpu(product) &&
+    readStockSourceString(product, "sourceSalesStatus") === "销售" &&
+    readStockSourceString(product, "sourceEnabled") === "1"
+  );
+}
+
+function stockSourceMatchesQuery(
+  product: NonIntegratedProductRecord,
+  query: NonIntegratedListQuery,
+) {
+  const sourceSku = readStockSourceString(product, "sourceSkuId");
+  const sourceSpu = readStockSourceString(product, "sourceSpu");
+  const sourceCategory = readStockSourceString(product, "sourceCategory");
+  const sourceItemType = readStockSourceString(product, "sourceItemType");
+  const sourceSalesStatus = readStockSourceString(product, "sourceSalesStatus");
+  const sourceEnabled = readStockSourceString(product, "sourceEnabled");
+  const firstSkuBarcode = readFirstSkuString(product, "barcode");
+  const stockSkuMatched =
+    matchesOptionalText(sourceSku, query.stockSku) ||
+    matchesOptionalText(firstSkuBarcode, query.stockSku);
+  const stockCategoryMatched = matchesOptionalText(
+    sourceCategory,
+    query.stockCategory,
+  );
+  const stockItemTypeMatched = matchesExactFilter(
+    sourceItemType,
+    query.stockItemType,
+  );
+  const stockSalesStatusMatched = matchesExactFilter(
+    sourceSalesStatus,
+    query.stockSalesStatus,
+  );
+  const stockEnabledMatched = matchesExactFilter(
+    sourceEnabled,
+    query.stockEnabledStatus,
+  );
+  const stockDataScopeMatched =
+    query.stockDataScope === "normalSpu"
+      ? isNormalJstSkuSpu(product)
+      : query.stockDataScope === "normalOnSale"
+        ? isNormalOnSaleJstSku(product)
+        : true;
+
+  return (
+    (matchesOptionalText(sourceSpu, query.spu) ||
+      matchesOptionalText(product.spu, query.spu)) &&
+    stockSkuMatched &&
+    stockCategoryMatched &&
+    stockItemTypeMatched &&
+    stockSalesStatusMatched &&
+    stockEnabledMatched &&
+    stockDataScopeMatched
+  );
+}
+
 function isJstSkuSourceMarker(value: string) {
   const normalizedValue = value.trim().toLowerCase().replace(/-/g, "_");
   return normalizedValue === "jst_sku" || normalizedValue === "jstsku";
@@ -841,6 +945,23 @@ function getMaxWorkspaceTabSequence(tabs: IntakeWorkspaceTab[]) {
   );
 }
 
+function limitWorkspaceTabsPerPage(tabs: IntakeWorkspaceTab[]) {
+  const tabKeys = tabs.map((tab) => getWorkspaceTabPageKey(tab));
+
+  return tabs.filter((_, tabIndex) => {
+    const samePageTabIndexes = tabKeys
+      .map((tabKey, currentIndex) =>
+        tabKey === tabKeys[tabIndex] ? currentIndex : -1,
+      )
+      .filter((currentIndex) => currentIndex >= 0);
+    const keptTabIndexes = samePageTabIndexes.slice(
+      -MAX_WORKSPACE_TABS_PER_PAGE,
+    );
+
+    return keptTabIndexes.includes(tabIndex);
+  });
+}
+
 function normalizeWorkspaceProductDetailState(
   value: unknown,
 ): WorkspaceProductDetailState | undefined {
@@ -1025,7 +1146,7 @@ function readInitialIntakeWorkspaceState(params: {
     const productMap = new Map(
       params.products.map((product) => [product.id, product]),
     );
-    const tabs = parsed.tabs
+    const restoredTabs = parsed.tabs
       .map((tab) =>
         restoreIntakeWorkspaceTab(
           tab as PersistedIntakeWorkspaceTab,
@@ -1033,6 +1154,7 @@ function readInitialIntakeWorkspaceState(params: {
         ),
       )
       .filter((tab): tab is IntakeWorkspaceTab => Boolean(tab));
+    const tabs = limitWorkspaceTabsPerPage(restoredTabs);
 
     if (tabs.length === 0) return createDefaultIntakeWorkspaceState();
 
@@ -2520,6 +2642,12 @@ function NonIntegratedPendingDetail({
     planningOwner: "",
     spaceDesigner: "",
     purchaseOwner: "",
+    stockSku: "",
+    stockCategory: "",
+    stockItemType: "all",
+    stockSalesStatus: "all",
+    stockEnabledStatus: "all",
+    stockDataScope: "all",
   });
   const [appliedQuery, setAppliedQuery] = useState<NonIntegratedListQuery>({
     productKind: initialProductKind,
@@ -2530,6 +2658,12 @@ function NonIntegratedPendingDetail({
     planningOwner: "",
     spaceDesigner: "",
     purchaseOwner: "",
+    stockSku: "",
+    stockCategory: "",
+    stockItemType: "all",
+    stockSalesStatus: "all",
+    stockEnabledStatus: "all",
+    stockDataScope: "all",
   });
   const shouldUseSharedNonIntegratedApi = process.env.NODE_ENV !== "test";
   const effectiveProductKind = fixedProductKind ?? appliedQuery.productKind;
@@ -2771,6 +2905,8 @@ function NonIntegratedPendingDetail({
         getDocumentWorkspaceCountByCategory(product);
       const people = getNonIntegratedListPeople(product);
       const stockProduct = isJstSkuImportedStockProduct(product);
+      const sourceSpu = readStockSourceString(product, "sourceSpu");
+      const sourceSku = readStockSourceString(product, "sourceSkuId");
       const productKindMatched =
         effectiveProductKind === "all" ||
         (effectiveProductKind === "stock"
@@ -2779,9 +2915,14 @@ function NonIntegratedPendingDetail({
       const spuMatched =
         normalizedSpuKeyword.length === 0 ||
         productDisplayName.includes(normalizedSpuKeyword) ||
+        sourceSpu.toUpperCase().includes(normalizedSpuKeyword) ||
+        sourceSku.toUpperCase().includes(normalizedSpuKeyword) ||
         getSearchableNonIntegratedSpuKeywords(product.spu).some((keyword) =>
           keyword.includes(normalizedSpuKeyword),
         );
+      const stockSourceMatched =
+        effectiveProductKind !== "stock" ||
+        stockSourceMatchesQuery(product, appliedQuery);
       const peopleMatched =
         productMatchesText(
           people.appearanceDesigner,
@@ -2808,6 +2949,7 @@ function NonIntegratedPendingDetail({
       return (
         productKindMatched &&
         spuMatched &&
+        stockSourceMatched &&
         peopleMatched &&
         quickScopeMatched
       );
@@ -2841,11 +2983,14 @@ function NonIntegratedPendingDetail({
     setPageJumpInput(String(nextPage));
   }
 
-  const filterFields: Array<{
-    key: Exclude<keyof NonIntegratedListQuery, "productKind">;
+  const isSeriesDevelopmentList = productDevelopmentKind === "series";
+  const isStockDevelopmentList = effectiveProductKind === "stock";
+  const productFilterFields: Array<{
+    key: keyof NonIntegratedListQuery;
     label: ReactNode;
     ariaLabel: string;
     placeholder: string;
+    options?: Array<{ value: string; label: string }>;
   }> = [
     { key: "spu", label: <SpuLabel />, ariaLabel: "SPU", placeholder: "搜索 SPU" },
     {
@@ -2885,12 +3030,77 @@ function NonIntegratedPendingDetail({
       placeholder: "搜索采购负责人",
     },
   ];
+  const stockFilterFields: typeof productFilterFields = [
+    { key: "spu", label: <SpuLabel />, ariaLabel: "SPU", placeholder: "搜索SPU/i_id" },
+    {
+      key: "stockSku",
+      label: "SKU条码",
+      ariaLabel: "SKU条码",
+      placeholder: "搜索sku_id",
+    },
+    {
+      key: "stockCategory",
+      label: "类目",
+      ariaLabel: "类目",
+      placeholder: "搜索类目",
+    },
+    {
+      key: "stockItemType",
+      label: "商品类型",
+      ariaLabel: "商品类型",
+      placeholder: "",
+      options: [
+        { value: "all", label: "全部" },
+        { value: "成品", label: "成品" },
+        { value: "半成品", label: "半成品/配件" },
+      ],
+    },
+    {
+      key: "stockSalesStatus",
+      label: "销售状态",
+      ariaLabel: "销售状态",
+      placeholder: "",
+      options: [
+        { value: "all", label: "全部" },
+        { value: "销售", label: "销售" },
+        { value: "停产", label: "停产" },
+        { value: "退市", label: "退市" },
+        { value: "__empty", label: "空" },
+      ],
+    },
+    {
+      key: "stockEnabledStatus",
+      label: "启用状态",
+      ariaLabel: "启用状态",
+      placeholder: "",
+      options: [
+        { value: "all", label: "全部" },
+        { value: "1", label: "启用" },
+        { value: "0", label: "禁用" },
+        { value: "-1", label: "停用" },
+        { value: "__empty", label: "空" },
+      ],
+    },
+    {
+      key: "stockDataScope",
+      label: "数据范围",
+      ariaLabel: "数据范围",
+      placeholder: "",
+      options: [
+        { value: "all", label: "全部数据" },
+        { value: "normalSpu", label: "正常SPU" },
+        { value: "normalOnSale", label: "正常SPU+在售SKU" },
+      ],
+    },
+  ];
+  const filterFields = isStockDevelopmentList
+    ? stockFilterFields
+    : productFilterFields;
   const quickScopes: Array<{ key: NonIntegratedQuickScope; label: string }> = [
     { key: "all", label: "全部" },
     { key: "created", label: "我创建的" },
     { key: "pending", label: "待处理" },
   ];
-  const isSeriesDevelopmentList = productDevelopmentKind === "series";
   const listColumnCount =
     11 +
     NON_INTEGRATED_DOCUMENT_STATUS_COLUMNS.length +
@@ -2933,18 +3143,38 @@ function NonIntegratedPendingDetail({
                 className="space-y-1.5 text-xs text-apple-label-secondary"
               >
                 <span>{filter.label}</span>
-                <input
-                  aria-label={filter.ariaLabel}
-                  value={queryDraft[filter.key]}
-                  onChange={(event) =>
-                    setQueryDraft((current) => ({
-                      ...current,
-                      [filter.key]: event.target.value,
-                    }))
-                  }
-                  placeholder={filter.placeholder}
-                  className="h-8 w-full rounded-apple-md border border-apple-separator bg-apple-bg-secondary px-2.5 text-xs text-apple-label-primary outline-none"
-                />
+                {filter.options ? (
+                  <select
+                    aria-label={filter.ariaLabel}
+                    value={queryDraft[filter.key]}
+                    onChange={(event) =>
+                      setQueryDraft((current) => ({
+                        ...current,
+                        [filter.key]: event.target.value,
+                      }))
+                    }
+                    className="h-8 w-full rounded-apple-md border border-apple-separator bg-apple-bg-secondary px-2.5 text-xs text-apple-label-primary outline-none"
+                  >
+                    {filter.options.map((option) => (
+                      <option key={option.value} value={option.value}>
+                        {option.label}
+                      </option>
+                    ))}
+                  </select>
+                ) : (
+                  <input
+                    aria-label={filter.ariaLabel}
+                    value={queryDraft[filter.key]}
+                    onChange={(event) =>
+                      setQueryDraft((current) => ({
+                        ...current,
+                        [filter.key]: event.target.value,
+                      }))
+                    }
+                    placeholder={filter.placeholder}
+                    className="h-8 w-full rounded-apple-md border border-apple-separator bg-apple-bg-secondary px-2.5 text-xs text-apple-label-primary outline-none"
+                  />
+                )}
               </label>
             ))}
             <div className="flex items-end">
diff --git a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
index e92bb9fd..2dbbe573 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
@@ -1229,6 +1229,7 @@ describe("NonIntegratedDetailClient", () => {
       screen.getByRole("tab", { name: "测试开品产品开发明细" }),
     ).toBeInTheDocument();
     expect(screen.getByLabelText("SPU")).toHaveValue("预计SPU：CJ0267");
+    expect(screen.getByDisplayValue("CJ026701")).toBeInTheDocument();
     expect(screen.getByLabelText("SPU")).toHaveAttribute("readonly");
     expect(screen.getByLabelText("二级类目")).not.toHaveAttribute("readonly");
     expect(screen.getByLabelText("商品类目")).not.toHaveAttribute("readonly");
@@ -2404,6 +2405,41 @@ describe("NonIntegratedDetailClient", () => {
     ).not.toBeInTheDocument();
   });
 
+  it("keeps imported SKU workbook barcode readonly instead of recalculating it", () => {
+    saveNonIntegratedProduct(
+      createProductRecord({
+        id: "ZWJ0218-imported-sku-lock",
+        spu: "ZWJ0218",
+        skuItems: [
+          createSkuItem({
+            id: "sku-imported-lock-1",
+            skuSequence: 1,
+            model: "",
+            skuCode: "ZWJ021801",
+            barcode: "ZWJ02180131978877V01",
+            manufacturer: "曹县嘉欢",
+            manufacturerCode: "N396",
+            source: "sku_workbook",
+            sourceTable: "sku_workbook",
+            contentLocked: true,
+          }),
+        ],
+      }),
+    );
+
+    render(
+      <NonIntegratedDetailClient mode="edit" productId="ZWJ0218-imported-sku-lock" />,
+    );
+
+    const importedBarcode = screen
+      .getAllByDisplayValue("ZWJ02180131978877V01")
+      .find((element) => element.tagName.toLowerCase() === "textarea");
+    expect(importedBarcode).toBeDefined();
+    expect(importedBarcode).toHaveAttribute("readonly");
+    expect(screen.getByDisplayValue("N396")).toBeInTheDocument();
+    expect(screen.queryByDisplayValue("ZWJ021801N396V01")).not.toBeInTheDocument();
+  });
+
   it("persists the SKU national standard compliance selection", async () => {
     const actor = userEvent.setup();
 
diff --git a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
index dca9f51e..e114b710 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
@@ -3223,6 +3223,25 @@ function buildAutoBarcode(
   return `${normalizedSkuCode}${normalizedManufacturerCode}${normalizedVersionNo}`;
 }
 
+const SKU_WORKBOOK_SOURCE = "sku_workbook";
+
+function normalizeSkuSourceMarker(value: string | undefined) {
+  return (value ?? "").trim().toLowerCase().replace(/-/g, "_");
+}
+
+function isImportedSkuContentLocked(item: NonIntegratedSkuItem) {
+  const source = normalizeSkuSourceMarker(item.source);
+  const sourceTable = normalizeSkuSourceMarker(item.sourceTable);
+
+  return (
+    item.contentLocked === true ||
+    source === SKU_WORKBOOK_SOURCE ||
+    sourceTable === SKU_WORKBOOK_SOURCE ||
+    source === "jst_sku" ||
+    sourceTable === "jst_sku"
+  );
+}
+
 function buildAutoBarcodeSkuCandidates(skuCode: string) {
   const normalizedSkuCode = skuCode.trim().toUpperCase();
   const normalizedBaseSkuCode =
@@ -4651,6 +4670,9 @@ function deriveSkuItem(
     item.manufacturerCode,
     versionNo,
   );
+  const importedLockedBarcode = isImportedSkuContentLocked(item)
+    ? item.barcode.trim().toUpperCase()
+    : "";
 
   return {
     ...item,
@@ -4660,14 +4682,16 @@ function deriveSkuItem(
         : 1,
     skuCode: finalSkuCode,
     specName: autoSpecName,
-    barcode: shouldKeepCustomBarcode(
-      item.barcode,
-      finalSkuCode,
-      item.manufacturerCode,
-      versionNo,
-    )
-      ? item.barcode.trim()
-      : autoBarcode,
+    barcode:
+      importedLockedBarcode ||
+      (shouldKeepCustomBarcode(
+        item.barcode,
+        finalSkuCode,
+        item.manufacturerCode,
+        versionNo,
+      )
+        ? item.barcode.trim()
+        : autoBarcode),
     versionNo,
     drawingId: shouldKeepCustomDrawingId(item.drawingId, normalizedItem)
       ? item.drawingId.trim()
@@ -4706,10 +4730,15 @@ function buildSkuItemFromImportedRow(
   const supplier = normalizeFactorySupplier(row.manufacturer);
   const manufacturer = supplier.name || row.manufacturer.trim();
   const manufacturerCode =
-    row.manufacturerCode.trim().toUpperCase() || supplier.code;
+    supplier.code || row.manufacturerCode.trim().toUpperCase();
   const normalizedExecuteStandard =
     resolveExecutionStandardOption(row.executeStandard) ??
     row.executeStandard.trim();
+  const skuCode = row.skuCode.trim().toUpperCase();
+  const versionNo = normalizeSkuVersionNo(row.versionNo);
+  const barcode =
+    row.barcode.trim().toUpperCase() ||
+    buildAutoBarcode(skuCode, manufacturerCode, versionNo);
 
   return {
     ...baseItem,
@@ -4722,14 +4751,14 @@ function buildSkuItemFromImportedRow(
         : fallbackSequence,
     batchNo: parseImportedSkuBatchNo(row.batchNo, baseItem.batchNo || 1),
     model: applyBrandPrefixToNonIntegratedCode(row.model, formValues.brand),
-    skuCode: row.skuCode.trim().toUpperCase(),
+    skuCode,
     setCount: String(normalizeSetCountValue(row.setCount || "1")),
     specName: row.specName.trim(),
-    barcode: row.barcode.trim().toUpperCase(),
+    barcode,
     size: row.size.trim(),
     color: row.color.trim(),
     material: row.material.trim(),
-    versionNo: normalizeSkuVersionNo(row.versionNo),
+    versionNo,
     attributeCode: row.attributeCode.trim().toUpperCase(),
     drawingId: row.drawingId.trim().toUpperCase(),
     installMethod: row.installMethod.trim(),
@@ -4741,6 +4770,9 @@ function buildSkuItemFromImportedRow(
     manufacturerCode,
     salesStatus: row.salesStatus.trim(),
     tagMaterial: formValues.tagMaterial.trim() || baseItem.tagMaterial,
+    source: SKU_WORKBOOK_SOURCE,
+    sourceTable: SKU_WORKBOOK_SOURCE,
+    contentLocked: true,
   };
 }
 
@@ -9866,6 +9898,7 @@ export default function NonIntegratedDetailClient({
         (normalizedExistingSpu === normalizedExistingTemporaryCode ||
           normalizedExistingSpu === normalizedExistingProductName),
     );
+  const isSkuContentReadOnly = isReadOnly || isStockProductRecord;
   const formalSpuValue = formValues.spu.trim();
   const hasFormalSpu = formalSpuValue.length > 0;
   const spuRuleProductCategory =
@@ -9905,12 +9938,13 @@ export default function NonIntegratedDetailClient({
         estimatedSpuAssignment,
     );
   const isSpuCategoryLocked = hasFormalSpu && !isStockProductRecord;
+  const skuCodePreviewSpu = formalSpuValue || estimatedSpuAssignment?.spu || "";
   const derivedSkuItems = useMemo(
     () =>
       skuItems.map((item, index) =>
-        deriveSkuItem(item, index, formValues.spu, formValues),
+        deriveSkuItem(item, index, skuCodePreviewSpu, formValues),
       ),
-    [formValues.spu, formValues.tagMaterial, skuItems],
+    [formValues.tagMaterial, skuCodePreviewSpu, skuItems],
   );
   const getSeriesSkuComponentDetails = useCallback(
     (item: NonIntegratedSkuItem): NonIntegratedSkuComponentDetail[] => {
@@ -13296,6 +13330,9 @@ export default function NonIntegratedDetailClient({
     setSkuItems((current) => {
       const targetItem = current.find((item) => item.id === id);
       if (!targetItem) return current;
+      if (isStockProductRecord || isImportedSkuContentLocked(targetItem)) {
+        return current;
+      }
 
       if (key === "installMethod") {
         const targetStyleKey = getStyleKeyFromModel(targetItem.model);
@@ -13382,9 +13419,11 @@ export default function NonIntegratedDetailClient({
     if (!assignFormalSpuForSku()) return;
 
     setSkuItems((current) =>
-      current.map((item, index) =>
-        item.id === id ? applySkuSupplierName(item, index, value) : item,
-      ),
+      current.map((item, index) => {
+        if (item.id !== id) return item;
+        if (isStockProductRecord || isImportedSkuContentLocked(item)) return item;
+        return applySkuSupplierName(item, index, value);
+      }),
     );
     setSaveMessage("");
     setSaveMessageType("success");
@@ -13397,6 +13436,7 @@ export default function NonIntegratedDetailClient({
     setSkuItems((current) =>
       current.map((item, index) => {
         if (item.id !== id) return item;
+        if (isStockProductRecord || isImportedSkuContentLocked(item)) return item;
 
         return applySkuSupplierName(item, index, item.manufacturer.trim());
       }),
@@ -13410,9 +13450,11 @@ export default function NonIntegratedDetailClient({
     if (!assignFormalSpuForSku()) return;
 
     setSkuItems((current) =>
-      current.map((item) =>
-        item.id === id ? { ...item, executeStandard: value } : item,
-      ),
+      current.map((item) => {
+        if (item.id !== id) return item;
+        if (isStockProductRecord || isImportedSkuContentLocked(item)) return item;
+        return { ...item, executeStandard: value };
+      }),
     );
     setSaveMessage("");
     setSaveMessageType("success");
@@ -13425,6 +13467,7 @@ export default function NonIntegratedDetailClient({
     setSkuItems((current) =>
       current.map((item) => {
         if (item.id !== id) return item;
+        if (isStockProductRecord || isImportedSkuContentLocked(item)) return item;
 
         const normalizedValue = item.executeStandard.trim();
         const matchedOption = resolveExecutionStandardOption(normalizedValue);
@@ -14313,6 +14356,9 @@ export default function NonIntegratedDetailClient({
       if (targetIndex < 0) return current;
 
       const targetItem = current[targetIndex];
+      if (isStockProductRecord || isImportedSkuContentLocked(targetItem)) {
+        return current;
+      }
       const currentGroupId = targetItem.packageGroupId || targetItem.id;
       const groupStartIndex = targetItem.packageGroupId
         ? current.findIndex((item) => item.packageGroupId === currentGroupId)
@@ -14400,6 +14446,16 @@ export default function NonIntegratedDetailClient({
     event: ChangeEvent<HTMLInputElement>,
   ) {
     if (isReadOnly) return;
+    if (
+      skuItems.some(
+        (item) =>
+          item.id === targetId &&
+          (isStockProductRecord || isImportedSkuContentLocked(item)),
+      )
+    ) {
+      event.target.value = "";
+      return;
+    }
     const file = event.target.files?.[0];
     if (!file) return;
 
@@ -14471,6 +14527,9 @@ export default function NonIntegratedDetailClient({
 
       setSkuItems((current) =>
         current.map((item, index) => {
+          if (isStockProductRecord || isImportedSkuContentLocked(item)) {
+            return item;
+          }
           const derivedItem = deriveSkuItem(
             item,
             index,
@@ -14532,7 +14591,7 @@ export default function NonIntegratedDetailClient({
       return;
     }
 
-    if (isReadOnly) {
+    if (isReadOnly || isStockProductRecord || isImportedSkuContentLocked(item)) {
       return;
     }
 
@@ -16366,7 +16425,7 @@ export default function NonIntegratedDetailClient({
   }
 
   function handleAddSku(targetBatchNo = skuBatchCount) {
-    if (isReadOnly) return;
+    if (isSkuContentReadOnly) return;
     if (activeSkuBatch === "all") {
       setSaveMessage("全部只是查看所有 SKU，请先点击最新批次后再新增 SKU。");
       setSaveMessageType("error");
@@ -16458,14 +16517,14 @@ export default function NonIntegratedDetailClient({
   );
   const canDeleteActiveSkuBatch =
     isCurrentUserAdmin &&
-    !isReadOnly &&
+    !isSkuContentReadOnly &&
     !pendingSkuBatchDraft &&
     activeSkuBatch !== "all" &&
     activeSkuBatch > 1 &&
     activeSkuBatch === skuBatchCount;
 
   function handleAddSkuBatch() {
-    if (isReadOnly) return;
+    if (isSkuContentReadOnly) return;
     const latestBatchHasSku = skuItems.some(
       (item) => (item.batchNo || 1) === skuBatchCount,
     );
@@ -16542,7 +16601,7 @@ export default function NonIntegratedDetailClient({
   }
 
   function handleDeleteSkuBatch() {
-    if (!isCurrentUserAdmin || isReadOnly) return;
+    if (!isCurrentUserAdmin || isSkuContentReadOnly) return;
 
     if (activeSkuBatch === "all") {
       setSaveMessage("请先切到要删除的具体批次。");
@@ -16643,6 +16702,7 @@ export default function NonIntegratedDetailClient({
     if (isReadOnly) return;
     const targetItem = skuItems.find((item) => item.id === id);
     if (!targetItem) return;
+    if (isStockProductRecord || isImportedSkuContentLocked(targetItem)) return;
 
     const nextItems = skuItems.filter((item) =>
       targetItem.packageGroupId
@@ -23553,7 +23613,7 @@ function renderFactoryQualityWorkspace() {
                             >
                               {isExportingSku ? "导出中..." : "下载资料"}
                             </button>
-                            {isReadOnly ? null : (
+                            {isSkuContentReadOnly ? null : (
                               <>
                                 <button
                                   type="button"
@@ -23784,7 +23844,7 @@ function renderFactoryQualityWorkspace() {
                           ) : activeSkuTab === "skuInfo" ? (
                             <div className="space-y-3">
                               <div className="flex items-center gap-2 overflow-x-auto border-b border-apple-separator pb-3">
-                                {isReadOnly ? null : (
+                                {isSkuContentReadOnly ? null : (
                                   <Button
                                     size="small"
                                     className={SKU_PRIMARY_ACTION_BUTTON_CLASS}
@@ -23829,7 +23889,7 @@ function renderFactoryQualityWorkspace() {
                                   全部
                                 </button>
                                 <div className="ml-auto flex shrink-0 items-center gap-2">
-                                  {isReadOnly ? null : (
+                                  {isSkuContentReadOnly ? null : (
                                     <button
                                       type="button"
                                       onClick={handleAddSkuBatch}
@@ -23838,7 +23898,7 @@ function renderFactoryQualityWorkspace() {
                                       新增批次
                                     </button>
                                   )}
-                                  {isCurrentUserAdmin && !isReadOnly ? (
+                                  {isCurrentUserAdmin && !isSkuContentReadOnly ? (
                                     <button
                                       type="button"
                                       data-testid="non-integrated-delete-sku-batch"
@@ -24047,7 +24107,7 @@ function renderFactoryQualityWorkspace() {
                                           "销售状态",
                                           "创建批次",
                                           "钉钉流程号",
-                                          ...(isReadOnly ? [] : ["操作"]),
+                                          ...(isSkuContentReadOnly ? [] : ["操作"]),
                                         ].map((label) => (
                                           <th
                                             key={label}
@@ -24062,7 +24122,7 @@ function renderFactoryQualityWorkspace() {
                                       {displayedSkuItems.length === 0 ? (
                                         <tr>
                                           <td
-                                            colSpan={isReadOnly ? 21 : 22}
+                                            colSpan={isSkuContentReadOnly ? 21 : 22}
                                             className="px-3 py-6 text-center text-xs text-apple-label-secondary"
                                           >
                                             这个批次还没有 SKU。请在最新批次下点击“新增SKU”录入本批内容。
@@ -24103,6 +24163,9 @@ function renderFactoryQualityWorkspace() {
                                           hideLegacySeriesComponentFields
                                             ? ""
                                             : derivedItem.drawingId;
+                                        const skuRowReadOnly =
+                                          isSkuContentReadOnly ||
+                                          isImportedSkuContentLocked(item);
 
                                         return (
                                           <tr
@@ -24148,12 +24211,12 @@ function renderFactoryQualityWorkspace() {
                                                     alt={`${item.model || "SKU"} 图片`}
                                                     className="h-full w-full object-cover"
                                                   />
-                                                ) : isReadOnly ? (
+                                                ) : skuRowReadOnly ? (
                                                   "暂无图片"
                                                 ) : (
                                                   "点击上传"
                                                 )}
-                                                {isReadOnly ? null : (
+                                                {skuRowReadOnly ? null : (
                                                   <input
                                                     id={`sku-image-input-${item.id}`}
                                                     type="file"
@@ -24173,7 +24236,7 @@ function renderFactoryQualityWorkspace() {
                                               <SkuRowField
                                                 value={item.model}
                                                 placeholder="请填写"
-                                                readOnly={isReadOnly}
+                                                readOnly={skuRowReadOnly}
                                                 columnWidth={skuColumnWidths.model}
                                                 onColumnResize={(width) =>
                                                   handleSkuColumnResize(
@@ -24209,7 +24272,7 @@ function renderFactoryQualityWorkspace() {
                                               <SkuBarcodeField
                                                 value={derivedItem.barcode}
                                                 placeholder="自动带出，可修改"
-                                                readOnly={isReadOnly}
+                                                readOnly={skuRowReadOnly}
                                                 scanLabel={
                                                   item.model || `SKU ${index + 1}`
                                                 }
@@ -24248,7 +24311,7 @@ function renderFactoryQualityWorkspace() {
                                               <SkuRowField
                                                 value={item.setCount}
                                                 placeholder="1"
-                                                readOnly={isReadOnly}
+                                                readOnly={skuRowReadOnly}
                                                 columnWidth={skuColumnWidths.setCount}
                                                 onColumnResize={(width) =>
                                                   handleSkuColumnResize(
@@ -24287,7 +24350,7 @@ function renderFactoryQualityWorkspace() {
                                               <SkuRowField
                                                 value={item.size}
                                                 placeholder="请填写"
-                                                readOnly={isReadOnly}
+                                                readOnly={skuRowReadOnly}
                                                 columnWidth={skuColumnWidths.size}
                                                 onColumnResize={(width) =>
                                                   handleSkuColumnResize(
@@ -24308,7 +24371,7 @@ function renderFactoryQualityWorkspace() {
                                               <SkuRowField
                                                 value={item.color}
                                                 placeholder="请填写"
-                                                readOnly={isReadOnly}
+                                                readOnly={skuRowReadOnly}
                                                 columnWidth={skuColumnWidths.color}
                                                 onColumnResize={(width) =>
                                                   handleSkuColumnResize(
@@ -24329,7 +24392,7 @@ function renderFactoryQualityWorkspace() {
                                               <SkuMaterialField
                                                 value={item.material}
                                                 placeholder="请填写"
-                                                readOnly={isReadOnly}
+                                                readOnly={skuRowReadOnly}
                                                 columnWidth={skuColumnWidths.material}
                                                 onChange={(value) =>
                                                   updateSkuItem(
@@ -24356,7 +24419,7 @@ function renderFactoryQualityWorkspace() {
                                               <SkuRowField
                                                 value={derivedItem.versionNo}
                                                 placeholder="V01"
-                                                readOnly={isReadOnly}
+                                                readOnly={skuRowReadOnly}
                                                 columnWidth={skuColumnWidths.versionNo}
                                                 onColumnResize={(width) =>
                                                   handleSkuColumnResize(
@@ -24386,7 +24449,7 @@ function renderFactoryQualityWorkspace() {
                                               <SkuRowField
                                                 value={displayAttributeCode}
                                                 placeholder="请填写"
-                                                readOnly={isReadOnly}
+                                                readOnly={skuRowReadOnly}
                                                 columnWidth={skuColumnWidths.attributeCode}
                                                 onColumnResize={(width) =>
                                                   handleSkuColumnResize(
@@ -24407,7 +24470,7 @@ function renderFactoryQualityWorkspace() {
                                               <SkuRowField
                                                 value={displayDrawingId}
                                                 placeholder="自动带出，可修改"
-                                                readOnly={isReadOnly}
+                                                readOnly={skuRowReadOnly}
                                                 mode="singleLineResizable"
                                                 columnWidth={skuColumnWidths.drawingId}
                                                 onColumnResize={(width) =>
@@ -24447,7 +24510,7 @@ function renderFactoryQualityWorkspace() {
                                                     `SKU ${index + 1}`
                                                   } 安装方式`}
                                                   value={editableInstallMethod}
-                                                  disabled={isReadOnly}
+                                                  disabled={skuRowReadOnly}
                                                   onChange={(event) =>
                                                     updateSkuItem(
                                                       item.id,
@@ -24476,7 +24539,7 @@ function renderFactoryQualityWorkspace() {
                                             <td className="px-2 py-2">
                                               <SkuExecutionStandardField
                                                 value={item.executeStandard}
-                                                readOnly={isReadOnly}
+                                                readOnly={skuRowReadOnly}
                                                 columnWidth={
                                                   skuColumnWidths.executeStandard
                                                 }
@@ -24504,7 +24567,7 @@ function renderFactoryQualityWorkspace() {
                                                 value={
                                                   item.nationalStandardCompliant
                                                 }
-                                                readOnly={isReadOnly}
+                                                readOnly={skuRowReadOnly}
                                                 columnWidth={
                                                   skuColumnWidths.nationalStandardCompliant
                                                 }
@@ -24526,7 +24589,7 @@ function renderFactoryQualityWorkspace() {
                                             <td className="px-2 py-2">
                                               <SkuSupplierNameField
                                                 value={item.manufacturer}
-                                                readOnly={isReadOnly}
+                                                readOnly={skuRowReadOnly}
                                                 columnWidth={
                                                   skuColumnWidths.supplierName
                                                 }
@@ -24586,7 +24649,7 @@ function renderFactoryQualityWorkspace() {
                                                     `SKU ${index + 1}`
                                                   } 销售状态`}
                                                   value={item.salesStatus ?? ""}
-                                                  disabled={isReadOnly}
+                                                  disabled={skuRowReadOnly}
                                                   onChange={(event) =>
                                                     updateSkuItem(
                                                       item.id,
@@ -24654,7 +24717,7 @@ function renderFactoryQualityWorkspace() {
                                                 onChange={() => {}}
                                               />
                                             </td>
-                                            {isReadOnly ? null : (
+                                            {skuRowReadOnly ? null : (
                                               <td className="px-3 py-2">
                                                 <Button
                                                   variant="plain"
diff --git a/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedApi.ts b/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedApi.ts
index 15a85ca7..70f179cb 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedApi.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedApi.ts
@@ -41,6 +41,12 @@ export type NonIntegratedProductListParams = {
   planningOwner?: string
   spaceDesigner?: string
   purchaseOwner?: string
+  stockSku?: string
+  stockCategory?: string
+  stockItemType?: string
+  stockSalesStatus?: string
+  stockEnabledStatus?: string
+  stockDataScope?: string
 }
 
 type UploadSharedNonIntegratedFileResponse = {
diff --git a/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts b/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts
index 6b73e499..eb289416 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts
@@ -312,6 +312,10 @@ export type NonIntegratedSkuItem = {
   model3dNodeOffsets?: Record<string, [number, number, number]>;
   model3dNodeRotations?: Record<string, [number, number, number, number]>;
   componentDetails?: NonIntegratedSkuComponentDetail[];
+  source?: string;
+  sourceTable?: string;
+  sourceSkuId?: string;
+  contentLocked?: boolean;
 };
 
 export type NonIntegratedSkuComponentDetail = {
@@ -1147,6 +1151,10 @@ function normalizeSkuItem(
     componentDetails: normalizeNonIntegratedSkuComponentDetails(
       item.componentDetails,
     ),
+    source: normalizeString(item.source),
+    sourceTable: normalizeString(item.sourceTable),
+    sourceSkuId: normalizeString(item.sourceSkuId),
+    contentLocked: item.contentLocked === true,
   };
 }
 
diff --git a/furniture-3d-system/src/server/services/intake-non-integrated-product.service.ts b/furniture-3d-system/src/server/services/intake-non-integrated-product.service.ts
index 61d2a774..1d779488 100644
--- a/furniture-3d-system/src/server/services/intake-non-integrated-product.service.ts
+++ b/furniture-3d-system/src/server/services/intake-non-integrated-product.service.ts
@@ -103,6 +103,12 @@ export type IntakeNonIntegratedProductListParams = {
   planningOwner?: string
   spaceDesigner?: string
   purchaseOwner?: string
+  stockSku?: string
+  stockCategory?: string
+  stockItemType?: string
+  stockSalesStatus?: string
+  stockEnabledStatus?: string
+  stockDataScope?: string
 }
 
 const DEFAULT_LIST_PAGE_SIZE = 50
@@ -520,6 +526,25 @@ function jsonTextContains(
   }
 }
 
+function jsonTextMissingOrNotEquals(
+  path: string[],
+  value: string,
+): Prisma.IntakeNonIntegratedProductWhereInput {
+  return {
+    OR: [
+      {
+        NOT: jsonTextEquals(path, value),
+      },
+      {
+        payload: {
+          path,
+          equals: Prisma.AnyNull,
+        },
+      },
+    ],
+  }
+}
+
 function buildTextContainsAny(
   value: string,
   conditions: Prisma.IntakeNonIntegratedProductWhereInput[],
@@ -532,18 +557,22 @@ function buildTextContainsAny(
   }
 }
 
+const JST_SKU_SOURCE_PATHS = [
+  ['source'],
+  ['sourceTable'],
+  ['importSource'],
+  ['externalSource'],
+  ['metadata', 'source'],
+  ['metadata', 'sourceTable'],
+  ['metadata', 'importSource'],
+  ['metadata', 'externalSource'],
+] as const
+
 function buildStockProductWhere(): Prisma.IntakeNonIntegratedProductWhereInput {
   return {
     OR: [
       { id: { startsWith: 'jst-stock-' } },
-      jsonTextEquals(['source'], 'jst_sku'),
-      jsonTextEquals(['sourceTable'], 'jst_sku'),
-      jsonTextEquals(['importSource'], 'jst_sku'),
-      jsonTextEquals(['externalSource'], 'jst_sku'),
-      jsonTextEquals(['metadata', 'source'], 'jst_sku'),
-      jsonTextEquals(['metadata', 'sourceTable'], 'jst_sku'),
-      jsonTextEquals(['metadata', 'importSource'], 'jst_sku'),
-      jsonTextEquals(['metadata', 'externalSource'], 'jst_sku'),
+      ...JST_SKU_SOURCE_PATHS.map((path) => jsonTextEquals([...path], 'jst_sku')),
     ],
   }
 }
@@ -557,7 +586,17 @@ function buildDevelopmentKindWhere(
 
   if (productDevelopmentKind === 'product') {
     return {
-      NOT: jsonTextEquals(['productDevelopmentKind'], 'series'),
+      OR: [
+        {
+          NOT: jsonTextEquals(['productDevelopmentKind'], 'series'),
+        },
+        {
+          payload: {
+            path: ['productDevelopmentKind'],
+            equals: Prisma.AnyNull,
+          },
+        },
+      ],
     }
   }
 
@@ -575,7 +614,18 @@ function buildProductKindWhere(
 
   if (productKind === 'new') {
     return {
-      NOT: stockWhere,
+      AND: [
+        {
+          id: {
+            not: {
+              startsWith: 'jst-stock-',
+            },
+          },
+        },
+        ...JST_SKU_SOURCE_PATHS.map((path) =>
+          jsonTextMissingOrNotEquals([...path], 'jst_sku'),
+        ),
+      ],
     }
   }
 
@@ -595,10 +645,101 @@ function buildSpuSearchWhere(spu: string): Prisma.IntakeNonIntegratedProductWher
       { spuBase: { contains: baseKeyword || normalizedKeyword, mode: 'insensitive' } },
       jsonTextContains(['openingReference', 'productName'], keyword),
       jsonTextContains(['openingReference', 'temporaryCode'], keyword),
+      jsonTextContains(['metadata', 'sourceSpu'], keyword),
+      jsonTextContains(['metadata', 'sourceSkuId'], keyword),
     ],
   }
 }
 
+function buildStockTextSearchWhere(
+  value: string | undefined,
+  paths: string[][],
+): Prisma.IntakeNonIntegratedProductWhereInput | null {
+  const keyword = trimListFilter(value)
+  if (!keyword) return null
+
+  return {
+    OR: paths.map((path) => jsonTextContains(path, keyword)),
+  }
+}
+
+function buildStockExactWhere(
+  value: string | undefined,
+  path: string[],
+): Prisma.IntakeNonIntegratedProductWhereInput | null {
+  const keyword = trimListFilter(value)
+  if (!keyword || keyword === 'all') return null
+
+  if (keyword === '__empty') {
+    return {
+      payload: {
+        path,
+        equals: Prisma.AnyNull,
+      },
+    }
+  }
+
+  return jsonTextEquals(path, keyword)
+}
+
+function buildStockDataScopeWhere(
+  value: string | undefined,
+): Prisma.IntakeNonIntegratedProductWhereInput | null {
+  const scope = trimListFilter(value)
+  if (!scope || scope === 'all') return null
+
+  const normalSpuWhere: Prisma.IntakeNonIntegratedProductWhereInput = {
+    AND: [
+      jsonTextEquals(['metadata', 'sourceItemType'], '成品'),
+      {
+        NOT: {
+          payload: {
+            path: ['metadata', 'sourceCategory'],
+            equals: Prisma.AnyNull,
+          },
+        },
+      },
+      {
+        NOT: jsonTextContains(['metadata', 'sourceCategory'], '其他 -'),
+      },
+    ],
+  }
+
+  if (scope === 'normalSpu') {
+    return normalSpuWhere
+  }
+
+  if (scope === 'normalOnSale') {
+    return {
+      AND: [
+        normalSpuWhere,
+        jsonTextEquals(['metadata', 'sourceSalesStatus'], '销售'),
+        jsonTextEquals(['metadata', 'sourceEnabled'], '1'),
+      ],
+    }
+  }
+
+  return null
+}
+
+function buildStockSourceSearchWhere(
+  params: IntakeNonIntegratedProductListParams,
+): Prisma.IntakeNonIntegratedProductWhereInput[] {
+  return [
+    buildStockTextSearchWhere(params.stockSku, [
+      ['metadata', 'sourceSkuId'],
+      ['skuItems', '0', 'barcode'],
+    ]),
+    buildStockTextSearchWhere(params.stockCategory, [
+      ['metadata', 'sourceCategory'],
+    ]),
+    buildStockExactWhere(params.stockItemType, ['metadata', 'sourceItemType']),
+    buildStockExactWhere(params.stockSalesStatus, ['metadata', 'sourceSalesStatus']),
+    buildStockExactWhere(params.stockEnabledStatus, ['metadata', 'sourceEnabled']),
+    buildStockDataScopeWhere(params.stockDataScope),
+  ].filter((filter): filter is Prisma.IntakeNonIntegratedProductWhereInput => filter !== null)
+}
+
 function buildPeopleSearchWhere(
   params: IntakeNonIntegratedProductListParams,
 ): Prisma.IntakeNonIntegratedProductWhereInput[] {
@@ -689,6 +830,7 @@ function buildListFilterWhere(
     buildProductKindWhere(params.productKind),
     buildSpuSearchWhere(params.spu ?? ''),
     buildQuickScopeWhere(params.quickScope, user),
+    ...buildStockSourceSearchWhere(params),
     ...buildPeopleSearchWhere(params),
   ].filter((filter): filter is Prisma.IntakeNonIntegratedProductWhereInput => filter !== null)
 
diff --git a/furniture-3d-system/src/server/services/jst-sku-stock-sync.service.ts b/furniture-3d-system/src/server/services/jst-sku-stock-sync.service.ts
new file mode 100644
index 00000000..e29e8f62
--- /dev/null
+++ b/furniture-3d-system/src/server/services/jst-sku-stock-sync.service.ts
@@ -0,0 +1,744 @@
+import { createHash } from 'node:crypto'
+import { Prisma } from '@prisma/client'
+import mysql, { type RowDataPacket } from 'mysql2/promise'
+import { prisma } from '@/lib/prisma'
+import {
+  createDefaultDocumentWorkspaceConfirmations,
+  normalizeNonIntegratedProductRecord,
+  stripNonIntegratedBrandPrefix,
+  type NonIntegratedProductRecord,
+  type NonIntegratedSkuItem,
+} from '@/app/intake/non-integrated/nonIntegratedStorage'
+
+type JstSkuSourceField =
+  | 'sku_id'
+  | 'i_id'
+  | 'name'
+  | 'properties_value'
+  | 'category'
+  | 'item_type'
+  | 'enabled'
+  | 'stock_disabled'
+  | 'other_5'
+  | 'other_7'
+  | 'other_8'
+  | 'other_9'
+  | 'other_10'
+  | 'pic'
+  | 'pic_big'
+
+type JstSkuSourceRow = Partial<Record<JstSkuSourceField, unknown>>
+
+type JstSkuStockSyncOptions = {
+  apply?: boolean
+  batchSize?: number
+  limit?: number
+}
+
+type JstSkuStockSyncCounters = {
+  scanned: number
+  created: number
+  updated: number
+  unchanged: number
+  skipped: number
+  conflicts: number
+}
+
+export type JstSkuStockSyncResult = JstSkuStockSyncCounters & {
+  apply: boolean
+  batchSize: number
+  limit: number | null
+  startedAt: string
+  finishedAt: string
+  errors: string[]
+}
+
+const JST_SKU_TABLE = 'jst_sku'
+const DEFAULT_BATCH_SIZE = 500
+const MAX_BATCH_SIZE = 2000
+const BASIC_BRAND = '\u57fa\u672c\u76d8'
+const STOCK_PRODUCT_LABEL = '\u5b58\u91cf\u5546\u54c1'
+const DEFAULT_SYNC_USER_ID = 'jst_sku_sync'
+const REQUIRED_SOURCE_COLUMNS = ['sku_id'] as const
+const OPTIONAL_SOURCE_COLUMNS = [
+  'i_id',
+  'name',
+  'properties_value',
+  'category',
+  'item_type',
+  'enabled',
+  'stock_disabled',
+  'other_5',
+  'other_7',
+  'other_8',
+  'other_9',
+  'other_10',
+  'pic',
+  'pic_big',
+] as const
+
+function readEnv(name: string) {
+  return process.env[name]?.trim() ?? ''
+}
+
+function readRequiredEnv(name: string) {
+  const value = readEnv(name)
+  if (!value) {
+    throw new Error(`Missing required environment variable: ${name}`)
+  }
+  return value
+}
+
+function readPositiveInteger(value: number | undefined, fallback: number, max: number) {
+  if (!Number.isFinite(value) || !value || value <= 0) return fallback
+  return Math.min(max, Math.max(1, Math.floor(value)))
+}
+
+function normalizeSourceString(value: unknown) {
+  if (value === null || value === undefined) return ''
+  return String(value).trim()
+}
+
+function normalizeSkuId(value: unknown) {
+  return normalizeSourceString(value)
+}
+
+function buildStableId(prefix: string, value: string) {
+  return `${prefix}-${createHash('sha1').update(value).digest('hex').slice(0, 20)}`
+}
+
+function pickSourceImage(row: JstSkuSourceRow) {
+  return normalizeSourceString(row.pic_big) || normalizeSourceString(row.pic)
+}
+
+function pickImageName(skuId: string, imageUrl: string) {
+  if (!imageUrl) return ''
+
+  try {
+    const pathname = new URL(imageUrl).pathname
+    const fileName = pathname.split('/').filter(Boolean).pop()
+    return fileName || `${skuId}.jpg`
+  } catch {
+    const fileName = imageUrl.split(/[\\/]/).filter(Boolean).pop()
+    return fileName || `${skuId}.jpg`
+  }
+}
+
+function extractSizeFromName(name: string) {
+  const normalizedName = name.replace(/\s+/g, ' ').trim()
+  const match = normalizedName.match(
+    /\d+(?:\.\d+)?(?:-\d+(?:\.\d+)?)?(?:\s*[/*xX]\s*\d+(?:\.\d+)?){1,3}/,
+  )
+
+  return match?.[0]?.replace(/\s+/g, '') ?? ''
+}
+
+function normalizeSetCount(value: unknown) {
+  const text = normalizeSourceString(value)
+  if (!text) return '1'
+
+  const numericMatch = text.match(/\d+/)
+  if (numericMatch) return numericMatch[0]
+
+  const normalizedText = text.replace(/\s+/g, '')
+  if (normalizedText.includes('\u975e\u53cc\u5305')) return '1'
+  if (normalizedText.includes('\u53cc\u5305')) return '2'
+  if (normalizedText.includes('\u4e09\u5305')) return '3'
+  if (normalizedText.includes('\u56db\u5305')) return '4'
+  if (normalizedText.includes('\u4e94\u5305')) return '5'
+
+  return '1'
+}
+
+function toJsonValue(value: Record<string, unknown>): Prisma.InputJsonValue {
+  return value as unknown as Prisma.InputJsonValue
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+function readPayloadString(payload: unknown, key: string) {
+  if (!isRecord(payload)) return ''
+  return typeof payload[key] === 'string' ? payload[key].trim() : ''
+}
+
+function readNestedPayloadString(payload: unknown, key: string) {
+  if (!isRecord(payload)) return ''
+  const metadata = payload.metadata
+  if (!isRecord(metadata)) return ''
+  return typeof metadata[key] === 'string' ? metadata[key].trim() : ''
+}
+
+function isJstSkuPayload(payload: unknown) {
+  return [
+    readPayloadString(payload, 'source'),
+    readPayloadString(payload, 'sourceTable'),
+    readPayloadString(payload, 'importSource'),
+    readPayloadString(payload, 'externalSource'),
+    readNestedPayloadString(payload, 'source'),
+    readNestedPayloadString(payload, 'sourceTable'),
+    readNestedPayloadString(payload, 'importSource'),
+    readNestedPayloadString(payload, 'externalSource'),
+  ].some((value) => {
+    const normalizedValue = value.toLowerCase().replace(/-/g, '_')
+    return normalizedValue === 'jst_sku' || normalizedValue === 'jstsku'
+  })
+}
+
+function mergeDefinedSourceFields<T extends Record<string, unknown>>(
+  target: T,
+  source: Partial<T>,
+  keys: Array<keyof T>,
+) {
+  const next = { ...target }
+
+  keys.forEach((key) => {
+    const value = source[key]
+    if (typeof value === 'string') {
+      next[key] = value as T[keyof T]
+    }
+  })
+
+  return next
+}
+
+function buildSourceSkuItem(row: JstSkuSourceRow): NonIntegratedSkuItem {
+  const skuId = normalizeSkuId(row.sku_id)
+  const name = normalizeSourceString(row.name)
+  const image = pickSourceImage(row)
+  const color = normalizeSourceString(row.properties_value)
+  const material = normalizeSourceString(row.other_10)
+  const size = extractSizeFromName(name)
+
+  return {
+    id: buildStableId('jst-stock-sku', skuId),
+    skuSequence: 1,
+    batchNo: 1,
+    packageGroupId: '',
+    packageSuffix: '',
+    image,
+    imageName: pickImageName(skuId, image),
+    model: '',
+    skuCode: normalizeSourceString(row.other_7),
+    setCount: normalizeSetCount(row.other_8),
+    specName: name,
+    barcode: skuId,
+    size,
+    color,
+    material,
+    versionNo: 'V01',
+    attributeCode: '',
+    drawingId: normalizeSourceString(row.other_9),
+    installMethod: '',
+    executeStandard: '',
+    nationalStandardCompliant: '',
+    manufacturer: '',
+    manufacturerCode: '',
+    salesStatus: normalizeSourceString(row.other_5),
+    tagMaterial: '',
+    model3dFileName: '',
+    model3dDataUrl: '',
+    componentDetails: [],
+    source: 'jst_sku',
+    sourceTable: JST_SKU_TABLE,
+    sourceSkuId: skuId,
+  } as NonIntegratedSkuItem
+}
+
+function buildSourceProductPayload(
+  row: JstSkuSourceRow,
+  syncedAt: string,
+): (NonIntegratedProductRecord & Record<string, unknown>) | null {
+  const skuId = normalizeSkuId(row.sku_id)
+  const sourceSpu = normalizeSourceString(row.i_id)
+  const spu = skuId.toUpperCase()
+  const name = normalizeSourceString(row.name) || skuId
+  const image = pickSourceImage(row)
+  const imageName = pickImageName(skuId, image)
+  const color = normalizeSourceString(row.properties_value)
+  const material = normalizeSourceString(row.other_10)
+  const size = extractSizeFromName(name)
+  const skuItem = buildSourceSkuItem(row)
+
+  const rawPayload = {
+    id: buildStableId('jst-stock', skuId),
+    productDevelopmentKind: 'product',
+    spu,
+    projectStatus: 'approved',
+    projectReview: {
+      reviewDate: '',
+      reviewers: '',
+      designerReviewer: '',
+      purchaserReviewer: '',
+      planningReviewer: '',
+      operatorReviewer: '',
+      conclusion: '',
+      revisionNotes: '',
+      decidedAt: '',
+    },
+    openingReference: {
+      productImage: image,
+      productImageName: imageName,
+      productName: name,
+      temporaryCode: skuId,
+      brand: BASIC_BRAND,
+      adaptableBrands: [BASIC_BRAND],
+      productCategory: '',
+      salesCategory: '',
+      designer: '',
+      planningOwner: '',
+      structureDesigner: '',
+      currentStage: STOCK_PRODUCT_LABEL,
+      year: '',
+      competitorLink: '',
+      targetPriceBand: '',
+      size,
+      material,
+      urgent: '',
+      reason: '',
+    },
+    brand: BASIC_BRAND,
+    adaptableBrands: [BASIC_BRAND],
+    designer: '',
+    operator: '',
+    purchaser: '',
+    previewImage: image,
+    previewImageName: imageName,
+    year: '',
+    demandFlowNo: '',
+    processTemplate: STOCK_PRODUCT_LABEL,
+    productCategory: '',
+    salesCategory: '',
+    productPlanning: '',
+    demandDepartment: '',
+    isSelfDevelopedPatentProduct: '',
+    patentOwner: '',
+    spuOwner: '',
+    needsClearanceHandling: '',
+    operationsOwner: '',
+    profitCenter: '',
+    salesChannel: '',
+    salesPlatform: '',
+    purchaseOwner: '',
+    goodsType: '',
+    materialType: material,
+    productionType: '',
+    manualProducer: '',
+    shippingMode: '',
+    visualDirector: '',
+    itemId: '',
+    priceBand: '',
+    outputRequirementType: '',
+    visualPlanning: '',
+    visualPlanningType: '',
+    photographer: '',
+    graphicDesigner: '',
+    designer3d: '',
+    sampleRequired: '',
+    flatOutputPath: '',
+    output3dPath: '',
+    productCode: skuId,
+    size,
+    color,
+    material,
+    installMethod: '',
+    installSteps: '',
+    tagMaterial: '',
+    packageDetail: '',
+    craftDetail: '',
+    styleDetails: [],
+    bomDetails: [],
+    reviewSheet: {
+      version: '',
+      factory: '',
+      reviewDate: '',
+      reviewMethod: '',
+      productName: name,
+      productImage: image,
+      productImageName: imageName,
+      size,
+      material,
+      color,
+      issues: [],
+    },
+    reviewSheets: [],
+    qualityInspectionSheet: {
+      rows: [],
+    },
+    skuItems: [skuItem],
+    skuBatchCount: 1,
+    skuBatchFlowNos: {},
+    skuBatchChangeTypes: {},
+    factoryRows: [],
+    pricingRows: [],
+    planningLayoutRows: [],
+    productLimitRows: [],
+    sampleMeasurementRows: [],
+    firstQualityRows: [],
+    uploadFiles: [],
+    documentWorkspaceConfirmations: createDefaultDocumentWorkspaceConfirmations(true),
+    documentWorkspaceApprovedAt: {},
+    formalSpuAssigned: true,
+    createdAt: syncedAt,
+    updatedAt: syncedAt,
+    source: 'jst_sku',
+    sourceTable: JST_SKU_TABLE,
+    importSource: 'jst_sku',
+    externalSource: 'jst_sku',
+    metadata: {
+      source: 'jst_sku',
+      sourceTable: JST_SKU_TABLE,
+      sourceSpu,
+      sourceSkuId: skuId,
+      sourceCategory: normalizeSourceString(row.category),
+      sourceItemType: normalizeSourceString(row.item_type),
+      sourceSalesStatus: normalizeSourceString(row.other_5),
+      sourceEnabled: normalizeSourceString(row.enabled),
+      sourceStockDisabled: normalizeSourceString(row.stock_disabled),
+      sourceFields: {
+        sku_id: skuId,
+        i_id: sourceSpu,
+        name,
+        category: normalizeSourceString(row.category),
+        item_type: normalizeSourceString(row.item_type),
+        enabled: normalizeSourceString(row.enabled),
+        stock_disabled: normalizeSourceString(row.stock_disabled),
+        properties_value: color,
+        other_5: normalizeSourceString(row.other_5),
+        other_7: normalizeSourceString(row.other_7),
+        other_8: normalizeSourceString(row.other_8),
+        other_9: normalizeSourceString(row.other_9),
+        other_10: material,
+        pic: normalizeSourceString(row.pic),
+        pic_big: normalizeSourceString(row.pic_big),
+      },
+    },
+  } as unknown as Partial<NonIntegratedProductRecord> & Record<string, unknown>
+  const normalizedProduct = normalizeNonIntegratedProductRecord(rawPayload)
+
+  return normalizedProduct
+    ? ({ ...rawPayload, ...normalizedProduct } as NonIntegratedProductRecord &
+        Record<string, unknown>)
+    : null
+}
+
+function mergeExistingProductPayload(
+  existingPayload: unknown,
+  sourcePayload: NonIntegratedProductRecord & Record<string, unknown>,
+) {
+  const existingProduct =
+    normalizeNonIntegratedProductRecord(
+      (isRecord(existingPayload) ? existingPayload : {}) as Partial<NonIntegratedProductRecord>,
+    ) ?? sourcePayload
+  const existingRecord = isRecord(existingPayload) ? existingPayload : {}
+  const sourceSku = sourcePayload.skuItems[0]
+  const existingSku =
+    existingProduct.skuItems.find((item) => item.id === sourceSku.id) ??
+    existingProduct.skuItems[0]
+  const nextSku = existingSku
+    ? mergeDefinedSourceFields(existingSku, sourceSku, [
+        'image',
+        'imageName',
+        'model',
+        'skuCode',
+        'setCount',
+        'specName',
+        'barcode',
+        'size',
+        'color',
+        'material',
+        'drawingId',
+        'salesStatus',
+      ])
+    : sourceSku
+  const remainingSkus = existingProduct.skuItems.filter((item) => item.id !== nextSku.id)
+  const sourceOpeningReference = sourcePayload.openingReference
+  const nextOpeningReference = {
+    ...existingProduct.openingReference,
+    productName: sourceOpeningReference.productName,
+    temporaryCode: sourceOpeningReference.temporaryCode,
+    brand: sourceOpeningReference.brand,
+    adaptableBrands: sourceOpeningReference.adaptableBrands,
+    currentStage: sourceOpeningReference.currentStage,
+    size: sourceOpeningReference.size,
+    material: sourceOpeningReference.material,
+    ...(sourceOpeningReference.productImage
+      ? {
+          productImage: sourceOpeningReference.productImage,
+          productImageName: sourceOpeningReference.productImageName,
+        }
+      : {}),
+  }
+  const nextMetadata = {
+    ...(isRecord(existingRecord.metadata) ? existingRecord.metadata : {}),
+    ...(isRecord(sourcePayload.metadata) ? sourcePayload.metadata : {}),
+  }
+  const nextPayload = {
+    ...existingRecord,
+    ...existingProduct,
+    source: 'jst_sku',
+    sourceTable: JST_SKU_TABLE,
+    importSource: 'jst_sku',
+    externalSource: 'jst_sku',
+    metadata: nextMetadata,
+    productDevelopmentKind: 'product',
+    spu: sourcePayload.spu,
+    brand: sourcePayload.brand,
+    adaptableBrands: sourcePayload.adaptableBrands,
+    processTemplate: STOCK_PRODUCT_LABEL,
+    productCode: sourcePayload.productCode,
+    size: sourcePayload.size,
+    color: sourcePayload.color,
+    material: sourcePayload.material,
+    materialType: sourcePayload.materialType,
+    openingReference: nextOpeningReference,
+    previewImage: sourcePayload.previewImage || existingProduct.previewImage,
+    previewImageName: sourcePayload.previewImage
+      ? sourcePayload.previewImageName
+      : existingProduct.previewImageName,
+    skuItems: [nextSku, ...remainingSkus],
+    skuBatchCount: existingProduct.skuBatchCount ?? 1,
+    documentWorkspaceConfirmations: existingProduct.documentWorkspaceConfirmations,
+    documentWorkspaceApprovedAt: existingProduct.documentWorkspaceApprovedAt,
+    createdAt: existingProduct.createdAt,
+    updatedAt: existingProduct.updatedAt,
+  }
+
+  const normalizedProduct = normalizeNonIntegratedProductRecord(
+    nextPayload as Partial<NonIntegratedProductRecord>,
+  )
+
+  return normalizedProduct
+    ? ({ ...nextPayload, ...normalizedProduct } as NonIntegratedProductRecord &
+        Record<string, unknown>)
+    : sourcePayload
+}
+
+function payloadHash(value: unknown) {
+  return createHash('sha1').update(JSON.stringify(value)).digest('hex')
+}
+
+function createMysqlConnectionConfig() {
+  const databaseUrl = readEnv('JST_SKU_DATABASE_URL')
+  if (databaseUrl) {
+    return databaseUrl
+  }
+
+  return {
+    host: readRequiredEnv('JST_SKU_DB_HOST'),
+    port: Number(readEnv('JST_SKU_DB_PORT') || '3306'),
+    database: readRequiredEnv('JST_SKU_DB_NAME'),
+    user: readRequiredEnv('JST_SKU_DB_USER'),
+    password: readRequiredEnv('JST_SKU_DB_PASSWORD'),
+    charset: readEnv('JST_SKU_DB_CHARSET') || 'utf8mb4',
+    ssl: readEnv('JST_SKU_DB_SSL') === 'true' ? {} : undefined,
+    supportBigNumbers: true,
+    dateStrings: true,
+  }
+}
+
+async function loadJstSkuColumns(connection: mysql.Connection) {
+  const [rows] = await connection.query<RowDataPacket[]>(`SHOW COLUMNS FROM \`${JST_SKU_TABLE}\``)
+  return new Set(rows.map((row) => normalizeSourceString(row.Field)))
+}
+
+function buildSourceSelectColumns(columns: Set<string>) {
+  REQUIRED_SOURCE_COLUMNS.forEach((column) => {
+    if (!columns.has(column)) {
+      throw new Error(`Source table ${JST_SKU_TABLE} is missing required column: ${column}`)
+    }
+  })
+
+  return [
+    ...REQUIRED_SOURCE_COLUMNS,
+    ...OPTIONAL_SOURCE_COLUMNS.filter((column) => columns.has(column)),
+  ]
+}
+
+async function fetchSourceBatch(params: {
+  connection: mysql.Connection
+  selectColumns: readonly string[]
+  offset: number
+  take: number
+}) {
+  const selectSql = params.selectColumns.map((column) => `\`${column}\``).join(', ')
+  const [rows] = await params.connection.execute<RowDataPacket[]>(
+    `SELECT ${selectSql} FROM \`${JST_SKU_TABLE}\` WHERE \`sku_id\` IS NOT NULL AND TRIM(CAST(\`sku_id\` AS CHAR)) <> '' ORDER BY \`sku_id\` LIMIT ? OFFSET ?`,
+    [params.take, params.offset],
+  )
+
+  return rows as JstSkuSourceRow[]
+}
+
+async function findExistingStockProduct(id: string, spu: string, sourceSkuId: string) {
+  const existingById = await prisma.intakeNonIntegratedProduct.findUnique({
+    where: { id },
+  })
+  if (existingById) return existingById
+
+  return prisma.intakeNonIntegratedProduct.findFirst({
+    where: {
+      OR: [
+        { spu },
+        {
+          payload: {
+            path: ['metadata', 'sourceSkuId'],
+            equals: sourceSkuId,
+          },
+        },
+        {
+          payload: {
+            path: ['skuItems', '0', 'barcode'],
+            equals: sourceSkuId,
+          },
+        },
+      ],
+    },
+    orderBy: {
+      updatedAt: 'desc',
+    },
+  })
+}
+
+async function syncOneSourceRow(row: JstSkuSourceRow, apply: boolean, syncedAt: string) {
+  const sourcePayload = buildSourceProductPayload(row, syncedAt)
+  if (!sourcePayload) {
+    return 'skipped' as const
+  }
+
+  const sourceSkuId = normalizeSkuId(row.sku_id)
+  const existing = await findExistingStockProduct(sourcePayload.id, sourcePayload.spu, sourceSkuId)
+
+  if (existing && existing.id !== sourcePayload.id && !isJstSkuPayload(existing.payload)) {
+    return 'conflicts' as const
+  }
+
+  if (!existing) {
+    if (apply) {
+      await prisma.intakeNonIntegratedProduct.create({
+        data: {
+          id: sourcePayload.id,
+          spu: sourcePayload.spu,
+          spuBase: stripNonIntegratedBrandPrefix(sourcePayload.spu),
+          brand: sourcePayload.brand,
+          designer: sourcePayload.designer,
+          operator: sourcePayload.operator,
+          purchaser: sourcePayload.purchaser,
+          payload: toJsonValue(sourcePayload),
+          visibility: 'PUBLIC',
+          createdBy: readEnv('JST_SKU_SYNC_USER_ID') || DEFAULT_SYNC_USER_ID,
+          updatedBy: readEnv('JST_SKU_SYNC_USER_ID') || DEFAULT_SYNC_USER_ID,
+          createdAt: new Date(syncedAt),
+        },
+      })
+    }
+    return 'created' as const
+  }
+
+  const nextPayload = mergeExistingProductPayload(existing.payload, sourcePayload)
+  const currentPayloadHash = payloadHash(existing.payload)
+  const nextPayloadHash = payloadHash(nextPayload)
+  if (
+    currentPayloadHash === nextPayloadHash &&
+    existing.spu === sourcePayload.spu &&
+    existing.deletedAt === null
+  ) {
+    return 'unchanged' as const
+  }
+
+  if (apply) {
+    await prisma.intakeNonIntegratedProduct.update({
+      where: { id: existing.id },
+      data: {
+        spu: sourcePayload.spu,
+        spuBase: stripNonIntegratedBrandPrefix(sourcePayload.spu),
+        brand: nextPayload.brand,
+        designer: nextPayload.designer,
+        operator: nextPayload.operator,
+        purchaser: nextPayload.purchaser,
+        payload: toJsonValue(nextPayload),
+        visibility: 'PUBLIC',
+        updatedBy: readEnv('JST_SKU_SYNC_USER_ID') || DEFAULT_SYNC_USER_ID,
+        deletedAt: null,
+      },
+    })
+  }
+
+  return 'updated' as const
+}
+
+export async function syncJstSkuStockProducts(
+  options: JstSkuStockSyncOptions = {},
+): Promise<JstSkuStockSyncResult> {
+  const startedAt = new Date().toISOString()
+  const apply = options.apply === true
+  const batchSize = readPositiveInteger(options.batchSize, DEFAULT_BATCH_SIZE, MAX_BATCH_SIZE)
+  const limit =
+    typeof options.limit === 'number' && Number.isFinite(options.limit) && options.limit > 0
+      ? Math.floor(options.limit)
+      : null
+  const counters: JstSkuStockSyncCounters = {
+    scanned: 0,
+    created: 0,
+    updated: 0,
+    unchanged: 0,
+    skipped: 0,
+    conflicts: 0,
+  }
+  const errors: string[] = []
+  const mysqlConfig = createMysqlConnectionConfig()
+  const connection =
+    typeof mysqlConfig === 'string'
+      ? await mysql.createConnection(mysqlConfig)
+      : await mysql.createConnection(mysqlConfig)
+
+  try {
+    const columns = await loadJstSkuColumns(connection)
+    const selectColumns = buildSourceSelectColumns(columns)
+    let offset = 0
+
+    while (limit === null || counters.scanned < limit) {
+      const remaining = limit === null ? batchSize : Math.min(batchSize, limit - counters.scanned)
+      if (remaining <= 0) break
+
+      const rows = await fetchSourceBatch({
+        connection,
+        selectColumns,
+        offset,
+        take: remaining,
+      })
+      if (rows.length === 0) break
+
+      for (const row of rows) {
+        counters.scanned += 1
+        try {
+          const result = await syncOneSourceRow(row, apply, new Date().toISOString())
+          counters[result] += 1
+        } catch (error) {
+          counters.skipped += 1
+          errors.push(
+            `${normalizeSkuId(row.sku_id) || '<empty sku_id>'}: ${
+              error instanceof Error ? error.message : String(error)
+            }`,
+          )
+        }
+      }
+
+      offset += rows.length
+      if (rows.length < remaining) break
+    }
+  } finally {
+    await connection.end()
+  }
+
+  return {
+    ...counters,
+    apply,
+    batchSize,
+    limit,
+    startedAt,
+    finishedAt: new Date().toISOString(),
+    errors,
+  }
+}

From 273097f8b5419857f2c8cd561bcb371cfa2fbc57 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Tue, 19 May 2026 12:08:11 +0800
Subject: [PATCH 14/21] fix: sync stock spu filters and imported sku codes

---
 .../NonIntegratedDetailClient.tsx             |  62 +++-
 .../services/jst-sku-stock-sync.service.ts    | 309 +++++++++++++-----
 2 files changed, 271 insertions(+), 100 deletions(-)

diff --git a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
index e114b710..88624904 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
@@ -4664,13 +4664,21 @@ function deriveSkuItem(
   const autoSpecName = buildAutoSpecName(item);
   const versionNo = normalizeSkuVersionNo(item.versionNo);
   const normalizedItem = { ...item, versionNo };
-  const autoDrawingId = buildAutoDrawingId(normalizedItem);
+  const importedContentLocked = isImportedSkuContentLocked(item);
+  const resolvedSkuCode =
+    importedContentLocked && item.skuCode.trim()
+      ? item.skuCode.trim().toUpperCase()
+      : finalSkuCode;
+  const autoDrawingId = buildAutoDrawingId({
+    ...normalizedItem,
+    skuCode: resolvedSkuCode,
+  });
   const autoBarcode = buildAutoBarcode(
-    finalSkuCode,
+    resolvedSkuCode,
     item.manufacturerCode,
     versionNo,
   );
-  const importedLockedBarcode = isImportedSkuContentLocked(item)
+  const importedLockedBarcode = importedContentLocked
     ? item.barcode.trim().toUpperCase()
     : "";
 
@@ -4680,22 +4688,28 @@ function deriveSkuItem(
       Number.isFinite(item.batchNo) && item.batchNo > 0
         ? Math.floor(item.batchNo)
         : 1,
-    skuCode: finalSkuCode,
-    specName: autoSpecName,
+    skuCode: resolvedSkuCode,
+    specName:
+      importedContentLocked && item.specName.trim()
+        ? item.specName.trim()
+        : autoSpecName,
     barcode:
       importedLockedBarcode ||
       (shouldKeepCustomBarcode(
         item.barcode,
-        finalSkuCode,
+        resolvedSkuCode,
         item.manufacturerCode,
         versionNo,
       )
         ? item.barcode.trim()
         : autoBarcode),
     versionNo,
-    drawingId: shouldKeepCustomDrawingId(item.drawingId, normalizedItem)
-      ? item.drawingId.trim()
-      : autoDrawingId,
+    drawingId:
+      importedContentLocked && item.drawingId.trim()
+        ? item.drawingId.trim().toUpperCase()
+        : shouldKeepCustomDrawingId(item.drawingId, normalizedItem)
+          ? item.drawingId.trim()
+          : autoDrawingId,
     installMethod: item.installMethod.trim(),
     executeStandard: item.executeStandard.trim(),
     nationalStandardCompliant: normalizeNationalStandardCompliance(
@@ -4816,13 +4830,22 @@ function createProductFactoryRowFromSku(
 ): NonIntegratedFactoryRow {
   const confirmed = existingRow?.confirmed ?? false;
   const savedSupplierName = existingRow?.supplierName?.trim() ?? "";
-  const supplierSource = confirmed
-    ? sku.manufacturer || savedSupplierName
-    : savedSupplierName || sku.manufacturer;
+  const importedContentLocked = isImportedSkuContentLocked(sku);
+  const supplierSource =
+    importedContentLocked && !confirmed
+      ? sku.manufacturer || savedSupplierName
+      : confirmed
+        ? sku.manufacturer || savedSupplierName
+        : savedSupplierName || sku.manufacturer;
   const supplier = normalizeFactorySupplier(supplierSource);
   const supplierCode =
-    confirmed
-      ? sku.manufacturerCode.trim().toUpperCase() || supplier.code
+    importedContentLocked && !confirmed
+      ? supplier.code ||
+        sku.manufacturerCode.trim().toUpperCase() ||
+        existingRow?.supplierCode?.trim().toUpperCase() ||
+        ""
+      : confirmed
+        ? sku.manufacturerCode.trim().toUpperCase() || supplier.code
       : existingRow?.supplierCode?.trim().toUpperCase() ||
         supplier.code ||
         sku.manufacturerCode.trim().toUpperCase();
@@ -13495,7 +13518,9 @@ export default function NonIntegratedDetailClient({
 
       setSkuItems((current) =>
         current.map((item, index) =>
-          item.id === skuId
+          item.id === skuId &&
+          !isStockProductRecord &&
+          !isImportedSkuContentLocked(item)
             ? applySkuSupplierName(item, index, supplierName)
             : item,
         ),
@@ -13515,12 +13540,17 @@ export default function NonIntegratedDetailClient({
           const supplier = normalizeFactorySupplier(value);
           const supplierName = supplier.name || value;
           const supplierCode = supplier.code;
+          const importedContentLocked =
+            derivedSkuItem !== undefined &&
+            isImportedSkuContentLocked(derivedSkuItem);
 
           return {
             ...row,
             supplierName,
             supplierCode,
-            barcode: buildAutoBarcode(row.skuCode, supplierCode, versionNo),
+            barcode: importedContentLocked
+              ? row.barcode.trim() || derivedSkuItem?.barcode.trim() || ""
+              : buildAutoBarcode(row.skuCode, supplierCode, versionNo),
           };
         }
 
diff --git a/furniture-3d-system/src/server/services/jst-sku-stock-sync.service.ts b/furniture-3d-system/src/server/services/jst-sku-stock-sync.service.ts
index e29e8f62..f5ae1433 100644
--- a/furniture-3d-system/src/server/services/jst-sku-stock-sync.service.ts
+++ b/furniture-3d-system/src/server/services/jst-sku-stock-sync.service.ts
@@ -29,6 +29,11 @@ type JstSkuSourceField =
 
 type JstSkuSourceRow = Partial<Record<JstSkuSourceField, unknown>>
 
+type JstSkuSourceGroup = {
+  sourceSpu: string
+  rows: JstSkuSourceRow[]
+}
+
 type JstSkuStockSyncOptions = {
   apply?: boolean
   batchSize?: number
@@ -203,7 +208,7 @@ function mergeDefinedSourceFields<T extends Record<string, unknown>>(
   return next
 }
 
-function buildSourceSkuItem(row: JstSkuSourceRow): NonIntegratedSkuItem {
+function buildSourceSkuItem(row: JstSkuSourceRow, sequence: number): NonIntegratedSkuItem {
   const skuId = normalizeSkuId(row.sku_id)
   const name = normalizeSourceString(row.name)
   const image = pickSourceImage(row)
@@ -213,7 +218,7 @@ function buildSourceSkuItem(row: JstSkuSourceRow): NonIntegratedSkuItem {
 
   return {
     id: buildStableId('jst-stock-sku', skuId),
-    skuSequence: 1,
+    skuSequence: sequence,
     batchNo: 1,
     packageGroupId: '',
     packageSuffix: '',
@@ -246,25 +251,90 @@ function buildSourceSkuItem(row: JstSkuSourceRow): NonIntegratedSkuItem {
   } as NonIntegratedSkuItem
 }
 
+function readSourceSpuKey(row: JstSkuSourceRow) {
+  return normalizeSourceString(row.i_id) || normalizeSkuId(row.sku_id)
+}
+
+function firstSourceValue(rows: JstSkuSourceRow[], key: JstSkuSourceField) {
+  for (const row of rows) {
+    const value = normalizeSourceString(row[key])
+    if (value) return value
+  }
+
+  return ''
+}
+
+function preferredSourceValue(
+  rows: JstSkuSourceRow[],
+  key: JstSkuSourceField,
+  preferredValue?: string,
+) {
+  if (preferredValue) {
+    const matched = rows.some((row) => normalizeSourceString(row[key]) === preferredValue)
+    if (matched) return preferredValue
+  }
+
+  return firstSourceValue(rows, key)
+}
+
+function buildSourceSkuItems(rows: JstSkuSourceRow[]) {
+  const seenSkuIds = new Set<string>()
+
+  return rows
+    .map((row) => {
+      const skuId = normalizeSkuId(row.sku_id)
+      if (!skuId || seenSkuIds.has(skuId)) return null
+      seenSkuIds.add(skuId)
+      return row
+    })
+    .filter((row): row is JstSkuSourceRow => row !== null)
+    .map((row, index) => buildSourceSkuItem(row, index + 1))
+}
+
 function buildSourceProductPayload(
-  row: JstSkuSourceRow,
+  group: JstSkuSourceGroup,
   syncedAt: string,
 ): (NonIntegratedProductRecord & Record<string, unknown>) | null {
-  const skuId = normalizeSkuId(row.sku_id)
-  const sourceSpu = normalizeSourceString(row.i_id)
-  const spu = skuId.toUpperCase()
-  const name = normalizeSourceString(row.name) || skuId
-  const image = pickSourceImage(row)
-  const imageName = pickImageName(skuId, image)
-  const color = normalizeSourceString(row.properties_value)
-  const material = normalizeSourceString(row.other_10)
+  const sourceSpu = group.sourceSpu.trim()
+  if (!sourceSpu) return null
+
+  const skuItems = buildSourceSkuItems(group.rows)
+  if (skuItems.length === 0) return null
+
+  const representativeRow =
+    group.rows.find((row) => normalizeSourceString(row.item_type) === '成品') ??
+    group.rows[0] ??
+    {}
+  const firstSku = skuItems[0]
+  const name = normalizeSourceString(representativeRow.name) || firstSku?.specName || sourceSpu
+  const image =
+    pickSourceImage(representativeRow) ||
+    skuItems.find((item) => item.image.trim())?.image.trim() ||
+    ''
+  const imageName = pickImageName(firstSku?.barcode || sourceSpu, image)
+  const color = normalizeSourceString(representativeRow.properties_value) || firstSku?.color || ''
+  const material = normalizeSourceString(representativeRow.other_10) || firstSku?.material || ''
   const size = extractSizeFromName(name)
-  const skuItem = buildSourceSkuItem(row)
+  const sourceCategory = firstSourceValue(group.rows, 'category')
+  const sourceItemType = preferredSourceValue(group.rows, 'item_type', '成品')
+  const hasOnSaleSku = group.rows.some(
+    (row) =>
+      normalizeSourceString(row.item_type) === '成品' &&
+      normalizeSourceString(row.other_5) === '销售' &&
+      normalizeSourceString(row.enabled) === '1',
+  )
+  const sourceSalesStatus = hasOnSaleSku
+    ? '销售'
+    : firstSourceValue(group.rows, 'other_5')
+  const sourceEnabled = group.rows.some((row) => normalizeSourceString(row.enabled) === '1')
+    ? '1'
+    : firstSourceValue(group.rows, 'enabled')
+  const firstSourceRow = group.rows[0] ?? {}
 
   const rawPayload = {
-    id: buildStableId('jst-stock', skuId),
+    id: buildStableId('jst-stock', sourceSpu),
     productDevelopmentKind: 'product',
-    spu,
+    spu: sourceSpu.toUpperCase(),
     projectStatus: 'approved',
     projectReview: {
       reviewDate: '',
@@ -281,7 +351,7 @@ function buildSourceProductPayload(
       productImage: image,
       productImageName: imageName,
       productName: name,
-      temporaryCode: skuId,
+      temporaryCode: sourceSpu,
       brand: BASIC_BRAND,
       adaptableBrands: [BASIC_BRAND],
       productCategory: '',
@@ -338,7 +408,6 @@ function buildSourceProductPayload(
     sampleRequired: '',
     flatOutputPath: '',
     output3dPath: '',
-    productCode: skuId,
     size,
     color,
     material,
@@ -366,8 +435,9 @@ function buildSourceProductPayload(
     qualityInspectionSheet: {
       rows: [],
     },
-    skuItems: [skuItem],
-    skuBatchCount: 1,
+    productCode: sourceSpu,
+    skuItems,
+    skuBatchCount: Math.max(1, ...skuItems.map((item) => item.batchNo || 1)),
     skuBatchFlowNos: {},
     skuBatchChangeTypes: {},
     factoryRows: [],
@@ -390,28 +460,30 @@ function buildSourceProductPayload(
       source: 'jst_sku',
       sourceTable: JST_SKU_TABLE,
       sourceSpu,
-      sourceSkuId: skuId,
-      sourceCategory: normalizeSourceString(row.category),
-      sourceItemType: normalizeSourceString(row.item_type),
-      sourceSalesStatus: normalizeSourceString(row.other_5),
-      sourceEnabled: normalizeSourceString(row.enabled),
-      sourceStockDisabled: normalizeSourceString(row.stock_disabled),
+      sourceSkuId: firstSku?.barcode ?? '',
+      sourceCategory,
+      sourceItemType,
+      sourceSalesStatus,
+      sourceEnabled,
+      sourceStockDisabled: firstSourceValue(group.rows, 'stock_disabled'),
+      skuCount: skuItems.length,
+      hasOnSaleSku,
       sourceFields: {
-        sku_id: skuId,
+        sku_id: firstSku?.barcode ?? '',
         i_id: sourceSpu,
         name,
-        category: normalizeSourceString(row.category),
-        item_type: normalizeSourceString(row.item_type),
-        enabled: normalizeSourceString(row.enabled),
-        stock_disabled: normalizeSourceString(row.stock_disabled),
+        category: sourceCategory,
+        item_type: sourceItemType,
+        enabled: sourceEnabled,
+        stock_disabled: firstSourceValue(group.rows, 'stock_disabled'),
         properties_value: color,
-        other_5: normalizeSourceString(row.other_5),
-        other_7: normalizeSourceString(row.other_7),
-        other_8: normalizeSourceString(row.other_8),
-        other_9: normalizeSourceString(row.other_9),
+        other_5: sourceSalesStatus,
+        other_7: normalizeSourceString(firstSourceRow.other_7),
+        other_8: normalizeSourceString(firstSourceRow.other_8),
+        other_9: normalizeSourceString(firstSourceRow.other_9),
         other_10: material,
-        pic: normalizeSourceString(row.pic),
-        pic_big: normalizeSourceString(row.pic_big),
+        pic: normalizeSourceString(firstSourceRow.pic),
+        pic_big: normalizeSourceString(firstSourceRow.pic_big),
       },
     },
   } as unknown as Partial<NonIntegratedProductRecord> & Record<string, unknown>
@@ -432,27 +504,48 @@ function mergeExistingProductPayload(
       (isRecord(existingPayload) ? existingPayload : {}) as Partial<NonIntegratedProductRecord>,
     ) ?? sourcePayload
   const existingRecord = isRecord(existingPayload) ? existingPayload : {}
-  const sourceSku = sourcePayload.skuItems[0]
-  const existingSku =
-    existingProduct.skuItems.find((item) => item.id === sourceSku.id) ??
-    existingProduct.skuItems[0]
-  const nextSku = existingSku
-    ? mergeDefinedSourceFields(existingSku, sourceSku, [
-        'image',
-        'imageName',
-        'model',
-        'skuCode',
-        'setCount',
-        'specName',
-        'barcode',
-        'size',
-        'color',
-        'material',
-        'drawingId',
-        'salesStatus',
-      ])
-    : sourceSku
-  const remainingSkus = existingProduct.skuItems.filter((item) => item.id !== nextSku.id)
+  const matchedExistingSkuIds = new Set<string>()
+  const nextSourceSkus = sourcePayload.skuItems.map((sourceSku) => {
+    const existingSku = existingProduct.skuItems.find((item) => {
+      const matched =
+        item.id === sourceSku.id ||
+        item.sourceSkuId === sourceSku.sourceSkuId ||
+        (sourceSku.barcode.trim() && item.barcode.trim() === sourceSku.barcode.trim())
+      if (matched) matchedExistingSkuIds.add(item.id)
+      return matched
+    })
+
+    if (!existingSku) return sourceSku
+
+    const mergedSku = mergeDefinedSourceFields(existingSku, sourceSku, [
+      'image',
+      'imageName',
+      'model',
+      'skuCode',
+      'setCount',
+      'specName',
+      'barcode',
+      'size',
+      'color',
+      'material',
+      'drawingId',
+      'salesStatus',
+      'source',
+      'sourceTable',
+      'sourceSkuId',
+    ])
+
+    return {
+      ...mergedSku,
+      skuSequence: sourceSku.skuSequence,
+      source: 'jst_sku',
+      sourceTable: JST_SKU_TABLE,
+      sourceSkuId: sourceSku.sourceSkuId,
+    }
+  })
+  const remainingSkus = existingProduct.skuItems.filter(
+    (item) => !matchedExistingSkuIds.has(item.id),
+  )
   const sourceOpeningReference = sourcePayload.openingReference
   const nextOpeningReference = {
     ...existingProduct.openingReference,
@@ -497,8 +590,11 @@ function mergeExistingProductPayload(
     previewImageName: sourcePayload.previewImage
       ? sourcePayload.previewImageName
       : existingProduct.previewImageName,
-    skuItems: [nextSku, ...remainingSkus],
-    skuBatchCount: existingProduct.skuBatchCount ?? 1,
+    skuItems: [...nextSourceSkus, ...remainingSkus],
+    skuBatchCount: Math.max(
+      existingProduct.skuBatchCount ?? 1,
+      sourcePayload.skuBatchCount ?? 1,
+    ),
     documentWorkspaceConfirmations: existingProduct.documentWorkspaceConfirmations,
     documentWorkspaceApprovedAt: existingProduct.documentWorkspaceApprovedAt,
     createdAt: existingProduct.createdAt,
@@ -556,22 +652,65 @@ function buildSourceSelectColumns(columns: Set<string>) {
   ]
 }
 
-async function fetchSourceBatch(params: {
+async function fetchSourceSpuKeys(params: {
   connection: mysql.Connection
-  selectColumns: readonly string[]
   offset: number
   take: number
 }) {
-  const selectSql = params.selectColumns.map((column) => `\`${column}\``).join(', ')
   const [rows] = await params.connection.execute<RowDataPacket[]>(
-    `SELECT ${selectSql} FROM \`${JST_SKU_TABLE}\` WHERE \`sku_id\` IS NOT NULL AND TRIM(CAST(\`sku_id\` AS CHAR)) <> '' ORDER BY \`sku_id\` LIMIT ? OFFSET ?`,
+    `SELECT DISTINCT COALESCE(NULLIF(TRIM(CAST(\`i_id\` AS CHAR)), ''), TRIM(CAST(\`sku_id\` AS CHAR))) AS source_spu
+       FROM \`${JST_SKU_TABLE}\`
+      WHERE \`sku_id\` IS NOT NULL
+        AND TRIM(CAST(\`sku_id\` AS CHAR)) <> ''
+        AND COALESCE(NULLIF(TRIM(CAST(\`i_id\` AS CHAR)), ''), TRIM(CAST(\`sku_id\` AS CHAR))) <> ''
+      ORDER BY source_spu
+      LIMIT ? OFFSET ?`,
     [params.take, params.offset],
   )
 
-  return rows as JstSkuSourceRow[]
+  return rows
+    .map((row) => normalizeSourceString(row.source_spu))
+    .filter(Boolean)
 }
 
-async function findExistingStockProduct(id: string, spu: string, sourceSkuId: string) {
+async function fetchSourceGroups(params: {
+  connection: mysql.Connection
+  selectColumns: readonly string[]
+  sourceSpuKeys: string[]
+}) {
+  if (params.sourceSpuKeys.length === 0) return []
+
+  const selectSql = params.selectColumns.map((column) => `\`${column}\``).join(', ')
+  const placeholders = params.sourceSpuKeys.map(() => '?').join(', ')
+  const [rows] = await params.connection.execute<RowDataPacket[]>(
+    `SELECT ${selectSql},
+            COALESCE(NULLIF(TRIM(CAST(\`i_id\` AS CHAR)), ''), TRIM(CAST(\`sku_id\` AS CHAR))) AS __source_spu
+       FROM \`${JST_SKU_TABLE}\`
+      WHERE \`sku_id\` IS NOT NULL
+        AND TRIM(CAST(\`sku_id\` AS CHAR)) <> ''
+        AND COALESCE(NULLIF(TRIM(CAST(\`i_id\` AS CHAR)), ''), TRIM(CAST(\`sku_id\` AS CHAR))) IN (${placeholders})
+      ORDER BY __source_spu, \`sku_id\``,
+    params.sourceSpuKeys,
+  )
+
+  const rowsBySourceSpu = new Map<string, JstSkuSourceRow[]>()
+  ;(rows as Array<JstSkuSourceRow & { __source_spu?: unknown }>).forEach((row) => {
+    const sourceSpu = normalizeSourceString(row.__source_spu) || readSourceSpuKey(row)
+    if (!sourceSpu) return
+    const nextRow = { ...row }
+    delete nextRow.__source_spu
+    rowsBySourceSpu.set(sourceSpu, [...(rowsBySourceSpu.get(sourceSpu) ?? []), nextRow])
+  })
+
+  return params.sourceSpuKeys
+    .map((sourceSpu) => ({
+      sourceSpu,
+      rows: rowsBySourceSpu.get(sourceSpu) ?? [],
+    }))
+    .filter((group) => group.rows.length > 0)
+}
+
+async function findExistingStockProduct(id: string, spu: string, sourceSpu: string) {
   const existingById = await prisma.intakeNonIntegratedProduct.findUnique({
     where: { id },
   })
@@ -583,14 +722,8 @@ async function findExistingStockProduct(id: string, spu: string, sourceSkuId: st
         { spu },
         {
           payload: {
-            path: ['metadata', 'sourceSkuId'],
-            equals: sourceSkuId,
-          },
-        },
-        {
-          payload: {
-            path: ['skuItems', '0', 'barcode'],
-            equals: sourceSkuId,
+            path: ['metadata', 'sourceSpu'],
+            equals: sourceSpu,
           },
         },
       ],
@@ -601,14 +734,17 @@ async function findExistingStockProduct(id: string, spu: string, sourceSkuId: st
   })
 }
 
-async function syncOneSourceRow(row: JstSkuSourceRow, apply: boolean, syncedAt: string) {
-  const sourcePayload = buildSourceProductPayload(row, syncedAt)
+async function syncOneSourceGroup(group: JstSkuSourceGroup, apply: boolean, syncedAt: string) {
+  const sourcePayload = buildSourceProductPayload(group, syncedAt)
   if (!sourcePayload) {
     return 'skipped' as const
   }
 
-  const sourceSkuId = normalizeSkuId(row.sku_id)
-  const existing = await findExistingStockProduct(sourcePayload.id, sourcePayload.spu, sourceSkuId)
+  const existing = await findExistingStockProduct(
+    sourcePayload.id,
+    sourcePayload.spu,
+    group.sourceSpu,
+  )
 
   if (existing && existing.id !== sourcePayload.id && !isJstSkuPayload(existing.payload)) {
     return 'conflicts' as const
@@ -702,31 +838,36 @@ export async function syncJstSkuStockProducts(
       const remaining = limit === null ? batchSize : Math.min(batchSize, limit - counters.scanned)
       if (remaining <= 0) break
 
-      const rows = await fetchSourceBatch({
+      const sourceSpuKeys = await fetchSourceSpuKeys({
         connection,
-        selectColumns,
         offset,
         take: remaining,
       })
-      if (rows.length === 0) break
+      if (sourceSpuKeys.length === 0) break
 
-      for (const row of rows) {
+      const groups = await fetchSourceGroups({
+        connection,
+        selectColumns,
+        sourceSpuKeys,
+      })
+
+      for (const group of groups) {
         counters.scanned += 1
         try {
-          const result = await syncOneSourceRow(row, apply, new Date().toISOString())
+          const result = await syncOneSourceGroup(group, apply, new Date().toISOString())
           counters[result] += 1
         } catch (error) {
           counters.skipped += 1
           errors.push(
-            `${normalizeSkuId(row.sku_id) || '<empty sku_id>'}: ${
+            `${group.sourceSpu || '<empty source_spu>'}: ${
               error instanceof Error ? error.message : String(error)
             }`,
           )
         }
       }
 
-      offset += rows.length
-      if (rows.length < remaining) break
+      offset += sourceSpuKeys.length
+      if (sourceSpuKeys.length < remaining) break
     }
   } finally {
     await connection.end()

From e9a6deb3a187d1822ab859f4a7160c3ead93a3cb Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Tue, 19 May 2026 12:15:02 +0800
Subject: [PATCH 15/21] fix: align jst sku sync with stock spus

---
 .../server/services/jst-sku-stock-sync.service.ts  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/furniture-3d-system/src/server/services/jst-sku-stock-sync.service.ts b/furniture-3d-system/src/server/services/jst-sku-stock-sync.service.ts
index f5ae1433..e8337414 100644
--- a/furniture-3d-system/src/server/services/jst-sku-stock-sync.service.ts
+++ b/furniture-3d-system/src/server/services/jst-sku-stock-sync.service.ts
@@ -112,6 +112,10 @@ function buildStableId(prefix: string, value: string) {
   return `${prefix}-${createHash('sha1').update(value).digest('hex').slice(0, 20)}`
 }
 
+function buildStockProductId(sourceSpu: string) {
+  return `jst-stock-${createHash('sha1').update(sourceSpu).digest('hex').slice(0, 16)}`
+}
+
 function pickSourceImage(row: JstSkuSourceRow) {
   return normalizeSourceString(row.pic_big) || normalizeSourceString(row.pic)
 }
@@ -179,15 +183,21 @@ function isJstSkuPayload(payload: unknown) {
   return [
     readPayloadString(payload, 'source'),
     readPayloadString(payload, 'sourceTable'),
+    readPayloadString(payload, 'sourceType'),
     readPayloadString(payload, 'importSource'),
     readPayloadString(payload, 'externalSource'),
     readNestedPayloadString(payload, 'source'),
     readNestedPayloadString(payload, 'sourceTable'),
+    readNestedPayloadString(payload, 'sourceType'),
     readNestedPayloadString(payload, 'importSource'),
     readNestedPayloadString(payload, 'externalSource'),
   ].some((value) => {
     const normalizedValue = value.toLowerCase().replace(/-/g, '_')
-    return normalizedValue === 'jst_sku' || normalizedValue === 'jstsku'
+    return (
+      normalizedValue === 'jst_sku' ||
+      normalizedValue === 'jstsku' ||
+      normalizedValue === 'jst_sku_stock_source'
+    )
   })
 }
 
@@ -332,7 +342,7 @@ function buildSourceProductPayload(
   const firstSourceRow = group.rows[0] ?? {}
 
   const rawPayload = {
-    id: buildStableId('jst-stock', sourceSpu),
+    id: buildStockProductId(sourceSpu),
     productDevelopmentKind: 'product',
     spu: sourceSpu.toUpperCase(),
     projectStatus: 'approved',

From aa31e4e23083cf61d996514cd87ed251049b2a9c Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Tue, 19 May 2026 13:09:55 +0800
Subject: [PATCH 16/21] fix: exclude accessory stock sku imports

---
 .../services/jst-sku-stock-sync.service.ts    | 95 ++++++++++++++++---
 1 file changed, 80 insertions(+), 15 deletions(-)

diff --git a/furniture-3d-system/src/server/services/jst-sku-stock-sync.service.ts b/furniture-3d-system/src/server/services/jst-sku-stock-sync.service.ts
index e8337414..39bf6161 100644
--- a/furniture-3d-system/src/server/services/jst-sku-stock-sync.service.ts
+++ b/furniture-3d-system/src/server/services/jst-sku-stock-sync.service.ts
@@ -61,6 +61,9 @@ export type JstSkuStockSyncResult = JstSkuStockSyncCounters & {
 const JST_SKU_TABLE = 'jst_sku'
 const DEFAULT_BATCH_SIZE = 500
 const MAX_BATCH_SIZE = 2000
+const FINISHED_ITEM_TYPE = '成品'
+const ON_SALE_STATUS = '销售'
+const EXCLUDED_STOCK_CATEGORY = '其他 - 配件'
 const BASIC_BRAND = '\u57fa\u672c\u76d8'
 const STOCK_PRODUCT_LABEL = '\u5b58\u91cf\u5546\u54c1'
 const DEFAULT_SYNC_USER_ID = 'jst_sku_sync'
@@ -201,6 +204,17 @@ function isJstSkuPayload(payload: unknown) {
   })
 }
 
+function isJstSkuSkuItem(item: NonIntegratedSkuItem) {
+  return (
+    item.id.trim().startsWith('jst-stock-sku-') ||
+    normalizeSourceString(item.sourceSkuId).length > 0 ||
+    [item.source, item.sourceTable].some((value) => {
+      const normalizedValue = normalizeSourceString(value).toLowerCase().replace(/-/g, '_')
+      return normalizedValue === 'jst_sku' || normalizedValue === 'jstsku'
+    })
+  )
+}
+
 function mergeDefinedSourceFields<T extends Record<string, unknown>>(
   target: T,
   source: Partial<T>,
@@ -287,6 +301,28 @@ function preferredSourceValue(
   return firstSourceValue(rows, key)
 }
 
+function isFinishedSourceSkuRow(row: JstSkuSourceRow) {
+  return normalizeSourceString(row.item_type) === FINISHED_ITEM_TYPE
+}
+
+function pickSkuContentRows(rows: JstSkuSourceRow[]) {
+  const finishedRows = rows.filter(isFinishedSourceSkuRow)
+  return finishedRows.length > 0 ? finishedRows : rows
+}
+
+function pickRepresentativeSourceRow(rows: JstSkuSourceRow[]) {
+  return rows.find(isFinishedSourceSkuRow) ?? rows[0] ?? {}
+}
+
+function pickSourceCategory(rows: JstSkuSourceRow[]) {
+  const representativeRow = pickRepresentativeSourceRow(rows)
+  return normalizeSourceString(representativeRow.category) || firstSourceValue(rows, 'category')
+}
+
+function shouldExcludeStockCategory(category: string) {
+  return category.trim() === EXCLUDED_STOCK_CATEGORY
+}
+
 function buildSourceSkuItems(rows: JstSkuSourceRow[]) {
   const seenSkuIds = new Set<string>()
 
@@ -308,13 +344,11 @@ function buildSourceProductPayload(
   const sourceSpu = group.sourceSpu.trim()
   if (!sourceSpu) return null
 
-  const skuItems = buildSourceSkuItems(group.rows)
+  const skuContentRows = pickSkuContentRows(group.rows)
+  const skuItems = buildSourceSkuItems(skuContentRows)
   if (skuItems.length === 0) return null
 
-  const representativeRow =
-    group.rows.find((row) => normalizeSourceString(row.item_type) === '成品') ??
-    group.rows[0] ??
-    {}
+  const representativeRow = pickRepresentativeSourceRow(group.rows)
   const firstSku = skuItems[0]
   const name = normalizeSourceString(representativeRow.name) || firstSku?.specName || sourceSpu
   const image =
@@ -325,21 +359,21 @@ function buildSourceProductPayload(
   const color = normalizeSourceString(representativeRow.properties_value) || firstSku?.color || ''
   const material = normalizeSourceString(representativeRow.other_10) || firstSku?.material || ''
   const size = extractSizeFromName(name)
-  const sourceCategory = firstSourceValue(group.rows, 'category')
-  const sourceItemType = preferredSourceValue(group.rows, 'item_type', '成品')
+  const sourceCategory = pickSourceCategory(group.rows)
+  const sourceItemType = preferredSourceValue(group.rows, 'item_type', FINISHED_ITEM_TYPE)
   const hasOnSaleSku = group.rows.some(
     (row) =>
-      normalizeSourceString(row.item_type) === '成品' &&
-      normalizeSourceString(row.other_5) === '销售' &&
+      isFinishedSourceSkuRow(row) &&
+      normalizeSourceString(row.other_5) === ON_SALE_STATUS &&
       normalizeSourceString(row.enabled) === '1',
   )
   const sourceSalesStatus = hasOnSaleSku
-    ? '销售'
-    : firstSourceValue(group.rows, 'other_5')
-  const sourceEnabled = group.rows.some((row) => normalizeSourceString(row.enabled) === '1')
+    ? ON_SALE_STATUS
+    : normalizeSourceString(representativeRow.other_5) || firstSourceValue(group.rows, 'other_5')
+  const sourceEnabled = skuContentRows.some((row) => normalizeSourceString(row.enabled) === '1')
     ? '1'
-    : firstSourceValue(group.rows, 'enabled')
-  const firstSourceRow = group.rows[0] ?? {}
+    : firstSourceValue(skuContentRows, 'enabled')
+  const firstSourceRow = skuContentRows[0] ?? {}
 
   const rawPayload = {
     id: buildStockProductId(sourceSpu),
@@ -554,7 +588,7 @@ function mergeExistingProductPayload(
     }
   })
   const remainingSkus = existingProduct.skuItems.filter(
-    (item) => !matchedExistingSkuIds.has(item.id),
+    (item) => !matchedExistingSkuIds.has(item.id) && !isJstSkuSkuItem(item),
   )
   const sourceOpeningReference = sourcePayload.openingReference
   const nextOpeningReference = {
@@ -744,7 +778,38 @@ async function findExistingStockProduct(id: string, spu: string, sourceSpu: stri
   })
 }
 
+async function removeExcludedStockProduct(group: JstSkuSourceGroup, apply: boolean) {
+  const sourceSpu = group.sourceSpu.trim()
+  if (!sourceSpu) return 'skipped' as const
+
+  const id = buildStockProductId(sourceSpu)
+  const spu = sourceSpu.toUpperCase()
+  const existing = await findExistingStockProduct(id, spu, sourceSpu)
+
+  if (!existing) return 'skipped' as const
+  if (!isJstSkuPayload(existing.payload) && !existing.id.startsWith('jst-stock-')) {
+    return 'conflicts' as const
+  }
+  if (existing.deletedAt !== null) return 'unchanged' as const
+
+  if (apply) {
+    await prisma.intakeNonIntegratedProduct.update({
+      where: { id: existing.id },
+      data: {
+        deletedAt: new Date(),
+        updatedBy: readEnv('JST_SKU_SYNC_USER_ID') || DEFAULT_SYNC_USER_ID,
+      },
+    })
+  }
+
+  return 'updated' as const
+}
+
 async function syncOneSourceGroup(group: JstSkuSourceGroup, apply: boolean, syncedAt: string) {
+  if (shouldExcludeStockCategory(pickSourceCategory(group.rows))) {
+    return removeExcludedStockProduct(group, apply)
+  }
+
   const sourcePayload = buildSourceProductPayload(group, syncedAt)
   if (!sourcePayload) {
     return 'skipped' as const

From 81500dcc078f05bd2c1e644612b7d42f4e15f357 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Tue, 19 May 2026 14:08:04 +0800
Subject: [PATCH 17/21] fix: refine stock detail filters and planning layout

---
 .../stock-category-options/route.ts           |  16 +
 .../src/app/intake/IntakeClient.tsx           | 330 +++++++++++++++---
 .../NonIntegratedDetailClient.test.tsx        |  18 +-
 .../NonIntegratedDetailClient.tsx             |  66 ++--
 .../intake/non-integrated/nonIntegratedApi.ts |   9 +
 .../intake-non-integrated-product.service.ts  |  25 ++
 6 files changed, 392 insertions(+), 72 deletions(-)
 create mode 100644 furniture-3d-system/src/app/api/intake/non-integrated/stock-category-options/route.ts

diff --git a/furniture-3d-system/src/app/api/intake/non-integrated/stock-category-options/route.ts b/furniture-3d-system/src/app/api/intake/non-integrated/stock-category-options/route.ts
new file mode 100644
index 00000000..61ff7bd9
--- /dev/null
+++ b/furniture-3d-system/src/app/api/intake/non-integrated/stock-category-options/route.ts
@@ -0,0 +1,16 @@
+import { NextRequest } from 'next/server'
+import { handleRequest, jsonSuccess } from '@/server/core/response'
+import { intakeNonIntegratedProductService } from '@/server/services/intake-non-integrated-product.service'
+
+export async function GET(request: NextRequest) {
+  return handleRequest(
+    request,
+    async (ctx) => {
+      const categories =
+        await intakeNonIntegratedProductService.listStockCategoryOptions(ctx.user)
+
+      return jsonSuccess({ categories }, 200, ctx.requestId)
+    },
+    { requireAuth: true },
+  )
+}
diff --git a/furniture-3d-system/src/app/intake/IntakeClient.tsx b/furniture-3d-system/src/app/intake/IntakeClient.tsx
index f6917ac8..fa002e12 100644
--- a/furniture-3d-system/src/app/intake/IntakeClient.tsx
+++ b/furniture-3d-system/src/app/intake/IntakeClient.tsx
@@ -77,6 +77,7 @@ import {
   deleteSharedNonIntegratedProduct,
   getSharedNonIntegratedProductById,
   listSharedNonIntegratedProductPage,
+  listSharedNonIntegratedStockCategoryOptions,
   saveSharedNonIntegratedProduct,
   type NonIntegratedProductPageInfo,
 } from "./non-integrated/nonIntegratedApi";
@@ -615,6 +616,115 @@ type NonIntegratedListQuery = {
   stockDataScope: string;
 };
 
+type PersistedNonIntegratedListState = {
+  queryDraft?: Partial<NonIntegratedListQuery>;
+  appliedQuery?: Partial<NonIntegratedListQuery>;
+  currentPage?: number;
+  activeQuickScope?: NonIntegratedQuickScope;
+};
+
+const NON_INTEGRATED_LIST_STATE_STORAGE_PREFIX =
+  "non-integrated-list-state-v2";
+
+function createDefaultNonIntegratedListQuery(
+  productKind: NonIntegratedProductKindFilter,
+): NonIntegratedListQuery {
+  return {
+    productKind,
+    spu: "",
+    appearanceDesigner: "",
+    structureDesigner: "",
+    spuOwner: "",
+    planningOwner: "",
+    spaceDesigner: "",
+    purchaseOwner: "",
+    stockSku: "",
+    stockCategory: "",
+    stockItemType: "all",
+    stockSalesStatus: "all",
+    stockEnabledStatus: "all",
+    stockDataScope: "all",
+  };
+}
+
+function buildNonIntegratedListStateStorageKey(
+  productDevelopmentKind: ProductDevelopmentKind,
+  fixedProductKind?: NonIntegratedProductKindFilter,
+) {
+  return [
+    NON_INTEGRATED_LIST_STATE_STORAGE_PREFIX,
+    productDevelopmentKind,
+    fixedProductKind ?? "all",
+  ].join(":");
+}
+
+function normalizeNonIntegratedListQuery(
+  value: Partial<NonIntegratedListQuery> | undefined,
+  fallbackProductKind: NonIntegratedProductKindFilter,
+) {
+  const defaultQuery = createDefaultNonIntegratedListQuery(fallbackProductKind);
+  if (!value || typeof value !== "object") return defaultQuery;
+
+  return Object.fromEntries(
+    Object.entries(defaultQuery).map(([key, fallbackValue]) => {
+      const nextValue = value[key as keyof NonIntegratedListQuery];
+
+      return [
+        key,
+        typeof nextValue === "string" ? nextValue : fallbackValue,
+      ];
+    }),
+  ) as NonIntegratedListQuery;
+}
+
+function normalizePersistedQuickScope(value: unknown): NonIntegratedQuickScope {
+  return value === "created" || value === "pending" ? value : "all";
+}
+
+function normalizePersistedPage(value: unknown) {
+  const parsed = Number(value);
+  if (!Number.isFinite(parsed) || parsed <= 0) return 1;
+
+  return Math.floor(parsed);
+}
+
+function readPersistedNonIntegratedListState(
+  key: string,
+): PersistedNonIntegratedListState | null {
+  if (typeof window === "undefined") return null;
+
+  try {
+    const rawValue = window.localStorage.getItem(key);
+    if (!rawValue) return null;
+    const parsed = JSON.parse(rawValue);
+
+    return parsed && typeof parsed === "object"
+      ? (parsed as PersistedNonIntegratedListState)
+      : null;
+  } catch {
+    return null;
+  }
+}
+
+function writePersistedNonIntegratedListState(
+  key: string,
+  state: PersistedNonIntegratedListState,
+) {
+  if (typeof window === "undefined") return;
+
+  try {
+    window.localStorage.setItem(key, JSON.stringify(state));
+  } catch {
+    // Ignore storage failures; the filters still work for the current session.
+  }
+}
+
+function getUniqueSortedStrings(values: Array<string | null | undefined>) {
+  return Array.from(
+    new Set(values.map((value) => value?.trim() ?? "").filter(Boolean)),
+  ).sort((left, right) => left.localeCompare(right, "zh-Hans-CN"));
+}
+
 const BOM_LIBRARY_OPTIONS: {
   key: BomLibraryKey;
   label: string;
@@ -2612,10 +2722,23 @@ function NonIntegratedPendingDetail({
   onOpenNewNonIntegratedProductWorkspace?: () => void;
 }) {
   const router = useRouter();
+  const initialProductKind = fixedProductKind ?? "all";
+  const listStateStorageKey = buildNonIntegratedListStateStorageKey(
+    productDevelopmentKind,
+    fixedProductKind,
+  );
+  const initialPersistedListState = useMemo(
+    () => readPersistedNonIntegratedListState(listStateStorageKey),
+    [listStateStorageKey],
+  );
   const [products, setProducts] =
     useState<NonIntegratedProductRecord[]>(initialProducts);
-  const [currentPage, setCurrentPage] = useState(1);
-  const [pageJumpInput, setPageJumpInput] = useState("1");
+  const [currentPage, setCurrentPage] = useState(() =>
+    normalizePersistedPage(initialPersistedListState?.currentPage),
+  );
+  const [pageJumpInput, setPageJumpInput] = useState(() =>
+    String(normalizePersistedPage(initialPersistedListState?.currentPage)),
+  );
   const [pageInfo, setPageInfo] =
     useState<NonIntegratedProductPageInfo | null>(null);
   const [isListLoading, setIsListLoading] = useState(false);
@@ -2631,40 +2754,28 @@ function NonIntegratedPendingDetail({
   const [copyErrorMessage, setCopyErrorMessage] = useState("");
   const [isCopySubmitting, setIsCopySubmitting] = useState(false);
   const [activeQuickScope, setActiveQuickScope] =
-    useState<NonIntegratedQuickScope>("all");
-  const initialProductKind = fixedProductKind ?? "all";
-  const [queryDraft, setQueryDraft] = useState<NonIntegratedListQuery>({
-    productKind: initialProductKind,
-    spu: "",
-    appearanceDesigner: "",
-    structureDesigner: "",
-    spuOwner: "",
-    planningOwner: "",
-    spaceDesigner: "",
-    purchaseOwner: "",
-    stockSku: "",
-    stockCategory: "",
-    stockItemType: "all",
-    stockSalesStatus: "all",
-    stockEnabledStatus: "all",
-    stockDataScope: "all",
-  });
-  const [appliedQuery, setAppliedQuery] = useState<NonIntegratedListQuery>({
-    productKind: initialProductKind,
-    spu: "",
-    appearanceDesigner: "",
-    structureDesigner: "",
-    spuOwner: "",
-    planningOwner: "",
-    spaceDesigner: "",
-    purchaseOwner: "",
-    stockSku: "",
-    stockCategory: "",
-    stockItemType: "all",
-    stockSalesStatus: "all",
-    stockEnabledStatus: "all",
-    stockDataScope: "all",
-  });
+    useState<NonIntegratedQuickScope>(() =>
+      normalizePersistedQuickScope(initialPersistedListState?.activeQuickScope),
+    );
+  const [queryDraft, setQueryDraft] = useState<NonIntegratedListQuery>(() =>
+    normalizeNonIntegratedListQuery(
+      initialPersistedListState?.queryDraft,
+      initialProductKind,
+    ),
+  );
+  const [appliedQuery, setAppliedQuery] = useState<NonIntegratedListQuery>(() =>
+    normalizeNonIntegratedListQuery(
+      initialPersistedListState?.appliedQuery,
+      initialProductKind,
+    ),
+  );
+  const [sharedStockCategoryOptions, setSharedStockCategoryOptions] = useState<
+    string[]
+  >([]);
+  const [stockCategoryOptionsReady, setStockCategoryOptionsReady] =
+    useState(false);
+  const listStateStorageKeyRef = useRef(listStateStorageKey);
+  const skipNextListStatePersistRef = useRef(false);
   const shouldUseSharedNonIntegratedApi = process.env.NODE_ENV !== "test";
   const effectiveProductKind = fixedProductKind ?? appliedQuery.productKind;
   const hasCreateAction = Boolean(onOpenNewNonIntegratedProductWorkspace);
@@ -2696,8 +2807,52 @@ function NonIntegratedPendingDetail({
   }, [initialProducts, productDevelopmentKind, shouldUseSharedNonIntegratedApi]);
 
   useEffect(() => {
-    setCurrentPage(1);
-  }, [fixedProductKind, productDevelopmentKind]);
+    if (listStateStorageKeyRef.current === listStateStorageKey) return;
+
+    listStateStorageKeyRef.current = listStateStorageKey;
+    skipNextListStatePersistRef.current = true;
+
+    const persistedState =
+      readPersistedNonIntegratedListState(listStateStorageKey);
+    const nextPage = normalizePersistedPage(persistedState?.currentPage);
+    setCurrentPage(nextPage);
+    setPageJumpInput(String(nextPage));
+    setActiveQuickScope(
+      normalizePersistedQuickScope(persistedState?.activeQuickScope),
+    );
+    setQueryDraft(
+      normalizeNonIntegratedListQuery(
+        persistedState?.queryDraft,
+        initialProductKind,
+      ),
+    );
+    setAppliedQuery(
+      normalizeNonIntegratedListQuery(
+        persistedState?.appliedQuery,
+        initialProductKind,
+      ),
+    );
+  }, [initialProductKind, listStateStorageKey]);
+
+  useEffect(() => {
+    if (skipNextListStatePersistRef.current) {
+      skipNextListStatePersistRef.current = false;
+      return;
+    }
+
+    writePersistedNonIntegratedListState(listStateStorageKey, {
+      queryDraft,
+      appliedQuery,
+      currentPage,
+      activeQuickScope,
+    });
+  }, [
+    activeQuickScope,
+    appliedQuery,
+    currentPage,
+    listStateStorageKey,
+    queryDraft,
+  ]);
 
   useEffect(() => {
     if (!fixedProductKind) return;
@@ -2709,6 +2864,35 @@ function NonIntegratedPendingDetail({
     }));
   }, [fixedProductKind]);
 
+  useEffect(() => {
+    if (!shouldUseSharedNonIntegratedApi || effectiveProductKind !== "stock") {
+      setStockCategoryOptionsReady(!shouldUseSharedNonIntegratedApi);
+      return;
+    }
+
+    let cancelled = false;
+    setStockCategoryOptionsReady(false);
+
+    listSharedNonIntegratedStockCategoryOptions()
+      .then((data) => {
+        if (cancelled) return;
+        setSharedStockCategoryOptions(data.categories);
+      })
+      .catch(() => {
+        if (cancelled) return;
+        setSharedStockCategoryOptions([]);
+      })
+      .finally(() => {
+        if (!cancelled) {
+          setStockCategoryOptionsReady(true);
+        }
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [effectiveProductKind, shouldUseSharedNonIntegratedApi]);
+
   useEffect(() => {
     if (!shouldUseSharedNonIntegratedApi) return;
 
@@ -2985,6 +3169,73 @@ function NonIntegratedPendingDetail({
 
   const isSeriesDevelopmentList = productDevelopmentKind === "series";
   const isStockDevelopmentList = effectiveProductKind === "stock";
+  const localStockCategoryOptions = useMemo(
+    () =>
+      getUniqueSortedStrings(
+        products
+          .filter(isJstSkuImportedStockProduct)
+          .map((product) => readStockSourceString(product, "sourceCategory")),
+      ),
+    [products],
+  );
+  const stockCategoryOptions = shouldUseSharedNonIntegratedApi
+    ? sharedStockCategoryOptions
+    : localStockCategoryOptions;
+  const stockCategorySelectOptions = useMemo(
+    () => {
+      const categories = stockCategoryOptionsReady
+        ? stockCategoryOptions
+        : getUniqueSortedStrings([
+            ...stockCategoryOptions,
+            queryDraft.stockCategory,
+            appliedQuery.stockCategory,
+          ]);
+
+      return [
+        { value: "", label: "全部" },
+        ...categories.map((category) => ({
+          value: category,
+          label: category,
+        })),
+      ];
+    },
+    [
+      appliedQuery.stockCategory,
+      queryDraft.stockCategory,
+      stockCategoryOptions,
+      stockCategoryOptionsReady,
+    ],
+  );
+
+  useEffect(() => {
+    if (
+      !isStockDevelopmentList ||
+      !stockCategoryOptionsReady ||
+      stockCategoryOptions.length === 0
+    ) {
+      return;
+    }
+
+    const existingCategories = new Set(stockCategoryOptions);
+    if (
+      queryDraft.stockCategory &&
+      !existingCategories.has(queryDraft.stockCategory)
+    ) {
+      setQueryDraft((current) => ({ ...current, stockCategory: "" }));
+    }
+    if (
+      appliedQuery.stockCategory &&
+      !existingCategories.has(appliedQuery.stockCategory)
+    ) {
+      setAppliedQuery((current) => ({ ...current, stockCategory: "" }));
+    }
+  }, [
+    appliedQuery.stockCategory,
+    isStockDevelopmentList,
+    queryDraft.stockCategory,
+    stockCategoryOptions,
+    stockCategoryOptionsReady,
+  ]);
   const productFilterFields: Array<{
     key: keyof NonIntegratedListQuery;
     label: ReactNode;
@@ -3042,7 +3293,8 @@ function NonIntegratedPendingDetail({
       key: "stockCategory",
       label: "类目",
       ariaLabel: "类目",
-      placeholder: "搜索类目",
+      placeholder: "",
+      options: stockCategorySelectOptions,
     },
     {
       key: "stockItemType",
diff --git a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
index 2dbbe573..0b96eff9 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
@@ -3164,6 +3164,15 @@ describe("NonIntegratedDetailClient", () => {
             manufacturer: "兰考华兰家具",
             executeStandard: "GB/T3324-2024",
             nationalStandardCompliant: "是",
+            salesStatus: "销售",
+          }),
+          createSkuItem({
+            id: "sku-planning-layout-stopped",
+            model: "SZ0230K02",
+            skuCode: "SZ023002",
+            barcode: "SZ023002N1280V01",
+            specName: "停产款式 120/60/75",
+            salesStatus: "停产",
           }),
         ],
       }),
@@ -3181,6 +3190,8 @@ describe("NonIntegratedDetailClient", () => {
     const planningWorkspace = screen.getByTestId("planning-layout-workspace");
     expect(planningWorkspace).toHaveTextContent("SZ0230K01");
     expect(planningWorkspace).toHaveTextContent("SZ023001N1280V01");
+    expect(planningWorkspace).not.toHaveTextContent("SZ0230K02");
+    expect(planningWorkspace).not.toHaveTextContent("SZ023002N1280V01");
     expect(planningWorkspace).toHaveTextContent("GB/T3324-2024");
     expect(planningWorkspace).toHaveTextContent("是");
     expect(
@@ -3203,7 +3214,7 @@ describe("NonIntegratedDetailClient", () => {
     saveNonIntegratedProduct(
       createProductRecord({
         id: "DNZ0001-planning-layout-fields",
-        adaptableBrands: ["基本盘", "顾家"],
+        adaptableBrands: ["基本盘"],
         skuItems: [
           createSkuItem({
             id: "sku-planning-layout-fields-1",
@@ -3212,6 +3223,7 @@ describe("NonIntegratedDetailClient", () => {
             barcode: "SZ023001N1280V01",
             specName: "款式一 140/60/75 胡桃色",
             color: "胡桃色",
+            salesStatus: "销售",
           }),
         ],
         productLimitRows: [
@@ -3338,8 +3350,8 @@ describe("NonIntegratedDetailClient", () => {
           categories: ["书柜/架", "书桌/电脑桌"],
           model: "窄边书桌",
           priceBand: "500-600档",
-          brand: "基本盘",
-          brands: ["基本盘", "顾家"],
+          brand: "顾家",
+          brands: ["顾家"],
           shop: "天猫旗舰店",
         },
       ]);
diff --git a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
index 88624904..7c5012ad 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
@@ -2141,6 +2141,8 @@ function getProductPhotoPanelCompactTitle(group: ProductPhotoGroup) {
 }
 
 const BRAND_OPTIONS = ["基本盘", "顾家", "索菲亚", "朴美"];
+const PLANNING_LAYOUT_BRAND_OPTIONS = ["基本盘", "顾家", "索菲亚", "朴美"];
+
 const MATERIAL_TYPE_OPTIONS = [
   "软包",
   "注塑",
@@ -5189,16 +5191,19 @@ function isProductLimitRowComplete(row: NonIntegratedProductLimitRow) {
   ].every((value) => value.trim());
 }
 
+function isPlanningLayoutVisibleSkuItem(sku: NonIntegratedSkuItem) {
+  return sku.salesStatus.trim() === "销售";
+}
+
 function buildPlanningLayoutSkuRows(
   skuItems: NonIntegratedSkuItem[],
   savedRows: NonIntegratedPlanningLayoutRow[],
   productLimitRows: NonIntegratedProductLimitRow[],
-  defaultAdaptableBrand: string,
 ): PlanningLayoutSkuRow[] {
   const rowBySkuId = new Map(savedRows.map((row) => [row.skuId, row]));
   const limitRowBySkuId = new Map(productLimitRows.map((row) => [row.skuId, row]));
 
-  return skuItems.map((item) => ({
+  return skuItems.filter(isPlanningLayoutVisibleSkuItem).map((item) => ({
     ...(() => {
       const row = rowBySkuId.get(item.id);
       const savedBrands = getUniqueNonEmptyStrings([
@@ -5234,10 +5239,7 @@ function buildPlanningLayoutSkuRows(
         categories: row?.categories ?? [],
         planningModel: row?.model.trim() ?? "",
         priceBand: row?.priceBand.trim() || autoPriceBand,
-        brands:
-          savedBrands.length > 0 || row
-            ? savedBrands
-            : getUniqueNonEmptyStrings([defaultAdaptableBrand]),
+        brands: savedBrands,
         shop: row?.shop.trim() ?? "",
       };
     })(),
@@ -10140,15 +10142,8 @@ export default function NonIntegratedDetailClient({
         derivedSkuItems,
         planningLayoutRows,
         productLimitRows,
-        formValues.adaptableBrands[0] || formValues.brand,
       ),
-    [
-      derivedSkuItems,
-      formValues.adaptableBrands,
-      formValues.brand,
-      planningLayoutRows,
-      productLimitRows,
-    ],
+    [derivedSkuItems, planningLayoutRows, productLimitRows],
   );
   const productLimitDisplayRows = useMemo(
     () =>
@@ -13632,13 +13627,7 @@ export default function NonIntegratedDetailClient({
     setPlanningLayoutRows((current) => {
       const rowBySkuId = new Map(current.map((row) => [row.skuId, row]));
       const currentRow =
-        rowBySkuId.get(skuId) ??
-        createEmptyPlanningLayoutRow(
-          skuId,
-          getUniqueNonEmptyStrings([
-            formValues.adaptableBrands[0] || formValues.brand,
-          ]),
-        );
+        rowBySkuId.get(skuId) ?? createEmptyPlanningLayoutRow(skuId);
       const nextRow =
         typeof updater === "function"
           ? updater(currentRow)
@@ -19319,6 +19308,14 @@ export default function NonIntegratedDetailClient({
         </div>
       );
     };
+    const stickyIndexHeaderClass =
+      "sticky left-0 z-30 w-[56px] min-w-[56px] max-w-[56px] whitespace-nowrap border-b border-r border-apple-separator bg-apple-bg-secondary px-3 py-2 text-left font-apple-medium";
+    const stickyImageHeaderClass =
+      "sticky left-[56px] z-30 w-[76px] min-w-[76px] max-w-[76px] whitespace-nowrap border-b border-r border-apple-separator bg-apple-bg-secondary px-3 py-2 text-left font-apple-medium shadow-[8px_0_12px_-12px_rgba(0,0,0,0.45)]";
+    const stickyIndexCellClass =
+      "sticky left-0 z-20 w-[56px] min-w-[56px] max-w-[56px] border-r border-apple-separator bg-apple-bg-primary px-3 py-2 text-apple-label-secondary";
+    const stickyImageCellClass =
+      "sticky left-[56px] z-20 w-[76px] min-w-[76px] max-w-[76px] border-r border-apple-separator bg-apple-bg-primary px-3 py-2 shadow-[8px_0_12px_-12px_rgba(0,0,0,0.45)]";
 
     return (
       <div
@@ -19331,17 +19328,19 @@ export default function NonIntegratedDetailClient({
           </div>
         </div>
 
-        <div className="min-h-0 min-w-0 flex-1 overflow-auto p-3">
+        <div className="flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden p-3">
           {planningLayoutSkuRows.length === 0 ? (
             <div className="flex min-h-[260px] items-center justify-center rounded-apple-xl border border-dashed border-apple-separator text-sm text-apple-label-secondary">
-              当前还没有 SKU 信息，先维护 SKU 后再查看空间布局。
+              {derivedSkuItems.length === 0
+                ? "当前还没有 SKU 信息，先维护 SKU 后再查看空间布局。"
+                : "当前没有销售状态为“销售”的 SKU。"}
             </div>
           ) : displayedPlanningLayoutSkuRows.length === 0 ? (
             <div className="flex min-h-[260px] items-center justify-center rounded-apple-xl border border-dashed border-apple-separator text-sm text-apple-label-secondary">
               当前批次还没有 SKU 信息。
             </div>
           ) : (
-            <div className="max-w-full overflow-x-auto overflow-y-hidden rounded-apple-lg border border-apple-separator pb-2">
+            <div className="min-h-0 max-w-full flex-1 overflow-auto rounded-apple-lg border border-apple-separator">
               <table className="min-w-[3340px] w-full border-collapse text-xs">
                 <thead className="bg-apple-bg-secondary/40 text-apple-label-secondary">
                   <tr>
@@ -19370,10 +19369,16 @@ export default function NonIntegratedDetailClient({
                       "价格带",
                       "适配品牌",
                       "店铺",
-                    ].map((label) => (
+                    ].map((label, columnIndex) => (
                       <th
                         key={label}
-                        className="whitespace-nowrap border-b border-apple-separator px-3 py-2 text-left font-apple-medium"
+                        className={
+                          columnIndex === 0
+                            ? stickyIndexHeaderClass
+                            : columnIndex === 1
+                              ? stickyImageHeaderClass
+                              : "whitespace-nowrap border-b border-apple-separator px-3 py-2 text-left font-apple-medium"
+                        }
                       >
                         {label}
                       </th>
@@ -19386,10 +19391,12 @@ export default function NonIntegratedDetailClient({
                       key={row.skuId}
                       className="border-b border-apple-separator last:border-b-0"
                     >
-                      <td className="px-3 py-2 text-apple-label-secondary">
+                      <td className={stickyIndexCellClass}>
                         {index + 1}
                       </td>
-                      <td className="px-3 py-2">{renderImageCell(row, index)}</td>
+                      <td className={stickyImageCellClass}>
+                        {renderImageCell(row, index)}
+                      </td>
                       <td className="px-3 py-2">
                         {renderReadOnlyCell(row.model)}
                       </td>
@@ -19529,8 +19536,7 @@ export default function NonIntegratedDetailClient({
                           row,
                           values: row.brands,
                           options: getUniqueNonEmptyStrings([
-                            ...formValues.adaptableBrands,
-                            formValues.brand,
+                            ...PLANNING_LAYOUT_BRAND_OPTIONS,
                             ...row.brands,
                           ]),
                         })}
diff --git a/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedApi.ts b/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedApi.ts
index 70f179cb..8b158088 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedApi.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedApi.ts
@@ -237,6 +237,15 @@ export async function listSharedNonIntegratedProductPage(
   }>(response)
 }
 
+export async function listSharedNonIntegratedStockCategoryOptions() {
+  const response = await fetchWithTimeout('/api/intake/non-integrated/stock-category-options', {
+    method: 'GET',
+    cache: 'no-store',
+  })
+
+  return readApiData<{ categories: string[] }>(response)
+}
+
 export async function getSharedNonIntegratedProductById(id: string) {
   const response = await fetchWithTimeout(`/api/intake/non-integrated/${encodeURIComponent(id)}`, {
     method: 'GET',
diff --git a/furniture-3d-system/src/server/services/intake-non-integrated-product.service.ts b/furniture-3d-system/src/server/services/intake-non-integrated-product.service.ts
index 1d779488..a018148a 100644
--- a/furniture-3d-system/src/server/services/intake-non-integrated-product.service.ts
+++ b/furniture-3d-system/src/server/services/intake-non-integrated-product.service.ts
@@ -953,6 +953,31 @@ class IntakeNonIntegratedProductService {
     }
   }
 
+  async listStockCategoryOptions(user: AuthUser) {
+    const scopeWhere = intakeNonIntegratedScopeService.buildReadScopeWhere(user)
+    const records = await this.repository.listActive({
+      AND: [
+        ...(scopeWhere ? [scopeWhere] : []),
+        buildStockProductWhere(),
+      ],
+    })
+    const categories = new Set<string>()
+
+    records.forEach((record) => {
+      if (!isRecord(record.payload)) return
+      const metadata = record.payload.metadata
+      if (!isRecord(metadata)) return
+      const category = typeof metadata.sourceCategory === 'string'
+        ? metadata.sourceCategory.trim()
+        : ''
+      if (category) categories.add(category)
+    })
+
+    return Array.from(categories).sort((left, right) =>
+      left.localeCompare(right, 'zh-Hans-CN'),
+    )
+  }
+
   async getById(id: string, user: AuthUser) {
     const record = await this.repository.findActiveById(id)
     if (!record) {

From d8aadfa0e185eb2dec03af28e3a3e41c88b19032 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Tue, 19 May 2026 18:30:11 +0800
Subject: [PATCH 18/21] fix: refine non-integrated sku confirmation

---
 .../NonIntegratedDetailClient.test.tsx        |  709 +++++-
 .../NonIntegratedDetailClient.tsx             | 2034 +++++++++++------
 .../non-integrated/nonIntegratedStorage.ts    |   21 +
 .../src/lib/non-integrated-sku-export.ts      |    4 +-
 4 files changed, 1987 insertions(+), 781 deletions(-)

diff --git a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
index 0b96eff9..37ed7766 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
@@ -43,6 +43,7 @@ import { createApprovalWorkflow } from "@/app/approval-workflows/approvalWorkflo
 
 const push = jest.fn();
 const modelPreviewPanelMock = jest.fn();
+const CONFIRMED_SKU_BATCH_AT = { "1": "2026-05-19T00:00:00.000Z" };
 
 type NonIntegratedRemoteAssetStorageTestGlobal = typeof globalThis & {
   __NON_INTEGRATED_REMOTE_ASSET_STORAGE_TEST_OVERRIDE__?: boolean;
@@ -172,6 +173,27 @@ const mockedUploadSharedNonIntegratedFile = jest.mocked(
 const mockedFetchSubstrates = jest.mocked(fetchSubstrates);
 const mockedCreateApprovalWorkflow = jest.mocked(createApprovalWorkflow);
 
+async function selectInlineOption(
+  actor: ReturnType<typeof userEvent.setup>,
+  control: HTMLElement,
+  optionName: string,
+) {
+  await actor.click(control);
+  const optionLabel = optionName || "请选择";
+  const listboxes = await screen.findAllByRole("listbox");
+  const activeListbox = listboxes[listboxes.length - 1];
+  expect(activeListbox).toBeDefined();
+  const optionByLabel = within(activeListbox!).queryByRole("option", {
+    name: optionLabel,
+  });
+  const optionByValue = Array.from(
+    activeListbox!.querySelectorAll<HTMLButtonElement>('[role="option"]'),
+  ).find((option) => option.value === optionName);
+  const option = optionByLabel ?? optionByValue;
+  expect(option).toBeDefined();
+  await actor.click(option!);
+}
+
 function createSubstrateOption(overrides: {
   id: string;
   code: string;
@@ -334,6 +356,7 @@ function createSkuItem(
     size: "140/60/75",
     color: "胡桃色",
     material: "橡胶木",
+    boardMaterialType: "",
     versionNo: "V01",
     attributeCode: "A",
     drawingId: "SZ0230K01AV0",
@@ -460,7 +483,7 @@ describe("NonIntegratedDetailClient", () => {
     expect(screen.getByLabelText("品牌")).toHaveValue("基本盘");
     await actor.type(screen.getByLabelText("名称"), "测试开品");
     await actor.type(screen.getByLabelText("外观设计师"), "外观A");
-    await actor.selectOptions(screen.getByLabelText("品牌"), "顾家");
+    await selectInlineOption(actor, screen.getByLabelText("品牌"), "顾家");
     await actor.type(screen.getByLabelText("企划负责人"), "企划A");
 
     const imageFile = new File(["image"], "preview.png", { type: "image/png" });
@@ -521,13 +544,15 @@ describe("NonIntegratedDetailClient", () => {
     );
 
     expect(screen.getByRole("heading", { name: "新增系列产品" })).toBeInTheDocument();
-    expect(screen.getByRole("option", { name: "单板桌系列" })).toBeInTheDocument();
+    await actor.click(screen.getByLabelText("系列名称"));
+    expect(screen.getByRole("listbox")).toHaveTextContent("单板桌系列");
+    await actor.keyboard("{Escape}");
 
-    await actor.selectOptions(screen.getByLabelText("系列名称"), "单板桌系列");
+    await selectInlineOption(actor, screen.getByLabelText("系列名称"), "单板桌系列");
     await actor.type(screen.getByLabelText("二级类目"), "桌类");
     await actor.type(screen.getByLabelText("商品类目"), "书桌");
     await actor.type(screen.getByLabelText("外观设计师"), "外观A");
-    await actor.selectOptions(screen.getByLabelText("品牌"), "顾家");
+    await selectInlineOption(actor, screen.getByLabelText("品牌"), "顾家");
     await actor.type(screen.getByLabelText("企划负责人"), "企划A");
 
     const imageFile = new File(["image"], "series.png", { type: "image/png" });
@@ -622,9 +647,9 @@ describe("NonIntegratedDetailClient", () => {
     expect(screen.getByLabelText("系列名称")).toBeInTheDocument();
 
     await actor.type(screen.getByLabelText("SPU"), "CJ0250");
-    await actor.selectOptions(screen.getByLabelText("系列名称"), "单板桌系列");
+    await selectInlineOption(actor, screen.getByLabelText("系列名称"), "单板桌系列");
     await actor.type(screen.getByLabelText("外观设计师"), "外观A");
-    await actor.selectOptions(screen.getByLabelText("品牌"), "顾家");
+    await selectInlineOption(actor, screen.getByLabelText("品牌"), "顾家");
 
     const imageFile = new File(["image"], "stock-series.png", {
       type: "image/png",
@@ -739,7 +764,9 @@ describe("NonIntegratedDetailClient", () => {
     expect(within(dialog).getAllByText("2").length).toBeGreaterThan(0);
   });
 
-  it("hides already created series names from the create selector", () => {
+  it("hides already created series names from the create selector", async () => {
+    const actor = userEvent.setup();
+
     render(
       <NonIntegratedDetailClient
         mode="create"
@@ -749,10 +776,10 @@ describe("NonIntegratedDetailClient", () => {
       />,
     );
 
-    expect(
-      screen.queryByRole("option", { name: "单板桌系列" }),
-    ).not.toBeInTheDocument();
-    expect(screen.getByRole("option", { name: "餐桌系列" })).toBeInTheDocument();
+    await actor.click(screen.getByLabelText("系列名称"));
+    const seriesOptions = screen.getByRole("listbox");
+    expect(seriesOptions).not.toHaveTextContent("单板桌系列");
+    expect(seriesOptions).toHaveTextContent("餐桌系列");
   });
 
   it("uses detached upload before the product exists when creating remotely", async () => {
@@ -1086,7 +1113,7 @@ describe("NonIntegratedDetailClient", () => {
 
     expect(await screen.findByDisplayValue("第一个条码板材")).toBeInTheDocument();
 
-    await actor.selectOptions(screen.getByLabelText("选择条码"), "sku-same-style-2");
+    await selectInlineOption(actor, screen.getByLabelText("选择条码"), "sku-same-style-2");
 
     const copiedPartNameInput = await screen.findByDisplayValue(
       "第一个条码板材",
@@ -1712,28 +1739,16 @@ describe("NonIntegratedDetailClient", () => {
     expect(screen.getByRole("button", { name: "下载" })).toBeInTheDocument();
     expect(screen.getByRole("button", { name: "删除" })).toBeInTheDocument();
 
-    const secondaryCategoryDatalistId = screen
-      .getByLabelText("二级类目")
-      .getAttribute("list");
-    const productCategoryDatalistId = screen
-      .getByLabelText("商品类目")
-      .getAttribute("list");
-    expect(secondaryCategoryDatalistId).toBeTruthy();
-    expect(productCategoryDatalistId).toBeTruthy();
-
-    const secondaryCategoryOptions = Array.from(
-      document
-        .getElementById(secondaryCategoryDatalistId ?? "")
-        ?.querySelectorAll("option") ?? [],
-    ).map((option) => option.getAttribute("value"));
-    const productCategoryOptions = Array.from(
-      document
-        .getElementById(productCategoryDatalistId ?? "")
-        ?.querySelectorAll("option") ?? [],
-    ).map((option) => option.getAttribute("value"));
-    expect(secondaryCategoryOptions).toEqual(expect.arrayContaining(["桌类"]));
-    expect(productCategoryOptions).toEqual(expect.arrayContaining(["书桌"]));
-    expect(productCategoryOptions).not.toContain("鞋柜");
+    await actor.click(screen.getByLabelText("二级类目"));
+    expect(
+      within(openingReferenceWorkspace).getByRole("listbox"),
+    ).toHaveTextContent("桌类");
+    await actor.click(screen.getByLabelText("商品类目"));
+    const productCategoryOptions = within(
+      openingReferenceWorkspace,
+    ).getByRole("listbox");
+    expect(productCategoryOptions).toHaveTextContent("书桌");
+    expect(productCategoryOptions).not.toHaveTextContent("鞋柜");
 
     await actor.clear(screen.getByLabelText("开品理由"));
     await actor.type(screen.getByLabelText("开品理由"), "新的开品理由");
@@ -1765,24 +1780,13 @@ describe("NonIntegratedDetailClient", () => {
     expect(screen.getByLabelText("外观设计师")).toHaveValue("徐霞客");
     expect(screen.getByLabelText("结构设计师")).toHaveValue("结构B");
 
-    const basicSecondaryCategoryDatalistId = screen
-      .getByLabelText("二级类目")
-      .getAttribute("list");
-    const basicProductCategoryDatalistId = screen
-      .getByLabelText("商品类目")
-      .getAttribute("list");
-    expect(basicSecondaryCategoryDatalistId).toBeTruthy();
-    expect(basicProductCategoryDatalistId).toBeTruthy();
-
-    const basicProductCategoryOptions = Array.from(
-      document
-        .getElementById(basicProductCategoryDatalistId ?? "")
-        ?.querySelectorAll("option") ?? [],
-    ).map((option) => option.getAttribute("value"));
-    expect(basicProductCategoryOptions).toEqual(
-      expect.arrayContaining(["书桌", "手动商品类目"]),
-    );
-    expect(basicProductCategoryOptions).not.toContain("鞋柜");
+    await actor.click(screen.getByLabelText("二级类目"));
+    expect(screen.getByRole("listbox")).toHaveTextContent("桌类");
+    await actor.click(screen.getByLabelText("商品类目"));
+    const basicProductCategoryOptions = screen.getByRole("listbox");
+    expect(basicProductCategoryOptions).toHaveTextContent("书桌");
+    expect(basicProductCategoryOptions).toHaveTextContent("手动商品类目");
+    expect(basicProductCategoryOptions).not.toHaveTextContent("鞋柜");
 
     await actor.clear(screen.getByLabelText("二级类目"));
     await actor.type(screen.getByLabelText("二级类目"), "柜类");
@@ -1952,35 +1956,27 @@ describe("NonIntegratedDetailClient", () => {
       const appearanceDesignerInput = screen.getByLabelText("外观设计师");
       const structureDesignerInput = screen.getByLabelText("结构设计师");
       const planningOwnerInput = screen.getByLabelText("企划负责人");
-      const designerDatalistId = appearanceDesignerInput.getAttribute("list");
-      const planningOwnerDatalistId = planningOwnerInput.getAttribute("list");
-
-      expect(designerDatalistId).toBeTruthy();
-      expect(planningOwnerDatalistId).toBeTruthy();
-      expect(structureDesignerInput).toHaveAttribute("list", designerDatalistId);
-      expect(planningOwnerInput).not.toHaveAttribute("list", designerDatalistId);
-
+      await actor.click(appearanceDesignerInput);
       await waitFor(() => {
-        const designerDatalist = document.getElementById(
-          designerDatalistId ?? "",
-        );
-        const planningOwnerDatalist = document.getElementById(
-          planningOwnerDatalistId ?? "",
-        );
-        const designerOptionValues = Array.from(
-          designerDatalist?.querySelectorAll("option") ?? [],
-        ).map((option) => option.getAttribute("value"));
-        const planningOwnerOptionValues = Array.from(
-          planningOwnerDatalist?.querySelectorAll("option") ?? [],
-        ).map((option) => option.getAttribute("value"));
+        const designerOptions = screen.getByRole("listbox");
+        expect(designerOptions).toHaveTextContent("陆南亭");
+        expect(designerOptions).toHaveTextContent("结构A");
+        expect(designerOptions).toHaveTextContent("徐霞客");
+      });
 
-        expect(designerOptionValues).toEqual(
-          expect.arrayContaining(["陆南亭", "结构A", "徐霞客"]),
-        );
-        expect(planningOwnerOptionValues).toEqual(
-          expect.arrayContaining(["企划A", "企划B"]),
-        );
-        expect(planningOwnerOptionValues).not.toContain("陆南亭");
+      await actor.click(structureDesignerInput);
+      await waitFor(() => {
+        const structureDesignerOptions = screen.getByRole("listbox");
+        expect(structureDesignerOptions).toHaveTextContent("陆南亭");
+        expect(structureDesignerOptions).toHaveTextContent("结构A");
+      });
+
+      await actor.click(planningOwnerInput);
+      await waitFor(() => {
+        const planningOwnerOptions = screen.getByRole("listbox");
+        expect(planningOwnerOptions).toHaveTextContent("企划A");
+        expect(planningOwnerOptions).toHaveTextContent("企划B");
+        expect(planningOwnerOptions).not.toHaveTextContent("陆南亭");
       });
 
       await actor.clear(appearanceDesignerInput);
@@ -2167,9 +2163,9 @@ describe("NonIntegratedDetailClient", () => {
     expect(screen.getByLabelText("外观设计名称")).toHaveValue("胡桃木色窄边书桌");
     expect(screen.getByTestId("patent-application-spu")).toHaveValue("SZ0230");
 
-    await actor.selectOptions(screen.getByLabelText("专利状态"), "已有专利");
-    await actor.selectOptions(screen.getByLabelText("是否SA"), "是");
-    await actor.selectOptions(screen.getByLabelText("销售状态"), "待上市");
+    await selectInlineOption(actor, screen.getByLabelText("专利状态"), "已有专利");
+    await selectInlineOption(actor, screen.getByLabelText("是否SA"), "是");
+    await selectInlineOption(actor, screen.getByLabelText("销售状态"), "待上市");
     await actor.type(screen.getByLabelText("申请号"), "APP-001");
     await actor.type(screen.getByLabelText("申请日"), "2026-04-30");
     await actor.type(screen.getByLabelText("申请成功后的专利号"), "PAT-001");
@@ -2474,10 +2470,7 @@ describe("NonIntegratedDetailClient", () => {
     const skuRow = screen.getAllByDisplayValue("SZ0230K01")[0]?.closest("tr");
     expect(skuRow).not.toBeNull();
 
-    await actor.selectOptions(
-      within(skuRow!).getByRole("combobox", { name: "符合国标" }),
-      "是",
-    );
+    await selectInlineOption(actor, within(skuRow!).getByRole("combobox", { name: "符合国标" }), "是");
 
     await waitFor(() => {
       const savedProduct = getNonIntegratedProductById(
@@ -2489,7 +2482,320 @@ describe("NonIntegratedDetailClient", () => {
     });
   });
 
-  it("hides redundant fields from the product detail summary", () => {
+  it("persists the SKU board material type selection", async () => {
+    const actor = userEvent.setup();
+
+    saveNonIntegratedProduct(
+      createProductRecord({
+        id: "SZ0230-board-material-type",
+        spu: "SZ0230",
+        skuItems: [
+          createSkuItem({
+            id: "sku-board-material-type-1",
+            model: "SZ0230K01",
+          }),
+        ],
+      }),
+    );
+
+    render(
+      <NonIntegratedDetailClient
+        mode="edit"
+        productId="SZ0230-board-material-type"
+      />,
+    );
+
+    const skuRow = screen.getByDisplayValue("SZ0230K01").closest("tr");
+    expect(skuRow).not.toBeNull();
+
+    await selectInlineOption(actor, within(skuRow!).getByRole("combobox", { name: "SZ0230K01 板材类型" }), "ENF级");
+
+    await waitFor(() => {
+      const savedProduct = getNonIntegratedProductById(
+        "SZ0230-board-material-type",
+      );
+      expect(savedProduct?.skuItems[0]?.boardMaterialType).toBe("ENF级");
+    });
+  });
+
+  it("requires complete SKU info before showing the SKU confirmation action", async () => {
+    const actor = userEvent.setup();
+
+    window.localStorage.setItem(
+      NON_INTEGRATED_STORAGE_KEY,
+      JSON.stringify([
+        createProductRecord({
+          id: "DNZ0001-sku-confirmation-incomplete",
+          skuItems: [
+            createSkuItem({
+              boardMaterialType: "",
+              executeStandard: "GB/T 3324",
+              nationalStandardCompliant: "是",
+              manufacturer: "测试供应商",
+              manufacturerCode: "GYS001",
+              salesStatus: "销售",
+            }),
+          ],
+          skuBatchCount: 1,
+          skuBatchChangeTypes: { 1: "新品" },
+          skuBatchFlowNos: { 1: "DD20260519001" },
+        }),
+      ]),
+    );
+
+    render(
+      <NonIntegratedDetailClient
+        mode="edit"
+        productId="DNZ0001-sku-confirmation-incomplete"
+        currentUserRole="SUPER_ADMIN"
+        currentUserBusinessRoles={["DESIGN"]}
+      />,
+    );
+
+    await actor.click(screen.getByTestId("document-workspace-basic-info-trigger"));
+
+    expect(
+      screen.queryByTestId("non-integrated-confirm-sku-content"),
+    ).not.toBeInTheDocument();
+
+    await actor.click(screen.getByTestId("non-integrated-check-sku-content"));
+
+    expect(
+      screen.getByText(/SKU信息未填写完整.*第1行缺少：板材类型/),
+    ).toBeInTheDocument();
+  });
+
+  it("locks only the confirmed SKU batch after a second confirmation", async () => {
+    const actor = userEvent.setup();
+    const productId = "DNZ0001-sku-confirmation-complete";
+
+    saveNonIntegratedProduct(
+      createProductRecord({
+        id: productId,
+        spu: "DNZ0001",
+        skuItems: [
+          createSkuItem({
+            boardMaterialType: "ENF级",
+            executeStandard: "GB/T 3324",
+            nationalStandardCompliant: "是",
+            manufacturer: "测试供应商",
+            manufacturerCode: "GYS001",
+            salesStatus: "销售",
+          }),
+        ],
+        skuBatchCount: 1,
+        skuBatchChangeTypes: { 1: "新品" },
+        skuBatchFlowNos: { 1: "DD20260519001" },
+      }),
+    );
+
+    render(
+      <NonIntegratedDetailClient
+        mode="edit"
+        productId={productId}
+        currentUserRole="SUPER_ADMIN"
+        currentUserBusinessRoles={["DESIGN"]}
+      />,
+    );
+
+    await actor.click(screen.getByTestId("document-workspace-basic-info-trigger"));
+
+    const confirmButton = screen.getByTestId(
+      "non-integrated-confirm-sku-content",
+    );
+    expect(confirmButton).toHaveTextContent("确认SKU信息");
+
+    await actor.click(confirmButton);
+
+    expect(
+      screen.getByText(
+        /批次1 SKU 信息已检查完整.*再次点击“确认SKU信息”后/,
+      ),
+    ).toBeInTheDocument();
+    await waitFor(() => {
+      expect(
+        screen.getByTestId("non-integrated-confirm-sku-content"),
+      ).toHaveTextContent(/^再次确认SKU信息$/);
+    });
+    const secondConfirmButton = screen.getByTestId(
+      "non-integrated-confirm-sku-content",
+    );
+
+    await actor.click(secondConfirmButton);
+
+    await waitFor(() => {
+      const savedProduct = getNonIntegratedProductById(productId);
+      expect(savedProduct?.skuBatchConfirmedAt?.["1"]).toEqual(
+        expect.any(String),
+      );
+    });
+
+    expect(await screen.findByText("已确认SKU信息")).toBeInTheDocument();
+    expect(
+      screen.queryByTestId("non-integrated-confirm-sku-content"),
+    ).not.toBeInTheDocument();
+    expect(
+      screen.queryByTestId("non-integrated-add-sku"),
+    ).not.toBeInTheDocument();
+    expect(screen.queryByText("上传资料")).not.toBeInTheDocument();
+    expect(screen.getByText("下载资料")).toBeInTheDocument();
+    expect(screen.getByText("上传图片")).toBeInTheDocument();
+    expect(screen.getByText("新增批次")).toBeInTheDocument();
+  });
+
+  it("hides the SKU confirmation prompt after five seconds", async () => {
+    jest.useFakeTimers();
+    const actor = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
+
+    try {
+      saveNonIntegratedProduct(
+        createProductRecord({
+          id: "DNZ0001-sku-confirmation-prompt-timeout",
+          skuItems: [
+            createSkuItem({
+              boardMaterialType: "",
+              executeStandard: "GB/T 3324",
+              nationalStandardCompliant: "是",
+              manufacturer: "测试供应商",
+              manufacturerCode: "GYS001",
+              salesStatus: "销售",
+            }),
+          ],
+          skuBatchCount: 1,
+          skuBatchChangeTypes: { 1: "新品" },
+          skuBatchFlowNos: { 1: "DD20260519001" },
+        }),
+      );
+
+      render(
+        <NonIntegratedDetailClient
+          mode="edit"
+          productId="DNZ0001-sku-confirmation-prompt-timeout"
+          currentUserRole="SUPER_ADMIN"
+          currentUserBusinessRoles={["DESIGN"]}
+        />,
+      );
+
+      await actor.click(
+        screen.getByTestId("document-workspace-basic-info-trigger"),
+      );
+      await actor.click(screen.getByTestId("non-integrated-check-sku-content"));
+
+      expect(
+        screen.getByText(/SKU信息未填写完整.*第1行缺少：板材类型/),
+      ).toBeInTheDocument();
+
+      act(() => {
+        jest.advanceTimersByTime(5000);
+      });
+
+      expect(
+        screen.queryByText(/SKU信息未填写完整.*第1行缺少：板材类型/),
+      ).not.toBeInTheDocument();
+    } finally {
+      jest.useRealTimers();
+    }
+  });
+
+  it("lets admins reopen confirmed SKU content before sample measurement is approved", async () => {
+    const actor = userEvent.setup();
+    const productId = "DNZ0001-sku-reopen-before-measurement";
+
+    saveNonIntegratedProduct(
+      createProductRecord({
+        id: productId,
+        spu: "DNZ0001",
+        skuItems: [
+          createSkuItem({
+            boardMaterialType: "ENF级",
+            executeStandard: "GB/T 3324",
+            nationalStandardCompliant: "是",
+            manufacturer: "测试供应商",
+            manufacturerCode: "GYS001",
+            salesStatus: "销售",
+          }),
+        ],
+        skuBatchCount: 1,
+        skuBatchChangeTypes: { 1: "新品" },
+        skuBatchFlowNos: { 1: "DD20260519001" },
+        skuBatchConfirmedAt: { 1: "2026-05-19T10:00:00.000Z" },
+      }),
+    );
+
+    render(
+      <NonIntegratedDetailClient
+        mode="edit"
+        productId={productId}
+        currentUserRole="SUPER_ADMIN"
+        currentUserBusinessRoles={["DESIGN"]}
+      />,
+    );
+
+    await actor.click(screen.getByTestId("document-workspace-basic-info-trigger"));
+
+    expect(screen.getByTestId("non-integrated-reopen-sku-content")).toBeEnabled();
+
+    await actor.click(screen.getByTestId("non-integrated-reopen-sku-content"));
+
+    await waitFor(() => {
+      const savedProduct = getNonIntegratedProductById(productId);
+      expect(savedProduct?.skuBatchConfirmedAt?.["1"]).toBeUndefined();
+      expect(savedProduct?.skuItems[0]?.model).toBe("SZ0230K01");
+    });
+
+    expect(
+      screen.getByTestId("non-integrated-confirm-sku-content"),
+    ).toHaveTextContent("确认SKU信息");
+  });
+
+  it("prevents admins from reopening SKU content after sample measurement is approved", async () => {
+    const actor = userEvent.setup();
+
+    saveNonIntegratedProduct(
+      createProductRecord({
+        id: "DNZ0001-sku-reopen-after-measurement",
+        spu: "DNZ0001",
+        skuItems: [
+          createSkuItem({
+            boardMaterialType: "ENF级",
+            executeStandard: "GB/T 3324",
+            nationalStandardCompliant: "是",
+            manufacturer: "测试供应商",
+            manufacturerCode: "GYS001",
+            salesStatus: "销售",
+          }),
+        ],
+        skuBatchCount: 1,
+        skuBatchChangeTypes: { 1: "新品" },
+        skuBatchFlowNos: { 1: "DD20260519001" },
+        skuBatchConfirmedAt: { 1: "2026-05-19T10:00:00.000Z" },
+        documentWorkspaceConfirmations: {
+          ...createDefaultDocumentWorkspaceConfirmations(),
+          样包测量: true,
+        },
+        documentWorkspaceApprovedAt: {
+          样包测量: "2026-05-19T11:00:00.000Z",
+        },
+      }),
+    );
+
+    render(
+      <NonIntegratedDetailClient
+        mode="edit"
+        productId="DNZ0001-sku-reopen-after-measurement"
+        currentUserRole="SUPER_ADMIN"
+        currentUserBusinessRoles={["DESIGN"]}
+      />,
+    );
+
+    await actor.click(screen.getByTestId("document-workspace-basic-info-trigger"));
+
+    expect(screen.getByTestId("non-integrated-reopen-sku-content")).toBeDisabled();
+  });
+
+  it("hides redundant fields from the product detail summary", async () => {
+    const actor = userEvent.setup();
+
     saveNonIntegratedProduct(
       createProductRecord({
         id: "SZ0230-compact-summary",
@@ -2521,7 +2827,9 @@ describe("NonIntegratedDetailClient", () => {
     expect(screen.getByLabelText("SPU负责人")).toHaveValue("徐霞客");
     expect(screen.getByLabelText("空间设计师")).toHaveValue("测试视觉策划");
     expect(screen.getByLabelText("材质类型")).toHaveValue("橡胶木");
-    expect(screen.getByRole("option", { name: "岩板+钢架" })).toBeInTheDocument();
+    await actor.click(screen.getByLabelText("材质类型"));
+    expect(screen.getByRole("listbox")).toHaveTextContent("岩板+钢架");
+    await actor.keyboard("{Escape}");
 
     [
       "商品ID",
@@ -2571,7 +2879,7 @@ describe("NonIntegratedDetailClient", () => {
 
     await actor.clear(screen.getByLabelText("空间设计师"));
     await actor.type(screen.getByLabelText("空间设计师"), "空间A");
-    await actor.selectOptions(screen.getByLabelText("材质类型"), "岩板+钢架");
+    await selectInlineOption(actor, screen.getByLabelText("材质类型"), "岩板+钢架");
 
     await waitFor(() => {
       const savedProduct = getNonIntegratedProductById(
@@ -2597,7 +2905,7 @@ describe("NonIntegratedDetailClient", () => {
     expect(screen.getByLabelText("材质类型")).toHaveValue("岩板+钢架");
 
     await actor.clear(screen.getByLabelText("空间设计师"));
-    await actor.selectOptions(screen.getByLabelText("材质类型"), "");
+    await selectInlineOption(actor, screen.getByLabelText("材质类型"), "");
 
     await waitFor(() => {
       const savedProduct = getNonIntegratedProductById(
@@ -2641,7 +2949,7 @@ describe("NonIntegratedDetailClient", () => {
 
     await actor.clear(screen.getByLabelText("空间设计师"));
     await actor.type(screen.getByLabelText("空间设计师"), "空间新");
-    await actor.selectOptions(screen.getByLabelText("材质类型"), "亚克力");
+    await selectInlineOption(actor, screen.getByLabelText("材质类型"), "亚克力");
     expect(screen.getByTestId("basic-info-confirmed")).toBeInTheDocument();
     expect(screen.queryByTestId("basic-info-confirm")).not.toBeInTheDocument();
 
@@ -2661,6 +2969,7 @@ describe("NonIntegratedDetailClient", () => {
       createProductRecord({
         id: "SZ0230-sample-measurement",
         spu: "SZ0230",
+        skuBatchConfirmedAt: CONFIRMED_SKU_BATCH_AT,
         skuItems: [
           createSkuItem({
             id: "sku-sample-1",
@@ -2737,6 +3046,27 @@ describe("NonIntegratedDetailClient", () => {
         },
       ]);
     });
+
+    const confirmMeasurementButton = screen.getByRole("button", {
+      name: "确认测量",
+    });
+    expect(confirmMeasurementButton).toBeEnabled();
+
+    await actor.click(confirmMeasurementButton);
+
+    await waitFor(() => {
+      const savedProduct = getNonIntegratedProductById(
+        "SZ0230-sample-measurement",
+      );
+      expect(savedProduct?.documentWorkspaceConfirmations?.样包测量).toBe(true);
+      expect(savedProduct?.documentWorkspaceApprovedAt?.样包测量).toEqual(
+        expect.any(String),
+      );
+    });
+
+    expect(
+      screen.getByTestId("sample-measurement-lengthCm-sku-sample-1"),
+    ).toHaveAttribute("readonly");
   });
 
   it("lets purchasing users edit only purchasing document nodes", async () => {
@@ -2748,6 +3078,7 @@ describe("NonIntegratedDetailClient", () => {
     saveNonIntegratedProduct(
       createProductRecord({
         id: "SZ0230-purchasing-permission",
+        skuBatchConfirmedAt: CONFIRMED_SKU_BATCH_AT,
         designer: "测试设计师",
         purchaser: "采购同事",
         purchaseOwner: "采购同事",
@@ -2818,6 +3149,7 @@ describe("NonIntegratedDetailClient", () => {
     saveNonIntegratedProduct(
       createProductRecord({
         id: "SZ0230-planning-permission",
+        skuBatchConfirmedAt: CONFIRMED_SKU_BATCH_AT,
         designer: "测试设计师",
         productPlanning: "企划同事",
         openingReference: {
@@ -2927,6 +3259,7 @@ describe("NonIntegratedDetailClient", () => {
     saveNonIntegratedProduct(
       createProductRecord({
         id: "SZ0230-regular-permission",
+        skuBatchConfirmedAt: CONFIRMED_SKU_BATCH_AT,
         designer: "测试设计师",
         skuItems: [
           createSkuItem({
@@ -3072,6 +3405,7 @@ describe("NonIntegratedDetailClient", () => {
     saveNonIntegratedProduct(
       createProductRecord({
         id: "DNZ0001-product-pricing",
+        skuBatchConfirmedAt: CONFIRMED_SKU_BATCH_AT,
         skuItems: [
           createSkuItem({
             id: "sku-pricing-1",
@@ -3123,13 +3457,16 @@ describe("NonIntegratedDetailClient", () => {
     expect(pricingWorkspace).toHaveTextContent("规格码");
     expect(pricingWorkspace).toHaveTextContent("条码");
     expect(pricingWorkspace).toHaveTextContent("成本价");
-    expect(pricingWorkspace).toHaveTextContent("商品标签");
+    expect(pricingWorkspace).toHaveTextContent("是否录入系统");
+    expect(pricingWorkspace).not.toHaveTextContent("商品标签");
+    expect(pricingWorkspace).not.toHaveTextContent("查看条码分摊");
     expect(screen.getByText("SZ0230K01")).toBeInTheDocument();
     expect(screen.getByText("SZ023001N1280V01")).toBeInTheDocument();
     expect(screen.getAllByText("兰考华兰家具").length).toBeGreaterThan(0);
+    expect(screen.getByText("未录入")).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "确认推送" })).toBeDisabled();
 
     await actor.type(screen.getByPlaceholderText("0"), "88");
-    await actor.type(screen.getByPlaceholderText("请输入商品标签"), "首发款");
 
     await waitFor(() => {
       const savedProduct = getNonIntegratedProductById("DNZ0001-product-pricing");
@@ -3137,10 +3474,192 @@ describe("NonIntegratedDetailClient", () => {
         {
           skuId: "sku-pricing-1",
           costPrice: "88",
-          productTag: "首发款",
+          productTag: "",
         },
       ]);
     });
+
+    expect(screen.getByRole("button", { name: "确认推送" })).toBeDisabled();
+    expect(screen.queryByText("已录入")).not.toBeInTheDocument();
+    expect(screen.queryByText("已推送")).not.toBeInTheDocument();
+
+    const confirmPricingButton = screen.getByRole("button", {
+      name: "确认核价",
+    });
+    expect(confirmPricingButton).toBeEnabled();
+
+    await actor.click(confirmPricingButton);
+
+    await waitFor(() => {
+      const savedProduct = getNonIntegratedProductById("DNZ0001-product-pricing");
+      expect(savedProduct?.documentWorkspaceConfirmations?.产品核价).toBe(true);
+      expect(savedProduct?.documentWorkspaceApprovedAt?.产品核价).toEqual(
+        expect.any(String),
+      );
+    });
+
+    expect(screen.getByPlaceholderText("0")).toHaveAttribute("readonly");
+    expect(screen.queryByPlaceholderText("请输入商品标签")).not.toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "减少成本价" })).toBeDisabled();
+  });
+
+  it("lets only admins reopen confirmed product factory rows before sample measurement is approved", async () => {
+    const actor = userEvent.setup();
+    const productId = "DNZ0001-product-factory-reopen";
+    const confirmedFactoryRow = {
+      skuId: "sku-factory-reopen-1",
+      confirmed: true,
+      model: "SZ0230K01",
+      skuCode: "SZ023001",
+      setCount: "1",
+      barcode: "SZ023001N1280V01",
+      specName: "款式一 140/60/75",
+      size: "140/60/75",
+      color: "胡桃色",
+      material: "橡胶木",
+      installMethod: "拆装",
+      supplierName: "兰考华兰家具",
+      supplierCode: "N1280",
+      warehouse: "郑州仓",
+      minimumOrderQuantity: "50",
+      leadTime: "30天",
+      assemblyMode: "",
+      productionType: "常规生产",
+      installationService: "无",
+      supplierCategory: "主供",
+      purchaseOrderMethod: "系统下单",
+      executeStandard: "GB/T 3324",
+    };
+
+    saveNonIntegratedProduct(
+      createProductRecord({
+        id: productId,
+        skuBatchConfirmedAt: CONFIRMED_SKU_BATCH_AT,
+        skuItems: [
+          createSkuItem({
+            id: "sku-factory-reopen-1",
+            barcode: "SZ023001N1280V01",
+            manufacturer: "兰考华兰家具",
+            manufacturerCode: "N1280",
+            installMethod: "拆装",
+            executeStandard: "GB/T 3324",
+          }),
+        ],
+        factoryRows: [confirmedFactoryRow],
+      }),
+    );
+
+    const { unmount } = render(
+      <NonIntegratedDetailClient
+        mode="edit"
+        productId={productId}
+        currentUserRole="USER"
+      />,
+    );
+
+    await actor.click(screen.getByTestId("document-workspace-trigger-产品定厂"));
+    expect(
+      screen.queryByTestId("product-factory-reopen-confirmation"),
+    ).not.toBeInTheDocument();
+
+    unmount();
+
+    render(
+      <NonIntegratedDetailClient
+        mode="edit"
+        productId={productId}
+        currentUserRole="SUPER_ADMIN"
+        currentUserBusinessRoles={["DESIGN"]}
+      />,
+    );
+
+    await actor.click(screen.getByTestId("document-workspace-trigger-产品定厂"));
+
+    const reopenButton = screen.getByTestId(
+      "product-factory-reopen-confirmation",
+    );
+    expect(reopenButton).toBeEnabled();
+
+    await actor.click(reopenButton);
+
+    expect(screen.getByRole("button", { name: "确认定厂" })).toBeInTheDocument();
+    expect(screen.getByPlaceholderText("请输入最低起订量")).not.toHaveAttribute(
+      "readonly",
+    );
+
+    await waitFor(() => {
+      const savedProduct = getNonIntegratedProductById(productId);
+      expect(savedProduct?.factoryRows?.[0]?.confirmed).toBe(false);
+    });
+  });
+
+  it("prevents admins from reopening product factory after sample measurement is approved", async () => {
+    const actor = userEvent.setup();
+
+    saveNonIntegratedProduct(
+      createProductRecord({
+        id: "DNZ0001-product-factory-reopen-locked",
+        skuBatchConfirmedAt: CONFIRMED_SKU_BATCH_AT,
+        skuItems: [
+          createSkuItem({
+            id: "sku-factory-locked-1",
+            barcode: "SZ023001N1280V01",
+            manufacturer: "兰考华兰家具",
+            manufacturerCode: "N1280",
+            installMethod: "拆装",
+            executeStandard: "GB/T 3324",
+          }),
+        ],
+        factoryRows: [
+          {
+            skuId: "sku-factory-locked-1",
+            confirmed: true,
+            model: "SZ0230K01",
+            skuCode: "SZ023001",
+            setCount: "1",
+            barcode: "SZ023001N1280V01",
+            specName: "款式一 140/60/75",
+            size: "140/60/75",
+            color: "胡桃色",
+            material: "橡胶木",
+            installMethod: "拆装",
+            supplierName: "兰考华兰家具",
+            supplierCode: "N1280",
+            warehouse: "郑州仓",
+            minimumOrderQuantity: "50",
+            leadTime: "30天",
+            assemblyMode: "",
+            productionType: "常规生产",
+            installationService: "无",
+            supplierCategory: "主供",
+            purchaseOrderMethod: "系统下单",
+            executeStandard: "GB/T 3324",
+          },
+        ],
+        documentWorkspaceConfirmations: {
+          ...createDefaultDocumentWorkspaceConfirmations(),
+          样包测量: true,
+        },
+        documentWorkspaceApprovedAt: {
+          样包测量: "2026-05-19T11:00:00.000Z",
+        },
+      }),
+    );
+
+    render(
+      <NonIntegratedDetailClient
+        mode="edit"
+        productId="DNZ0001-product-factory-reopen-locked"
+        currentUserRole="SUPER_ADMIN"
+        currentUserBusinessRoles={["DESIGN"]}
+      />,
+    );
+
+    await actor.click(screen.getByTestId("document-workspace-trigger-产品定厂"));
+
+    expect(
+      screen.getByTestId("product-factory-reopen-confirmation"),
+    ).toBeDisabled();
   });
 
   it("renders planning layout rows from SKU data without SKU edit actions", async () => {
@@ -3149,6 +3668,7 @@ describe("NonIntegratedDetailClient", () => {
     saveNonIntegratedProduct(
       createProductRecord({
         id: "DNZ0001-planning-layout",
+        skuBatchConfirmedAt: CONFIRMED_SKU_BATCH_AT,
         skuItems: [
           createSkuItem({
             id: "sku-planning-layout-1",
@@ -3214,6 +3734,7 @@ describe("NonIntegratedDetailClient", () => {
     saveNonIntegratedProduct(
       createProductRecord({
         id: "DNZ0001-planning-layout-fields",
+        skuBatchConfirmedAt: CONFIRMED_SKU_BATCH_AT,
         adaptableBrands: ["基本盘"],
         skuItems: [
           createSkuItem({
diff --git a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
index 7c5012ad..5f4cf2ed 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
@@ -21,7 +21,7 @@ import {
   useRef,
   useState,
 } from "react";
-import { ArrowLeft, Ban, Plus, Search, X } from "lucide-react";
+import { ArrowLeft, Ban, ChevronDown, Plus, Search, X } from "lucide-react";
 import CameraScannerModal from "@/components/mobile/CameraScannerModal";
 import { ModelPreviewPanel } from "@/components/platform/ModelPreviewPanel";
 import Button from "@/components/ui/Button";
@@ -263,6 +263,7 @@ type SkuColumnWidthKey =
   | "size"
   | "color"
   | "material"
+  | "boardMaterialType"
   | "versionNo"
   | "attributeCode"
   | "drawingId"
@@ -302,6 +303,7 @@ const SKU_BATCH_CHANGE_TYPE_OPTIONS: SkuBatchChangeType[] = [
   "转厂",
 ];
 const NATIONAL_STANDARD_COMPLIANCE_OPTIONS = ["是", "否"] as const;
+const SKU_BOARD_MATERIAL_TYPE_OPTIONS = ["ENF级", "非ENF级", "清货板材"] as const;
 const SKU_SALES_STATUS_OPTIONS = ["销售", "停产", "退市"] as const;
 
 const SKU_COLUMN_DEFAULT_WIDTHS: Record<SkuColumnWidthKey, number> = {
@@ -313,6 +315,7 @@ const SKU_COLUMN_DEFAULT_WIDTHS: Record<SkuColumnWidthKey, number> = {
   size: 96,
   color: 96,
   material: 136,
+  boardMaterialType: 104,
   versionNo: 56,
   attributeCode: 96,
   drawingId: 150,
@@ -569,8 +572,7 @@ type FieldDefinition = {
   required?: boolean;
   type?: BasicFieldType;
   placeholder?: string;
-  options?: string[];
-  datalistId?: string;
+  options?: readonly string[];
   auto?: boolean;
 };
 
@@ -787,7 +789,9 @@ const PRODUCT_LIMIT_WORKSPACE_CATEGORY: DocumentWorkspaceCategory =
 const PLANNING_LAYOUT_WORKSPACE_CATEGORY: DocumentWorkspaceCategory =
   NON_INTEGRATED_PLANNING_LAYOUT_WORKSPACE_CATEGORY;
 
-function getUniqueNonEmptyStrings(values: Array<string | null | undefined>) {
+function getUniqueNonEmptyStrings(
+  values: ReadonlyArray<string | null | undefined>,
+) {
   return Array.from(
     new Set(
       values
@@ -1374,7 +1378,8 @@ const COMPONENT_SKU_CATEGORY_ORDER = new Map<ComponentSkuCategoryKey, number>(
 );
 
 const SKU_TOOLBAR_BUTTON_BASE_CLASS =
-  "inline-flex h-8 shrink-0 items-center justify-center rounded-apple-lg border px-3 text-xs font-apple-medium transition disabled:cursor-not-allowed";
+  "inline-flex h-8 min-h-8 shrink-0 items-center justify-center rounded-apple-lg border px-3 text-xs font-apple-medium transition disabled:cursor-not-allowed";
+const SKU_TOOLBAR_STATUS_CLASS = `${SKU_TOOLBAR_BUTTON_BASE_CLASS} cursor-default select-none border-apple-separator bg-apple-bg-secondary text-apple-label-secondary`;
 const SKU_PRIMARY_ACTION_BUTTON_CLASS =
   "!h-8 !min-h-8 !rounded-apple-lg !border-zinc-950 !bg-zinc-950 !bg-none !px-3 !py-0 !text-xs !text-white !shadow-none hover:!border-zinc-800 hover:!bg-zinc-800 focus:!border-zinc-600 disabled:!border-zinc-200 disabled:!bg-zinc-200 disabled:!text-zinc-400";
 const DETAIL_PRIMARY_ADD_BUTTON_CLASS =
@@ -1528,6 +1533,7 @@ const DEFAULT_DOCUMENT_WORKSPACE_CATEGORY: DocumentWorkspaceCategory =
 
 const PRODUCT_PHOTO_CATEGORY: DocumentWorkspaceCategory = "产品实拍图";
 const AUTO_SAVE_DELAY_MS = 500;
+const SKU_CONFIRMATION_PROMPT_VISIBLE_MS = 5000;
 
 function getChangedWorkflowNodeCategories(
   previousSignatures: Record<WorkflowNodeCategory, string> | null | undefined,
@@ -1548,8 +1554,14 @@ function getChangedWorkflowNodeCategories(
     );
   });
 }
-const PATENT_APPLICATION_STATUS_OPTIONS: NonIntegratedPatentApplication["patentStatus"][] =
-  ["待确认", "已有专利", "申请中", "申请失败", "无专利", "放弃维护"];
+const PATENT_APPLICATION_STATUS_OPTIONS = [
+  "待确认",
+  "已有专利",
+  "申请中",
+  "申请失败",
+  "无专利",
+  "放弃维护",
+] as const;
 const PATENT_APPLICATION_DECISION_OPTIONS: Array<{
   value: Exclude<NonIntegratedPatentApplication["shouldApply"], "">;
   label: string;
@@ -1558,10 +1570,12 @@ const PATENT_APPLICATION_DECISION_OPTIONS: Array<{
   { value: "申请", label: "是" },
   { value: "不申请", label: "否" },
 ];
-const PATENT_APPLICATION_SA_REQUIRED_OPTIONS: NonIntegratedPatentApplication["saRequired"][] =
-  ["否", "是"];
-const PATENT_APPLICATION_SALES_STATUS_OPTIONS: NonIntegratedPatentApplication["salesStatus"][] =
-  ["在售", "待上市", "停售"];
+const PATENT_APPLICATION_SA_REQUIRED_OPTIONS = ["否", "是"] as const;
+const PATENT_APPLICATION_SALES_STATUS_OPTIONS = [
+  "在售",
+  "待上市",
+  "停售",
+] as const;
 const QUALITY_INSPECTION_ROW_FIELD_KEYS = [
   ...QUALITY_INSPECTION_EDITABLE_FIELD_KEYS,
   ...QUALITY_INSPECTION_IMAGE_FIELD_KEYS,
@@ -2629,6 +2643,7 @@ function createEmptySkuItem(): NonIntegratedSkuItem {
     size: "",
     color: "",
     material: "",
+    boardMaterialType: "",
     versionNo: "V01",
     attributeCode: "",
     drawingId: "",
@@ -4720,6 +4735,7 @@ function deriveSkuItem(
     manufacturer: item.manufacturer.trim(),
     manufacturerCode: item.manufacturerCode.trim().toUpperCase(),
     salesStatus: item.salesStatus?.trim() ?? "",
+    boardMaterialType: item.boardMaterialType?.trim() ?? "",
     tagMaterial: formValues.tagMaterial.trim() || item.tagMaterial.trim(),
   };
 }
@@ -4774,6 +4790,7 @@ function buildSkuItemFromImportedRow(
     size: row.size.trim(),
     color: row.color.trim(),
     material: row.material.trim(),
+    boardMaterialType: row.boardMaterialType.trim(),
     versionNo,
     attributeCode: row.attributeCode.trim().toUpperCase(),
     drawingId: row.drawingId.trim().toUpperCase(),
@@ -4959,6 +4976,7 @@ type ProductPricingDisplayRow = NonIntegratedPricingRow & {
   setCount: string;
   specName: string;
   supplierName: string;
+  systemEnteredAt: string;
 };
 
 type PlanningLayoutSkuRow = {
@@ -5020,6 +5038,7 @@ function createProductPricingRowFromSku(
     supplierName: sku.manufacturer.trim() || "-",
     costPrice: existingRow?.costPrice?.trim() ?? "",
     productTag: existingRow?.productTag?.trim() ?? "",
+    systemEnteredAt: existingRow?.systemEnteredAt?.trim() ?? "",
   };
 }
 
@@ -5041,16 +5060,23 @@ function normalizePricingRowsForPayload(
   rows: NonIntegratedPricingRow[],
 ): NonIntegratedPricingRow[] {
   return rows
-    .map((row) => ({
-      skuId: row.skuId,
-      costPrice: row.costPrice.trim(),
-      productTag: row.productTag.trim(),
-    }))
-    .filter((row) => row.skuId && (row.costPrice || row.productTag));
+    .map((row) => {
+      const systemEnteredAt = row.systemEnteredAt?.trim() ?? "";
+      return {
+        skuId: row.skuId,
+        costPrice: row.costPrice.trim(),
+        productTag: row.productTag.trim(),
+        ...(systemEnteredAt ? { systemEnteredAt } : {}),
+      };
+    })
+    .filter(
+      (row) =>
+        row.skuId && (row.costPrice || row.productTag || row.systemEnteredAt),
+    );
 }
 
 function isProductPricingRowComplete(row: NonIntegratedPricingRow) {
-  return [row.costPrice, row.productTag].every((value) => value.trim());
+  return row.costPrice.trim().length > 0;
 }
 
 function createProductLimitRowFromSku(
@@ -5950,13 +5976,312 @@ function CreateFieldShell({ children }: { children: ReactNode }) {
   );
 }
 
+function InlineSuggestionInput({
+  ariaLabel,
+  dataTestId,
+  value,
+  options,
+  placeholder,
+  readOnly = false,
+  wrapperClassName = "relative",
+  inputClassName,
+  panelClassName = "absolute left-0 right-0 top-[calc(100%+4px)] z-50 max-h-48 overflow-auto rounded-apple-lg border border-apple-separator bg-apple-bg-primary p-1 shadow-apple-md",
+  optionClassName = "flex w-full items-center rounded-apple-md px-2.5 py-1.5 text-left text-xs transition",
+  showChevron = true,
+  filterOptions = false,
+  closeOnChange,
+  onChange,
+  onSelect,
+  onCommit,
+}: {
+  ariaLabel: string;
+  dataTestId?: string;
+  value: string;
+  options?: readonly string[];
+  placeholder?: string;
+  readOnly?: boolean;
+  wrapperClassName?: string;
+  inputClassName?: string;
+  panelClassName?: string;
+  optionClassName?: string;
+  showChevron?: boolean;
+  filterOptions?: boolean;
+  closeOnChange?: (value: string) => boolean;
+  onChange: (value: string) => void;
+  onSelect?: (value: string) => void;
+  onCommit?: () => void;
+}) {
+  const suggestionListId = useId();
+  const [isOpen, setIsOpen] = useState(false);
+  const previousValueRef = useRef(value);
+  const normalizedOptions = getUniqueNonEmptyStrings(options ?? []);
+  const keyword = value.trim().toLowerCase();
+  const visibleOptions = normalizedOptions.filter((option) =>
+    filterOptions && keyword ? option.toLowerCase().includes(keyword) : true,
+  );
+  const hasOptions = !readOnly && normalizedOptions.length > 0;
+
+  useEffect(() => {
+    if (previousValueRef.current && !value) {
+      setIsOpen(false);
+    }
+    previousValueRef.current = value;
+  }, [value]);
+
+  const closeLater = useCallback(() => {
+    setIsOpen(false);
+  }, []);
+
+  const handleSelect = useCallback(
+    (option: string) => {
+      onChange(option);
+      onSelect?.(option);
+      setIsOpen(false);
+    },
+    [onChange, onSelect],
+  );
+
+  return (
+    <div className={wrapperClassName}>
+      <input
+        type="text"
+        aria-label={ariaLabel}
+        aria-controls={hasOptions ? suggestionListId : undefined}
+        aria-expanded={hasOptions ? isOpen : undefined}
+        role={hasOptions ? "combobox" : undefined}
+        data-testid={dataTestId}
+        value={value}
+        autoComplete="off"
+        onChange={(event) => {
+          const nextValue = event.target.value;
+          onChange(nextValue);
+          if (hasOptions) {
+            setIsOpen(closeOnChange?.(nextValue) ? false : true);
+          }
+        }}
+        onFocus={() => {
+          if (hasOptions) setIsOpen(true);
+        }}
+        onBlur={() => {
+          closeLater();
+          onCommit?.();
+        }}
+        onKeyDown={(event) => {
+          if (event.key === "Escape") {
+            setIsOpen(false);
+            return;
+          }
+          if (event.key === "Enter") {
+            event.preventDefault();
+            onCommit?.();
+            setIsOpen(false);
+          }
+        }}
+        placeholder={placeholder}
+        readOnly={readOnly}
+        className={inputClassName}
+      />
+      {hasOptions && showChevron ? (
+        <button
+          type="button"
+          tabIndex={-1}
+          aria-label={`展开${ariaLabel}选项`}
+          onMouseDown={(event) => {
+            event.preventDefault();
+            setIsOpen((current) => !current);
+          }}
+          className="absolute right-2 top-1/2 flex h-6 w-6 -translate-y-1/2 items-center justify-center rounded-apple-md text-apple-label-secondary transition hover:bg-apple-bg-tertiary hover:text-apple-label-primary"
+        >
+          <ChevronDown className="h-4 w-4" aria-hidden="true" />
+        </button>
+      ) : null}
+      {hasOptions && isOpen ? (
+        <div id={suggestionListId} role="listbox" className={panelClassName}>
+          {visibleOptions.length > 0 ? (
+            visibleOptions.map((option) => (
+              <button
+                key={option}
+                type="button"
+                role="option"
+                aria-selected={option === value}
+                onMouseDown={(event) => {
+                  event.preventDefault();
+                  handleSelect(option);
+                }}
+                className={`${optionClassName} ${
+                  option === value
+                    ? "bg-apple-bg-secondary text-apple-label-primary"
+                    : "text-apple-label-primary hover:bg-apple-bg-secondary"
+                }`}
+              >
+                <span className="min-w-0 truncate">{option}</span>
+              </button>
+            ))
+          ) : (
+            <div className="px-2.5 py-2 text-xs text-apple-label-secondary">
+              没有匹配项
+            </div>
+          )}
+        </div>
+      ) : null}
+    </div>
+  );
+}
+
+type InlineSelectOption =
+  | string
+  | {
+      value: string;
+      label?: string;
+      disabled?: boolean;
+    };
+
+function normalizeInlineSelectOptions(
+  options: readonly InlineSelectOption[] | undefined,
+): { value: string; label: string; disabled?: boolean }[] {
+  return (options ?? []).map((option) =>
+    typeof option === "string"
+      ? { value: option, label: option }
+      : { value: option.value, label: option.label ?? option.value, disabled: option.disabled },
+  );
+}
+
+function InlineSelect({
+  ariaLabel,
+  dataTestId,
+  value,
+  options,
+  placeholder,
+  readOnly = false,
+  wrapperClassName = "relative",
+  buttonClassName,
+  panelClassName = "absolute left-0 right-0 top-[calc(100%+4px)] z-50 max-h-48 overflow-auto rounded-apple-lg border border-apple-separator bg-apple-bg-primary p-1 shadow-apple-md",
+  optionClassName = "flex w-full items-center rounded-apple-md px-2.5 py-1.5 text-left text-xs transition",
+  includeEmptyOption,
+  emptyOptionDisabled = false,
+  onChange,
+}: {
+  ariaLabel: string;
+  dataTestId?: string;
+  value: string;
+  options?: readonly InlineSelectOption[];
+  placeholder?: string;
+  readOnly?: boolean;
+  wrapperClassName?: string;
+  buttonClassName?: string;
+  panelClassName?: string;
+  optionClassName?: string;
+  includeEmptyOption?: boolean;
+  emptyOptionDisabled?: boolean;
+  onChange: (value: string) => void;
+}) {
+  const listId = useId();
+  const containerRef = useRef<HTMLDivElement>(null);
+  const [isOpen, setIsOpen] = useState(false);
+  const normalizedOptions = normalizeInlineSelectOptions(options);
+  const shouldIncludeEmptyOption = includeEmptyOption ?? Boolean(placeholder);
+  const selectOptions = shouldIncludeEmptyOption
+    ? [
+        {
+          value: "",
+          label: placeholder ?? "",
+          disabled: emptyOptionDisabled,
+        },
+        ...normalizedOptions,
+      ]
+    : normalizedOptions;
+  const selectedOption = selectOptions.find((option) => option.value === value);
+  const displayValue = selectedOption?.label ?? (value || placeholder || "");
+  const hasOptions = !readOnly && selectOptions.length > 0;
+
+  useEffect(() => {
+    if (!isOpen) return;
+
+    function handleDocumentMouseDown(event: MouseEvent) {
+      if (!containerRef.current?.contains(event.target as Node)) {
+        setIsOpen(false);
+      }
+    }
+
+    document.addEventListener("mousedown", handleDocumentMouseDown);
+    return () =>
+      document.removeEventListener("mousedown", handleDocumentMouseDown);
+  }, [isOpen]);
+
+  return (
+    <div ref={containerRef} className={wrapperClassName}>
+      <button
+        type="button"
+        aria-label={ariaLabel}
+        aria-controls={hasOptions ? listId : undefined}
+        aria-expanded={hasOptions ? isOpen : undefined}
+        aria-haspopup={hasOptions ? "listbox" : undefined}
+        role="combobox"
+        data-testid={dataTestId}
+        value={value}
+        disabled={readOnly}
+        onClick={() => {
+          if (hasOptions) setIsOpen((current) => !current);
+        }}
+        onKeyDown={(event) => {
+          if (event.key === "Escape") {
+            setIsOpen(false);
+            return;
+          }
+          if (event.key === "Enter" || event.key === " ") {
+            event.preventDefault();
+            if (hasOptions) setIsOpen((current) => !current);
+          }
+        }}
+        className={`flex items-center justify-between gap-2 text-left ${buttonClassName ?? ""}`}
+      >
+        <span className="min-w-0 flex-1 truncate">
+          {displayValue || placeholder}
+        </span>
+        {hasOptions ? (
+          <ChevronDown
+            className="h-4 w-4 shrink-0 text-apple-label-secondary"
+            aria-hidden="true"
+          />
+        ) : null}
+      </button>
+      {hasOptions && isOpen ? (
+        <div id={listId} role="listbox" className={panelClassName}>
+          {selectOptions.map((option) => (
+            <button
+              key={`${option.value}-${option.label}`}
+              type="button"
+              role="option"
+              aria-selected={option.value === value}
+              value={option.value}
+              disabled={option.disabled}
+              onMouseDown={(event) => {
+                event.preventDefault();
+                if (option.disabled) return;
+                onChange(option.value);
+                setIsOpen(false);
+              }}
+              className={`${optionClassName} ${
+                option.value === value
+                  ? "bg-apple-bg-secondary text-apple-label-primary"
+                  : "text-apple-label-primary hover:bg-apple-bg-secondary"
+              } disabled:cursor-not-allowed disabled:text-apple-label-tertiary disabled:hover:bg-transparent`}
+            >
+              <span className="min-w-0 truncate">{option.label}</span>
+            </button>
+          ))}
+        </div>
+      ) : null}
+    </div>
+  );
+}
+
 function BasicField({
   label,
   required,
   type = "text",
   placeholder,
   options,
-  datalistId,
   value,
   readOnly = false,
   compact = false,
@@ -5966,8 +6291,7 @@ function BasicField({
   required?: boolean;
   type?: BasicFieldType;
   placeholder?: string;
-  options?: string[];
-  datalistId?: string;
+  options?: readonly string[];
   value: string;
   readOnly?: boolean;
   compact?: boolean;
@@ -5983,24 +6307,19 @@ function BasicField({
         }
       >
         <FieldLabel label={label} required={required} />
-        <select
-          aria-label={label}
+        <InlineSelect
+          ariaLabel={label}
           value={value}
-          onChange={(event) => onChange(event.target.value)}
-          disabled={readOnly}
-          className={`h-9 w-full rounded-apple-lg border border-apple-separator px-3 text-sm text-apple-label-primary outline-none ${
+          options={options}
+          placeholder={placeholder}
+          readOnly={readOnly}
+          onChange={onChange}
+          buttonClassName={`h-9 w-full rounded-apple-lg border border-apple-separator px-3 text-sm text-apple-label-primary outline-none disabled:cursor-not-allowed ${
             readOnly
               ? "bg-apple-bg-primary text-apple-label-secondary"
               : "bg-apple-bg-secondary"
           }`}
-        >
-          {placeholder ? <option value="">{placeholder}</option> : null}
-          {(options ?? []).map((option) => (
-            <option key={option} value={option}>
-              {option}
-            </option>
-          ))}
-        </select>
+        />
       </div>
     );
   }
@@ -6041,14 +6360,16 @@ function BasicField({
       }
     >
       <FieldLabel label={label} required={required} />
-      <input
-        aria-label={label}
-        list={datalistId}
+      <InlineSuggestionInput
+        ariaLabel={label}
         value={value}
-        onChange={(event) => onChange(event.target.value)}
+        options={options}
         placeholder={placeholder}
         readOnly={readOnly}
-        className={`h-9 w-full rounded-apple-lg border border-apple-separator px-3 text-sm text-apple-label-primary outline-none ${
+        onChange={onChange}
+        inputClassName={`h-9 w-full rounded-apple-lg border border-apple-separator px-3 text-sm text-apple-label-primary outline-none ${
+          !readOnly && (options ?? []).length > 0 ? "pr-9" : ""
+        } ${
           readOnly
             ? "bg-apple-bg-primary text-apple-label-secondary"
             : "bg-apple-bg-secondary"
@@ -7695,27 +8016,23 @@ function SkuSupplierNameField({
       columnWidth={columnWidth}
       minWidth={SKU_COLUMN_DEFAULT_WIDTHS.supplierName}
       onColumnResize={onColumnResize}
-      className={`rounded border border-apple-separator ${
+      className={`overflow-visible rounded border border-apple-separator ${
         readOnly ? "bg-apple-bg-primary" : "bg-apple-bg-secondary"
       }`}
     >
-      <input
-        type="text"
-        list={readOnly ? undefined : "non-integrated-supplier-name-options"}
+      <InlineSuggestionInput
+        ariaLabel="供应商名称"
         value={value}
+        options={SUPPLIER_DIRECTORY.map((entry) => entry.name)}
         placeholder="搜索供应商名称"
-        autoComplete="off"
         readOnly={readOnly}
-        onChange={(event) => onChange(event.target.value)}
-        onBlur={onConfirm}
-        onKeyDown={(event) => {
-          if (event.key !== "Enter") return;
-          event.preventDefault();
-          onConfirm();
-        }}
-        className={`h-8 w-full border-0 bg-transparent px-2 text-xs text-apple-label-primary outline-none ${
+        filterOptions
+        onChange={onChange}
+        onCommit={onConfirm}
+        inputClassName={`h-8 w-full border-0 bg-transparent px-2 pr-8 text-xs text-apple-label-primary outline-none ${
           readOnly ? "text-apple-label-secondary" : ""
         }`}
+        panelClassName="absolute left-0 top-[calc(100%+4px)] z-50 max-h-56 min-w-full overflow-auto rounded-apple-lg border border-apple-separator bg-apple-bg-primary p-1 shadow-apple-md"
       />
     </SkuColumnResizableFrame>
   );
@@ -7741,27 +8058,23 @@ function SkuExecutionStandardField({
       columnWidth={columnWidth}
       minWidth={SKU_COLUMN_DEFAULT_WIDTHS.executeStandard}
       onColumnResize={onColumnResize}
-      className={`rounded border border-apple-separator ${
+      className={`overflow-visible rounded border border-apple-separator ${
         readOnly ? "bg-apple-bg-primary" : "bg-apple-bg-secondary"
       }`}
     >
-      <input
-        type="text"
-        list={readOnly ? undefined : "non-integrated-execution-standard-options"}
+      <InlineSuggestionInput
+        ariaLabel="执行标准"
         value={value}
+        options={[...EXECUTION_STANDARD_OPTIONS]}
         placeholder="搜索执行标准"
-        autoComplete="off"
         readOnly={readOnly}
-        onChange={(event) => onChange(event.target.value)}
-        onBlur={onConfirm}
-        onKeyDown={(event) => {
-          if (event.key !== "Enter") return;
-          event.preventDefault();
-          onConfirm();
-        }}
-        className={`h-8 w-full border-0 bg-transparent px-2 text-xs text-apple-label-primary outline-none ${
+        filterOptions
+        onChange={onChange}
+        onCommit={onConfirm}
+        inputClassName={`h-8 w-full border-0 bg-transparent px-2 pr-8 text-xs text-apple-label-primary outline-none ${
           readOnly ? "text-apple-label-secondary" : ""
         }`}
+        panelClassName="absolute left-0 top-[calc(100%+4px)] z-50 max-h-56 min-w-full overflow-auto rounded-apple-lg border border-apple-separator bg-apple-bg-primary p-1 shadow-apple-md"
       />
     </SkuColumnResizableFrame>
   );
@@ -7785,24 +8098,20 @@ function SkuNationalStandardComplianceField({
       columnWidth={columnWidth}
       minWidth={SKU_COLUMN_DEFAULT_WIDTHS.nationalStandardCompliant}
       onColumnResize={onColumnResize}
-      className={`rounded border border-apple-separator ${
+      className={`overflow-visible rounded border border-apple-separator ${
         readOnly ? "bg-apple-bg-primary" : "bg-apple-bg-secondary"
       }`}
     >
-      <select
-        aria-label="符合国标"
+      <InlineSelect
+        ariaLabel="符合国标"
         value={normalizeNationalStandardCompliance(value)}
-        disabled={readOnly}
-        onChange={(event) => onChange(event.target.value)}
-        className="h-8 w-full border-0 bg-transparent px-2 text-xs text-apple-label-primary outline-none disabled:bg-apple-bg-primary disabled:text-apple-label-secondary"
-      >
-        <option value="">请选择</option>
-        {NATIONAL_STANDARD_COMPLIANCE_OPTIONS.map((option) => (
-          <option key={option} value={option}>
-            {option}
-          </option>
-        ))}
-      </select>
+        options={NATIONAL_STANDARD_COMPLIANCE_OPTIONS}
+        placeholder="请选择"
+        readOnly={readOnly}
+        onChange={onChange}
+        buttonClassName="h-8 w-full border-0 bg-transparent px-2 text-xs text-apple-label-primary outline-none disabled:cursor-not-allowed disabled:bg-apple-bg-primary disabled:text-apple-label-secondary"
+        panelClassName="absolute left-0 top-[calc(100%+4px)] z-50 max-h-48 min-w-full overflow-auto rounded-apple-lg border border-apple-separator bg-apple-bg-primary p-1 shadow-apple-md"
+      />
     </SkuColumnResizableFrame>
   );
 }
@@ -8387,6 +8696,7 @@ function buildProductPayload(
   skuBatchCount: number,
   skuBatchFlowNos: Record<string, string>,
   skuBatchChangeTypes: Record<string, string>,
+  skuBatchConfirmedAt: Record<string, string>,
   createdAt?: string,
   copiedFromProductId?: string,
   copiedFromSpu?: string,
@@ -8723,6 +9033,7 @@ function buildProductPayload(
     skuBatchCount,
     skuBatchFlowNos,
     skuBatchChangeTypes,
+    skuBatchConfirmedAt,
     factoryRows: normalizeFactoryRowsForPayload(factoryRows),
     pricingRows: normalizePricingRowsForPayload(pricingRows),
     planningLayoutRows: normalizePlanningLayoutRowsForPayload(
@@ -8814,16 +9125,6 @@ export default function NonIntegratedDetailClient({
   seriesDraftSkuOptions?: SeriesDraftSkuOption[];
 }) {
   const router = useRouter();
-  const openingReferenceDesignerDatalistId = useId();
-  const openingReferencePlanningOwnerDatalistId = useId();
-  const openingReferenceSecondaryCategoryDatalistId = useId();
-  const openingReferenceProductCategoryDatalistId = useId();
-  const basicInfoDesignerDatalistId = useId();
-  const basicInfoPlanningOwnerDatalistId = useId();
-  const basicInfoOperationOwnerDatalistId = useId();
-  const basicInfoPurchasingOwnerDatalistId = useId();
-  const basicInfoSecondaryCategoryDatalistId = useId();
-  const basicInfoProductCategoryDatalistId = useId();
   const previewFileInputRef = useRef<HTMLInputElement | null>(null);
   const openingReferenceImageInputRef = useRef<HTMLInputElement | null>(null);
   const batchSkuImageInputRef = useRef<HTMLInputElement | null>(null);
@@ -8939,6 +9240,15 @@ export default function NonIntegratedDetailClient({
   const [skuBatchChangeTypes, setSkuBatchChangeTypes] = useState<
     Record<string, string>
   >(existingProduct?.skuBatchChangeTypes ?? {});
+  const [skuBatchConfirmedAt, setSkuBatchConfirmedAt] = useState<
+    Record<string, string>
+  >(existingProduct?.skuBatchConfirmedAt ?? {});
+  const [pendingSkuConfirmationBatch, setPendingSkuConfirmationBatch] =
+    useState<number | null>(null);
+  const [skuConfirmationPrompt, setSkuConfirmationPrompt] = useState<{
+    type: "success" | "error";
+    message: string;
+  } | null>(null);
   const [pendingSkuBatchDraft, setPendingSkuBatchDraft] = useState<{
     batchNo: number;
     changeType: string;
@@ -8968,10 +9278,6 @@ export default function NonIntegratedDetailClient({
   >({});
   const [planningLayoutBrandPickerSkuId, setPlanningLayoutBrandPickerSkuId] =
     useState<string | null>(null);
-  const [
-    planningLayoutBrandPickerPosition,
-    setPlanningLayoutBrandPickerPosition,
-  ] = useState<{ skuId: string; left: number; top: number } | null>(null);
   const [productLimitRows, setProductLimitRows] = useState<
     NonIntegratedProductLimitRow[]
   >(existingProduct?.productLimitRows ?? []);
@@ -9635,6 +9941,7 @@ export default function NonIntegratedDetailClient({
   } | null>(null);
   const autoSaveTimeoutRef = useRef<number | null>(null);
   const autoSaveNoticeTimeoutRef = useRef<number | null>(null);
+  const skuConfirmationPromptTimeoutRef = useRef<number | null>(null);
   const assetUploadCacheRef = useRef(new Map<string, Promise<string>>());
   const localStorageCompactionFinishedRef = useRef(false);
   const documentWorkspaceRevisionSignatureRef = useRef<Record<
@@ -9909,21 +10216,19 @@ export default function NonIntegratedDetailClient({
       ));
   const normalizedExistingOpeningReference =
     normalizeNonIntegratedOpeningReference(existingProduct?.openingReference);
-  const normalizedExistingSpu = existingProduct?.spu.trim().toUpperCase() ?? "";
-  const normalizedExistingTemporaryCode =
-    normalizedExistingOpeningReference.temporaryCode.trim().toUpperCase();
-  const normalizedExistingProductName =
-    normalizedExistingOpeningReference.productName.trim().toUpperCase();
   const isStockProductRecord =
     existingProduct?.processTemplate?.trim() === "存量商品" ||
-    normalizedExistingOpeningReference.currentStage.trim() === "存量商品" ||
-    Boolean(
-      existingProduct?.formalSpuAssigned &&
-        normalizedExistingSpu &&
-        (normalizedExistingSpu === normalizedExistingTemporaryCode ||
-          normalizedExistingSpu === normalizedExistingProductName),
-    );
+    normalizedExistingOpeningReference.currentStage.trim() === "存量商品";
   const isSkuContentReadOnly = isReadOnly || isStockProductRecord;
+  const isSkuBatchConfirmed = useCallback(
+    (batchNo: number | string) => Boolean(skuBatchConfirmedAt[String(batchNo)]),
+    [skuBatchConfirmedAt],
+  );
+  const activeSkuBatchNo = activeSkuBatch === "all" ? null : activeSkuBatch;
+  const isActiveSkuBatchConfirmed =
+    activeSkuBatchNo !== null && isSkuBatchConfirmed(activeSkuBatchNo);
+  const canEditActiveSkuBatch =
+    !isSkuContentReadOnly && !isActiveSkuBatchConfirmed;
   const formalSpuValue = formValues.spu.trim();
   const hasFormalSpu = formalSpuValue.length > 0;
   const spuRuleProductCategory =
@@ -9971,6 +10276,91 @@ export default function NonIntegratedDetailClient({
       ),
     [formValues.tagMaterial, skuCodePreviewSpu, skuItems],
   );
+  const getSkuBatchValidationIssues = useCallback(
+    (batchNo: number) => {
+      const batchKey = String(batchNo);
+      const batchItems = skuItems
+        .map((item, index) => ({
+          item,
+          derivedItem: derivedSkuItems[index] ?? item,
+          rowNumber: index + 1,
+        }))
+        .filter(
+          ({ item, derivedItem }) =>
+            (derivedItem.batchNo || item.batchNo || 1) === batchNo,
+        );
+      const issues: string[] = [];
+
+      if (batchItems.length === 0) {
+        issues.push(`批次${batchNo}还没有 SKU`);
+      }
+
+      batchItems.forEach(({ item, derivedItem, rowNumber }) => {
+        const missingFields = [
+          ["型号", item.model],
+          ["规格码", derivedItem.skuCode],
+          ["条码", derivedItem.barcode],
+          ["套件量", item.setCount],
+          ["规格名称", derivedItem.specName],
+          ["尺寸", item.size],
+          ["颜色", item.color],
+          ["材质", item.material],
+          ["板材类型", item.boardMaterialType],
+          ["版本号", derivedItem.versionNo],
+          ["属性代码", item.attributeCode],
+          ["图纸ID", derivedItem.drawingId],
+          ["安装方式", item.installMethod],
+          ["执行标准", item.executeStandard],
+          ["符合国标", item.nationalStandardCompliant],
+          ["供应商名称", item.manufacturer],
+          ["供应商代码", item.manufacturerCode],
+          ["销售状态", item.salesStatus],
+        ]
+          .filter(([, value]) => !String(value ?? "").trim())
+          .map(([label]) => label);
+
+        if (missingFields.length > 0) {
+          issues.push(`第${rowNumber}行缺少：${missingFields.join("、")}`);
+        }
+      });
+
+      const missingBatchFields = [
+        ["新增类型", skuBatchChangeTypes[batchKey]],
+        ["钉钉流程号", skuBatchFlowNos[batchKey]],
+      ]
+        .filter(([, value]) => !String(value ?? "").trim())
+        .map(([label]) => label);
+
+      if (missingBatchFields.length > 0) {
+        issues.push(`批次信息缺少：${missingBatchFields.join("、")}`);
+      }
+
+      return issues;
+    },
+    [derivedSkuItems, skuBatchChangeTypes, skuBatchFlowNos, skuItems],
+  );
+  const activeSkuBatchValidationIssues = useMemo(() => {
+    if (activeSkuBatchNo === null) return ["请先切换到具体批次"];
+    return getSkuBatchValidationIssues(activeSkuBatchNo);
+  }, [activeSkuBatchNo, getSkuBatchValidationIssues]);
+  const canConfirmActiveSkuBatch =
+    Boolean(activeSkuBatchNo) &&
+    canEditActiveSkuBatch &&
+    activeSkuBatchValidationIssues.length === 0;
+  const isActiveSkuConfirmationPending =
+    activeSkuBatchNo !== null &&
+    (pendingSkuConfirmationBatch === activeSkuBatchNo ||
+      skuConfirmationPrompt?.message.startsWith(
+        `批次${activeSkuBatchNo} SKU 信息已检查完整`,
+      ));
+  useEffect(() => {
+    setPendingSkuConfirmationBatch(null);
+    if (skuConfirmationPromptTimeoutRef.current) {
+      window.clearTimeout(skuConfirmationPromptTimeoutRef.current);
+      skuConfirmationPromptTimeoutRef.current = null;
+    }
+    setSkuConfirmationPrompt(null);
+  }, [activeSkuBatch]);
   const getSeriesSkuComponentDetails = useCallback(
     (item: NonIntegratedSkuItem): NonIntegratedSkuComponentDetail[] => {
       const storedDetails = normalizeNonIntegratedSkuComponentDetails(
@@ -10171,26 +10561,57 @@ export default function NonIntegratedDetailClient({
     () => new Map(derivedSkuItems.map((item) => [item.id, item.batchNo || 1])),
     [derivedSkuItems],
   );
+  const confirmedSkuItemIdSet = useMemo(
+    () =>
+      new Set(
+        derivedSkuItems
+          .filter((item) => isSkuBatchConfirmed(item.batchNo || 1))
+          .map((item) => item.id),
+      ),
+    [derivedSkuItems, isSkuBatchConfirmed],
+  );
+  const confirmedProductFactoryRows = useMemo(
+    () => productFactoryRows.filter((row) => confirmedSkuItemIdSet.has(row.skuId)),
+    [confirmedSkuItemIdSet, productFactoryRows],
+  );
+  const confirmedProductPricingRows = useMemo(
+    () => productPricingRows.filter((row) => confirmedSkuItemIdSet.has(row.skuId)),
+    [confirmedSkuItemIdSet, productPricingRows],
+  );
+  const confirmedPlanningLayoutSkuRows = useMemo(
+    () =>
+      planningLayoutSkuRows.filter((row) =>
+        confirmedSkuItemIdSet.has(row.skuId),
+      ),
+    [confirmedSkuItemIdSet, planningLayoutSkuRows],
+  );
+  const confirmedProductSampleMeasurementRows = useMemo(
+    () =>
+      productSampleMeasurementRows.filter((row) =>
+        confirmedSkuItemIdSet.has(row.skuId),
+      ),
+    [confirmedSkuItemIdSet, productSampleMeasurementRows],
+  );
   const displayedProductFactoryRows = useMemo(() => {
-    if (activeDownstreamSkuBatch === "all") return productFactoryRows;
-    return productFactoryRows.filter(
+    if (activeDownstreamSkuBatch === "all") return confirmedProductFactoryRows;
+    return confirmedProductFactoryRows.filter(
       (row) =>
         (skuBatchNoById.get(row.skuId) ?? 1) === activeDownstreamSkuBatch,
     );
-  }, [activeDownstreamSkuBatch, productFactoryRows, skuBatchNoById]);
+  }, [activeDownstreamSkuBatch, confirmedProductFactoryRows, skuBatchNoById]);
   const displayedProductPricingRows = useMemo(() => {
-    if (activeDownstreamSkuBatch === "all") return productPricingRows;
-    return productPricingRows.filter(
+    if (activeDownstreamSkuBatch === "all") return confirmedProductPricingRows;
+    return confirmedProductPricingRows.filter(
       (row) =>
         (skuBatchNoById.get(row.skuId) ?? 1) === activeDownstreamSkuBatch,
     );
-  }, [activeDownstreamSkuBatch, productPricingRows, skuBatchNoById]);
+  }, [activeDownstreamSkuBatch, confirmedProductPricingRows, skuBatchNoById]);
   const displayedPlanningLayoutSkuRows = useMemo(() => {
-    if (activeDownstreamSkuBatch === "all") return planningLayoutSkuRows;
-    return planningLayoutSkuRows.filter(
+    if (activeDownstreamSkuBatch === "all") return confirmedPlanningLayoutSkuRows;
+    return confirmedPlanningLayoutSkuRows.filter(
       (row) => row.batchNo === activeDownstreamSkuBatch,
     );
-  }, [activeDownstreamSkuBatch, planningLayoutSkuRows]);
+  }, [activeDownstreamSkuBatch, confirmedPlanningLayoutSkuRows]);
   const displayedProductLimitRows = useMemo(() => {
     if (activeDownstreamSkuBatch === "all") return productLimitDisplayRows;
     return productLimitDisplayRows.filter(
@@ -10200,15 +10621,15 @@ export default function NonIntegratedDetailClient({
   }, [activeDownstreamSkuBatch, productLimitDisplayRows, skuBatchNoById]);
   const displayedProductSampleMeasurementRows = useMemo(() => {
     if (activeDownstreamSkuBatch === "all") {
-      return productSampleMeasurementRows;
+      return confirmedProductSampleMeasurementRows;
     }
-    return productSampleMeasurementRows.filter(
+    return confirmedProductSampleMeasurementRows.filter(
       (row) =>
         (skuBatchNoById.get(row.skuId) ?? 1) === activeDownstreamSkuBatch,
     );
   }, [
     activeDownstreamSkuBatch,
-    productSampleMeasurementRows,
+    confirmedProductSampleMeasurementRows,
     skuBatchNoById,
   ]);
   const displayedProductFirstQualityRows = useMemo(() => {
@@ -10683,15 +11104,15 @@ export default function NonIntegratedDetailClient({
     [groupedUploadFiles],
   );
   const confirmedProductFactoryRowCount = useMemo(
-    () => productFactoryRows.filter((row) => row.confirmed).length,
-    [productFactoryRows],
+    () => confirmedProductFactoryRows.filter((row) => row.confirmed).length,
+    [confirmedProductFactoryRows],
   );
   const populatedProductPricingRowCount = useMemo(
     () =>
-      productPricingRows.filter(
-        (row) => row.costPrice.trim() || row.productTag.trim(),
+      confirmedProductPricingRows.filter(
+        (row) => row.costPrice.trim(),
       ).length,
-    [productPricingRows],
+    [confirmedProductPricingRows],
   );
   const populatedProductLimitRowCount = useMemo(
     () =>
@@ -10704,10 +11125,10 @@ export default function NonIntegratedDetailClient({
       ).length,
     [productLimitDisplayRows],
   );
-  const planningLayoutHasContent = planningLayoutSkuRows.length > 0;
+  const planningLayoutHasContent = confirmedPlanningLayoutSkuRows.length > 0;
   const populatedSampleMeasurementRowCount = useMemo(
     () =>
-      productSampleMeasurementRows.filter((row) =>
+      confirmedProductSampleMeasurementRows.filter((row) =>
         [
           row.lengthCm,
           row.widthCm,
@@ -10716,7 +11137,7 @@ export default function NonIntegratedDetailClient({
           row.productShape,
         ].some((value) => value.trim()),
       ).length,
-    [productSampleMeasurementRows],
+    [confirmedProductSampleMeasurementRows],
   );
   const populatedFirstQualityRowCount = useMemo(
     () =>
@@ -10948,14 +11369,32 @@ export default function NonIntegratedDetailClient({
       documentWorkspaceConfirmations[category] === true &&
       Boolean(documentWorkspaceApprovedAt[category]) &&
       !dirtyWorkflowNodeCategories.has(category));
+  const isDocumentWorkspaceNodeLocked = (category: DocumentWorkspaceCategory) =>
+    documentWorkspaceConfirmations[category] === true &&
+    Boolean(documentWorkspaceApprovedAt[category]);
+  const isSampleMeasurementNodeLocked = isDocumentWorkspaceNodeLocked(
+    SAMPLE_MEASUREMENT_WORKSPACE_CATEGORY,
+  );
+  const isProductPricingNodeLocked = isDocumentWorkspaceNodeLocked(
+    PRODUCT_PRICING_WORKSPACE_CATEGORY,
+  );
   const displayedSampleMeasurementIsConfirmed = isWorkflowNodeConfirmed(
     SAMPLE_MEASUREMENT_WORKSPACE_CATEGORY,
     displayedSampleMeasurementRowsComplete,
-  );
+  ) || isSampleMeasurementNodeLocked;
+  const isSampleMeasurementNodeApproved =
+    isSampleMeasurementNodeLocked &&
+    !dirtyWorkflowNodeCategories.has(SAMPLE_MEASUREMENT_WORKSPACE_CATEGORY);
+  const canShowSkuReconfirmationAction =
+    activeSkuTab === "skuInfo" &&
+    isCurrentUserAdmin &&
+    activeSkuBatchNo !== null &&
+    isActiveSkuBatchConfirmed &&
+    !isSkuContentReadOnly;
   const displayedProductPricingIsConfirmed = isWorkflowNodeConfirmed(
     PRODUCT_PRICING_WORKSPACE_CATEGORY,
     displayedProductPricingRowsComplete,
-  );
+  ) || isProductPricingNodeLocked;
   const displayedProductLimitIsConfirmed = isWorkflowNodeConfirmed(
     PRODUCT_LIMIT_WORKSPACE_CATEGORY,
     displayedProductLimitRowsComplete,
@@ -12108,6 +12547,20 @@ export default function NonIntegratedDetailClient({
     }, 2000);
   }, []);
 
+  const showSkuConfirmationPrompt = useCallback(
+    (prompt: { type: "success" | "error"; message: string }) => {
+      if (skuConfirmationPromptTimeoutRef.current) {
+        window.clearTimeout(skuConfirmationPromptTimeoutRef.current);
+      }
+      setSkuConfirmationPrompt(prompt);
+      skuConfirmationPromptTimeoutRef.current = window.setTimeout(() => {
+        setSkuConfirmationPrompt(null);
+        skuConfirmationPromptTimeoutRef.current = null;
+      }, SKU_CONFIRMATION_PROMPT_VISIBLE_MS);
+    },
+    [],
+  );
+
   const persistEditedProduct = useCallback(
     async ({
       successMessage,
@@ -12123,6 +12576,7 @@ export default function NonIntegratedDetailClient({
         openingReference?: NonIntegratedOpeningReference;
         skuItems?: NonIntegratedSkuItem[];
         skuBatchCount?: number;
+        skuBatchConfirmedAt?: Record<string, string>;
         projectStatus?: NonIntegratedProjectStatus;
         allowReadOnly?: boolean;
       };
@@ -12137,6 +12591,8 @@ export default function NonIntegratedDetailClient({
         overrides?.openingReference ?? openingReferenceRef.current;
       const nextSkuItems = overrides?.skuItems ?? skuItems;
       const nextSkuBatchCount = overrides?.skuBatchCount ?? skuBatchCount;
+      const nextSkuBatchConfirmedAt =
+        overrides?.skuBatchConfirmedAt ?? skuBatchConfirmedAt;
       const nextProjectStatus = overrides?.projectStatus ?? projectStatus;
 
       if (
@@ -12181,6 +12637,7 @@ export default function NonIntegratedDetailClient({
             nextSkuBatchCount,
             skuBatchFlowNos,
             skuBatchChangeTypes,
+            nextSkuBatchConfirmedAt,
             existingProductCreatedAt,
             existingProduct?.copiedFromProductId,
             existingProduct?.copiedFromSpu,
@@ -12246,6 +12703,7 @@ export default function NonIntegratedDetailClient({
       projectStatus,
       skuBatchCount,
       skuBatchChangeTypes,
+      skuBatchConfirmedAt,
       skuBatchFlowNos,
       skuItems,
       styleDetails,
@@ -12260,6 +12718,10 @@ export default function NonIntegratedDetailClient({
         window.clearTimeout(autoSaveNoticeTimeoutRef.current);
         autoSaveNoticeTimeoutRef.current = null;
       }
+      if (skuConfirmationPromptTimeoutRef.current) {
+        window.clearTimeout(skuConfirmationPromptTimeoutRef.current);
+        skuConfirmationPromptTimeoutRef.current = null;
+      }
     };
   }, []);
 
@@ -12638,6 +13100,7 @@ export default function NonIntegratedDetailClient({
     reviewRounds,
     showAutoSaveNotice,
     skuBatchChangeTypes,
+    skuBatchConfirmedAt,
     skuBatchCount,
     skuBatchFlowNos,
     skuItems,
@@ -13348,7 +13811,11 @@ export default function NonIntegratedDetailClient({
     setSkuItems((current) => {
       const targetItem = current.find((item) => item.id === id);
       if (!targetItem) return current;
-      if (isStockProductRecord || isImportedSkuContentLocked(targetItem)) {
+      if (
+        isStockProductRecord ||
+        isSkuBatchConfirmed(targetItem.batchNo || 1) ||
+        isImportedSkuContentLocked(targetItem)
+      ) {
         return current;
       }
 
@@ -13439,7 +13906,12 @@ export default function NonIntegratedDetailClient({
     setSkuItems((current) =>
       current.map((item, index) => {
         if (item.id !== id) return item;
-        if (isStockProductRecord || isImportedSkuContentLocked(item)) return item;
+        if (
+          isStockProductRecord ||
+          isSkuBatchConfirmed(item.batchNo || 1) ||
+          isImportedSkuContentLocked(item)
+        )
+          return item;
         return applySkuSupplierName(item, index, value);
       }),
     );
@@ -13454,7 +13926,12 @@ export default function NonIntegratedDetailClient({
     setSkuItems((current) =>
       current.map((item, index) => {
         if (item.id !== id) return item;
-        if (isStockProductRecord || isImportedSkuContentLocked(item)) return item;
+        if (
+          isStockProductRecord ||
+          isSkuBatchConfirmed(item.batchNo || 1) ||
+          isImportedSkuContentLocked(item)
+        )
+          return item;
 
         return applySkuSupplierName(item, index, item.manufacturer.trim());
       }),
@@ -13470,7 +13947,12 @@ export default function NonIntegratedDetailClient({
     setSkuItems((current) =>
       current.map((item) => {
         if (item.id !== id) return item;
-        if (isStockProductRecord || isImportedSkuContentLocked(item)) return item;
+        if (
+          isStockProductRecord ||
+          isSkuBatchConfirmed(item.batchNo || 1) ||
+          isImportedSkuContentLocked(item)
+        )
+          return item;
         return { ...item, executeStandard: value };
       }),
     );
@@ -13485,7 +13967,12 @@ export default function NonIntegratedDetailClient({
     setSkuItems((current) =>
       current.map((item) => {
         if (item.id !== id) return item;
-        if (isStockProductRecord || isImportedSkuContentLocked(item)) return item;
+        if (
+          isStockProductRecord ||
+          isSkuBatchConfirmed(item.batchNo || 1) ||
+          isImportedSkuContentLocked(item)
+        )
+          return item;
 
         const normalizedValue = item.executeStandard.trim();
         const matchedOption = resolveExecutionStandardOption(normalizedValue);
@@ -13506,6 +13993,10 @@ export default function NonIntegratedDetailClient({
     value: string,
   ) {
     if (isReadOnly) return;
+    const currentFactoryRow = productFactoryRows.find(
+      (row) => row.skuId === skuId,
+    );
+    if (currentFactoryRow?.confirmed) return;
 
     if (key === "supplierName") {
       const supplier = normalizeFactorySupplier(value);
@@ -13515,6 +14006,7 @@ export default function NonIntegratedDetailClient({
         current.map((item, index) =>
           item.id === skuId &&
           !isStockProductRecord &&
+          !isSkuBatchConfirmed(item.batchNo || 1) &&
           !isImportedSkuContentLocked(item)
             ? applySkuSupplierName(item, index, supplierName)
             : item,
@@ -13564,7 +14056,7 @@ export default function NonIntegratedDetailClient({
     key: Exclude<keyof NonIntegratedPricingRow, "skuId">,
     value: string,
   ) {
-    if (isReadOnly) return;
+    if (isReadOnly || isProductPricingNodeLocked) return;
 
     setPricingRows((current) => {
       const rowBySkuId = new Map(current.map((row) => [row.skuId, row]));
@@ -13726,7 +14218,6 @@ export default function NonIntegratedDetailClient({
 
   function closePlanningLayoutBrandPicker() {
     setPlanningLayoutBrandPickerSkuId(null);
-    setPlanningLayoutBrandPickerPosition(null);
   }
 
   function updateSampleMeasurementRow(
@@ -13734,7 +14225,7 @@ export default function NonIntegratedDetailClient({
     key: Exclude<keyof NonIntegratedSampleMeasurementRow, "skuId">,
     value: string,
   ) {
-    if (isReadOnly) return;
+    if (isReadOnly || isSampleMeasurementNodeLocked) return;
 
     setSampleMeasurementRows((current) => {
       const rowBySkuId = new Map(current.map((row) => [row.skuId, row]));
@@ -13793,6 +14284,7 @@ export default function NonIntegratedDetailClient({
     if (isReadOnly) return;
 
     const currentRow = productFactoryRows.find((row) => row.skuId === skuId);
+    if (currentRow?.confirmed) return;
     const supplier = normalizeFactorySupplier(currentRow?.supplierName ?? "");
     const supplierName =
       supplier.name || currentRow?.supplierName.trim() || "";
@@ -13860,18 +14352,67 @@ export default function NonIntegratedDetailClient({
             }
           : row,
     );
+    const allRowsConfirmed = normalizedRows.every((row) => row.confirmed);
+    const nextConfirmations = {
+      ...documentWorkspaceConfirmations,
+      [PRODUCT_FACTORY_WORKSPACE_CATEGORY]: allRowsConfirmed,
+    };
+    const nextApprovedAt = { ...documentWorkspaceApprovedAt };
+    if (allRowsConfirmed) {
+      nextApprovedAt[PRODUCT_FACTORY_WORKSPACE_CATEGORY] =
+        new Date().toISOString();
+    } else {
+      delete nextApprovedAt[PRODUCT_FACTORY_WORKSPACE_CATEGORY];
+    }
 
     setFactoryRows(normalizedRows);
-    setDocumentWorkspaceConfirmations((current) => ({
-      ...current,
-      [PRODUCT_FACTORY_WORKSPACE_CATEGORY]: normalizedRows.every(
-        (row) => row.confirmed,
-      ),
-    }));
+    setDocumentWorkspaceConfirmations(nextConfirmations);
+    setDocumentWorkspaceApprovedAt(nextApprovedAt);
     setSaveMessage("产品定厂已确认");
     setSaveMessageType("success");
   }
 
+  function handleReopenProductFactoryConfirmation() {
+    if (
+      isReadOnly ||
+      !isCurrentUserAdmin ||
+      displayedProductFactoryRows.length === 0
+    ) {
+      return;
+    }
+
+    if (isSampleMeasurementNodeLocked) {
+      setSaveMessage("样包测量节点已确认，产品定厂不能重新确认");
+      setSaveMessageType("error");
+      return;
+    }
+
+    const targetSkuIds = new Set(
+      displayedProductFactoryRows.map((row) => row.skuId),
+    );
+    const normalizedRows = normalizeFactoryRowsForPayload(productFactoryRows).map(
+      (row) =>
+        targetSkuIds.has(row.skuId)
+          ? {
+              ...row,
+              confirmed: false,
+            }
+          : row,
+    );
+    const nextConfirmations = {
+      ...documentWorkspaceConfirmations,
+      [PRODUCT_FACTORY_WORKSPACE_CATEGORY]: false,
+    };
+    const nextApprovedAt = { ...documentWorkspaceApprovedAt };
+    delete nextApprovedAt[PRODUCT_FACTORY_WORKSPACE_CATEGORY];
+
+    setFactoryRows(normalizedRows);
+    setDocumentWorkspaceConfirmations(nextConfirmations);
+    setDocumentWorkspaceApprovedAt(nextApprovedAt);
+    setSaveMessage("产品定厂已重新打开，可修改后再次确认");
+    setSaveMessageType("success");
+  }
+
   function updateStyleDetail(key: keyof StyleDetailForm, value: string) {
     if (isReadOnly) return;
     if (!selectedStyleKey) return;
@@ -14375,7 +14916,11 @@ export default function NonIntegratedDetailClient({
       if (targetIndex < 0) return current;
 
       const targetItem = current[targetIndex];
-      if (isStockProductRecord || isImportedSkuContentLocked(targetItem)) {
+      if (
+        isStockProductRecord ||
+        isSkuBatchConfirmed(targetItem.batchNo || 1) ||
+        isImportedSkuContentLocked(targetItem)
+      ) {
         return current;
       }
       const currentGroupId = targetItem.packageGroupId || targetItem.id;
@@ -16445,6 +16990,11 @@ export default function NonIntegratedDetailClient({
 
   function handleAddSku(targetBatchNo = skuBatchCount) {
     if (isSkuContentReadOnly) return;
+    if (isSkuBatchConfirmed(targetBatchNo)) {
+      setSaveMessage(`批次${targetBatchNo}的 SKU 信息已确认，不能继续新增 SKU。`);
+      setSaveMessageType("error");
+      return;
+    }
     if (activeSkuBatch === "all") {
       setSaveMessage("全部只是查看所有 SKU，请先点击最新批次后再新增 SKU。");
       setSaveMessageType("error");
@@ -16525,6 +17075,112 @@ export default function NonIntegratedDetailClient({
     setSaveMessageType("success");
   }
 
+  async function handleConfirmSkuContent() {
+    if (!activeSkuBatchNo || isSkuContentReadOnly) return;
+
+    if (isActiveSkuBatchConfirmed) {
+      showSkuConfirmationPrompt({
+        type: "success",
+        message: `批次${activeSkuBatchNo}的 SKU 信息已确认。`,
+      });
+      return;
+    }
+
+    if (isActiveSkuConfirmationPending) {
+      const confirmedAt = new Date().toISOString();
+      const nextSkuBatchConfirmedAt = {
+        ...skuBatchConfirmedAt,
+        [String(activeSkuBatchNo)]: confirmedAt,
+      };
+
+      setSkuBatchConfirmedAt(nextSkuBatchConfirmedAt);
+      setPendingSkuConfirmationBatch(null);
+
+      const saved = await persistEditedProduct({
+        successMessage: `批次${activeSkuBatchNo} SKU信息已确认`,
+        errorFallbackMessage: "SKU信息确认保存失败，请稍后再试",
+        overrides: {
+          skuBatchConfirmedAt: nextSkuBatchConfirmedAt,
+        },
+      });
+
+      if (!saved) {
+        setSkuBatchConfirmedAt(skuBatchConfirmedAt);
+      } else {
+        showSkuConfirmationPrompt({
+          type: "success",
+          message: `批次${activeSkuBatchNo} SKU信息已确认，当前批次已锁定。`,
+        });
+      }
+      return;
+    }
+
+    const issues = getSkuBatchValidationIssues(activeSkuBatchNo);
+    if (issues.length > 0) {
+      const message = `SKU信息未填写完整，暂不能确认：${issues.slice(0, 3).join("；")}${
+        issues.length > 3 ? `；还有 ${issues.length - 3} 项` : ""
+      }`;
+      setPendingSkuConfirmationBatch(null);
+      showSkuConfirmationPrompt({ type: "error", message });
+      setSaveMessage(message);
+      setSaveMessageType("error");
+      return;
+    }
+
+    if (pendingSkuConfirmationBatch !== activeSkuBatchNo) {
+      const message = `批次${activeSkuBatchNo} SKU 信息已检查完整。再次点击“确认SKU信息”后，本批次 SKU 表和批次信息会锁定。`;
+      setPendingSkuConfirmationBatch(activeSkuBatchNo);
+      showSkuConfirmationPrompt({ type: "success", message });
+      setSaveMessage(message);
+      setSaveMessageType("success");
+      return;
+    }
+  }
+
+  async function handleReopenSkuContentConfirmation() {
+    if (
+      !activeSkuBatchNo ||
+      !isCurrentUserAdmin ||
+      !isActiveSkuBatchConfirmed ||
+      isSkuContentReadOnly
+    ) {
+      return;
+    }
+
+    if (isSampleMeasurementNodeApproved) {
+      const message = "样包测量节点已确认，不能重新确认 SKU 信息。";
+      showSkuConfirmationPrompt({ type: "error", message });
+      setSaveMessage(message);
+      setSaveMessageType("error");
+      return;
+    }
+
+    const batchKey = String(activeSkuBatchNo);
+    const nextSkuBatchConfirmedAt = { ...skuBatchConfirmedAt };
+    delete nextSkuBatchConfirmedAt[batchKey];
+
+    setSkuBatchConfirmedAt(nextSkuBatchConfirmedAt);
+    setPendingSkuConfirmationBatch(null);
+
+    const saved = await persistEditedProduct({
+      successMessage: `批次${activeSkuBatchNo} SKU信息已重新打开`,
+      errorFallbackMessage: "SKU信息重新打开保存失败，请稍后再试",
+      overrides: {
+        skuBatchConfirmedAt: nextSkuBatchConfirmedAt,
+      },
+    });
+
+    if (!saved) {
+      setSkuBatchConfirmedAt(skuBatchConfirmedAt);
+      return;
+    }
+
+    showSkuConfirmationPrompt({
+      type: "success",
+      message: `批次${activeSkuBatchNo} SKU信息已重新打开，可修改后再次确认。`,
+    });
+  }
+
   const displayedSkuItems = useMemo(
     () =>
       skuItems.filter((item) =>
@@ -16534,9 +17190,34 @@ export default function NonIntegratedDetailClient({
       ),
     [activeSkuBatch, skuItems],
   );
+  const showSkuActionColumn = useMemo(
+    () =>
+      !isSkuContentReadOnly &&
+      skuItems.some((item, index) => {
+        const derivedItem = derivedSkuItems[index] ?? item;
+        const rowBatchNo = derivedItem.batchNo || item.batchNo || 1;
+
+        if (activeSkuBatch !== "all" && rowBatchNo !== activeSkuBatch) {
+          return false;
+        }
+
+        return (
+          !isSkuBatchConfirmed(rowBatchNo) &&
+          !isImportedSkuContentLocked(item)
+        );
+      }),
+    [
+      activeSkuBatch,
+      derivedSkuItems,
+      isSkuBatchConfirmed,
+      isSkuContentReadOnly,
+      skuItems,
+    ],
+  );
   const canDeleteActiveSkuBatch =
     isCurrentUserAdmin &&
     !isSkuContentReadOnly &&
+    !isActiveSkuBatchConfirmed &&
     !pendingSkuBatchDraft &&
     activeSkuBatch !== "all" &&
     activeSkuBatch > 1 &&
@@ -16641,6 +17322,11 @@ export default function NonIntegratedDetailClient({
     }
 
     const targetBatchNo = activeSkuBatch;
+    if (isSkuBatchConfirmed(targetBatchNo)) {
+      setSaveMessage(`批次${targetBatchNo}的 SKU 信息已确认，不能删除批次。`);
+      setSaveMessageType("error");
+      return;
+    }
     if (
       !window.confirm(
         `确定删除批次${targetBatchNo}吗？该批次下的 SKU 和批次信息会一起删除。`,
@@ -16681,6 +17367,11 @@ export default function NonIntegratedDetailClient({
       delete next[targetBatchKey];
       return next;
     });
+    setSkuBatchConfirmedAt((current) => {
+      const next = { ...current };
+      delete next[targetBatchKey];
+      return next;
+    });
     setPendingSkuBatchDraft(null);
     setShowSkuBatchInfo(false);
     setSaveMessage(`已删除批次${targetBatchNo}。`);
@@ -16689,6 +17380,7 @@ export default function NonIntegratedDetailClient({
 
   function handleUpdateSkuBatchChangeType(batchNo: number, value: string) {
     if (isReadOnly) return;
+    if (isSkuBatchConfirmed(batchNo)) return;
     setSkuBatchChangeTypes((current) => ({
       ...current,
       [String(batchNo)]: value,
@@ -16699,6 +17391,7 @@ export default function NonIntegratedDetailClient({
 
   function handleUpdateSkuBatchFlowNo(batchNo: number, value: string) {
     if (isReadOnly) return;
+    if (isSkuBatchConfirmed(batchNo)) return;
     setSkuBatchFlowNos((current) => ({
       ...current,
       [String(batchNo)]: value,
@@ -16721,7 +17414,12 @@ export default function NonIntegratedDetailClient({
     if (isReadOnly) return;
     const targetItem = skuItems.find((item) => item.id === id);
     if (!targetItem) return;
-    if (isStockProductRecord || isImportedSkuContentLocked(targetItem)) return;
+    if (
+      isStockProductRecord ||
+      isSkuBatchConfirmed(targetItem.batchNo || 1) ||
+      isImportedSkuContentLocked(targetItem)
+    )
+      return;
 
     const nextItems = skuItems.filter((item) =>
       targetItem.packageGroupId
@@ -16790,6 +17488,7 @@ export default function NonIntegratedDetailClient({
           size: skuItems[index]?.size?.trim() ?? "",
           color: skuItems[index]?.color?.trim() ?? "",
           material: skuItems[index]?.material?.trim() ?? "",
+          boardMaterialType: skuItems[index]?.boardMaterialType?.trim() ?? "",
           versionNo: item.versionNo.trim(),
           attributeCode: skuItems[index]?.attributeCode?.trim() ?? "",
           drawingId: item.drawingId.trim(),
@@ -16825,6 +17524,12 @@ export default function NonIntegratedDetailClient({
     event: ChangeEvent<HTMLInputElement>,
   ) {
     if (isReadOnly) return;
+    if (activeSkuBatchNo && isSkuBatchConfirmed(activeSkuBatchNo)) {
+      setSaveMessage(`批次${activeSkuBatchNo}的 SKU 信息已确认，不能上传资料。`);
+      setSaveMessageType("error");
+      event.target.value = "";
+      return;
+    }
     const file = event.target.files?.[0];
     if (!file) return;
 
@@ -17624,6 +18329,7 @@ export default function NonIntegratedDetailClient({
           skuBatchCount,
           skuBatchFlowNos,
           skuBatchChangeTypes,
+          skuBatchConfirmedAt,
           productCreatedAt,
           undefined,
           undefined,
@@ -18622,18 +19328,6 @@ export default function NonIntegratedDetailClient({
             </div>
           ) : activeProductFactoryTab === "factoryInfo" ? (
             <div className="max-w-full overflow-x-auto overflow-y-hidden rounded-apple-lg border border-apple-separator pb-2">
-              <datalist id="non-integrated-supplier-name-options">
-                {SUPPLIER_DIRECTORY.map((entry) => (
-                  <option key={entry.code} value={entry.name}>
-                    {entry.code}
-                  </option>
-                ))}
-              </datalist>
-              <datalist id="non-integrated-execution-standard-options">
-                {EXECUTION_STANDARD_OPTIONS.map((option) => (
-                  <option key={option} value={option} />
-                ))}
-              </datalist>
               <table className="min-w-[1880px] w-full border-collapse text-xs">
                 <thead className="bg-apple-bg-secondary/40 text-apple-label-secondary">
                   <tr>
@@ -18734,25 +19428,21 @@ export default function NonIntegratedDetailClient({
                         {renderFactoryInput(row, "leadTime", "请输入交期")}
                       </td>
                       <td className="px-2 py-2">
-                        <select
+                        <InlineSelect
+                          ariaLabel="安装方式"
                           value={row.installMethod}
-                          disabled
-                          onChange={(event) =>
+                          options={INSTALL_METHOD_OPTIONS}
+                          placeholder="请选择"
+                          readOnly
+                          onChange={(value) =>
                             updateProductFactoryRow(
                               row.skuId,
                               "installMethod",
-                              event.target.value,
+                              value,
                             )
                           }
-                          className="h-8 w-full min-w-[96px] rounded border border-apple-separator bg-apple-bg-secondary px-2 text-xs text-apple-label-primary outline-none disabled:bg-apple-bg-primary disabled:text-apple-label-secondary"
-                        >
-                          <option value="">请选择</option>
-                          {INSTALL_METHOD_OPTIONS.map((option) => (
-                            <option key={option} value={option}>
-                              {option}
-                            </option>
-                          ))}
-                        </select>
+                          buttonClassName="h-8 w-full min-w-[96px] rounded border border-apple-separator bg-apple-bg-secondary px-2 text-xs text-apple-label-primary outline-none disabled:bg-apple-bg-primary disabled:text-apple-label-secondary"
+                        />
                       </td>
                       <td className="px-2 py-2">
                         {renderFactoryInput(
@@ -18874,7 +19564,7 @@ export default function NonIntegratedDetailClient({
       <SkuRowField
         value={row[key]}
         placeholder={placeholder}
-        readOnly={isReadOnly}
+        readOnly={isReadOnly || isSampleMeasurementNodeLocked}
         mode="singleLineResizable"
         tone="manual"
         testId={`sample-measurement-${key}-${row.skuId}`}
@@ -19038,8 +19728,6 @@ export default function NonIntegratedDetailClient({
       minWidth?: string;
       onChange?: (value: string) => void;
     }) => {
-      const listId = `planning-layout-${field}-${row.skuId}`;
-
       return (
         <div
           className={`flex h-8 w-max items-center gap-1 rounded border border-apple-separator px-2 ${
@@ -19048,16 +19736,13 @@ export default function NonIntegratedDetailClient({
           style={{ minWidth }}
         >
           <Search className="h-3.5 w-3.5 shrink-0 text-apple-label-tertiary" />
-          <input
-            type="text"
-            aria-label={`空间布局${label}`}
-            data-testid={`planning-layout-${field}-${row.skuId}`}
-            list={isReadOnly ? undefined : listId}
+          <InlineSuggestionInput
+            ariaLabel={`空间布局${label}`}
+            dataTestId={`planning-layout-${field}-${row.skuId}`}
             value={value}
             readOnly={isReadOnly}
-            autoComplete="off"
-            onChange={(event) => {
-              const nextValue = event.target.value;
+            options={options}
+            onChange={(nextValue) => {
               if (onChange) {
                 onChange(nextValue);
                 return;
@@ -19068,17 +19753,14 @@ export default function NonIntegratedDetailClient({
               }));
             }}
             placeholder={`选择${label}`}
-            className={`min-w-0 flex-1 bg-transparent text-xs outline-none placeholder:text-apple-label-tertiary ${
+            wrapperClassName="relative min-w-0 flex-1"
+            inputClassName={`min-w-0 w-full bg-transparent pr-7 text-xs outline-none placeholder:text-apple-label-tertiary ${
               isReadOnly
                 ? "text-apple-label-secondary"
                 : "text-apple-label-primary"
             }`}
+            panelClassName="absolute left-0 top-[calc(100%+6px)] z-50 max-h-56 min-w-full overflow-auto rounded-apple-lg border border-apple-separator bg-apple-bg-primary p-1 shadow-apple-md"
           />
-          <datalist id={listId}>
-            {options.map((option) => (
-              <option key={option} value={option} />
-            ))}
-          </datalist>
         </div>
       );
     };
@@ -19101,7 +19783,6 @@ export default function NonIntegratedDetailClient({
     }) => {
       const draftKey = getPlanningLayoutDraftKey(row.skuId, field);
       const draftValue = planningLayoutDraftInputs[draftKey] ?? "";
-      const listId = `planning-layout-${field}-${row.skuId}`;
       const selectedValues = getUniqueNonEmptyStrings(values);
 
       return (
@@ -19140,48 +19821,39 @@ export default function NonIntegratedDetailClient({
               )}
             </div>
             {isReadOnly ? null : (
-              <div className="relative ml-auto h-6 w-10 shrink-0">
-                <input
-                  type="text"
-                  aria-label={`空间布局${label}`}
-                  data-testid={`planning-layout-${field}-draft-${row.skuId}`}
-                  list={listId}
-                  value={draftValue}
-                  autoComplete="off"
-                  onChange={(event) => {
-                    const nextValue = event.target.value;
-                    updatePlanningLayoutDraftInput(row.skuId, field, nextValue);
-                    if (!autoAddOnChange) return;
-                    if (!options.includes(nextValue.trim())) return;
-                    addPlanningLayoutListValue(row.skuId, field, nextValue);
-                    setPlanningLayoutDraftInputs((current) => ({
-                      ...current,
-                      [draftKey]: "",
-                    }));
-                  }}
-                  onKeyDown={(event) => {
-                    if (event.key !== "Enter") return;
-                    event.preventDefault();
-                    addPlanningLayoutListValue(row.skuId, field);
-                  }}
-                  onBlur={() => addPlanningLayoutListValue(row.skuId, field)}
-                  placeholder=""
-                  className="h-6 w-full rounded-apple-sm border border-apple-separator bg-apple-bg-primary px-1 pr-3 text-center text-xs text-apple-label-primary outline-none placeholder:text-apple-label-tertiary"
-                />
-                <span
-                  aria-hidden="true"
-                  className="pointer-events-none absolute right-1 top-1/2 -translate-y-1/2 text-[9px] leading-none text-apple-label-tertiary"
-                >
-                  ⌄
-                </span>
-              </div>
+              <InlineSuggestionInput
+                ariaLabel={`空间布局${label}`}
+                dataTestId={`planning-layout-${field}-draft-${row.skuId}`}
+                value={draftValue}
+                options={options}
+                placeholder=""
+                wrapperClassName="relative ml-auto h-6 w-10 shrink-0"
+                inputClassName="h-6 w-full rounded-apple-sm border border-apple-separator bg-apple-bg-primary px-1 pr-5 text-center text-xs text-apple-label-primary outline-none placeholder:text-apple-label-tertiary"
+                panelClassName="absolute left-0 top-[calc(100%+6px)] z-50 max-h-56 w-44 overflow-auto rounded-apple-lg border border-apple-separator bg-apple-bg-primary p-1 shadow-apple-md"
+                closeOnChange={(nextValue) =>
+                  autoAddOnChange && options.includes(nextValue.trim())
+                }
+                onChange={(nextValue) => {
+                  updatePlanningLayoutDraftInput(row.skuId, field, nextValue);
+                  if (!autoAddOnChange) return;
+                  if (!options.includes(nextValue.trim())) return;
+                  addPlanningLayoutListValue(row.skuId, field, nextValue);
+                  setPlanningLayoutDraftInputs((current) => ({
+                    ...current,
+                    [draftKey]: "",
+                  }));
+                }}
+                onSelect={(selectedOption) => {
+                  addPlanningLayoutListValue(row.skuId, field, selectedOption);
+                  setPlanningLayoutDraftInputs((current) => ({
+                    ...current,
+                    [draftKey]: "",
+                  }));
+                }}
+                onCommit={() => addPlanningLayoutListValue(row.skuId, field)}
+              />
             )}
           </div>
-          <datalist id={listId}>
-            {options.map((option) => (
-              <option key={option} value={option} />
-            ))}
-          </datalist>
         </div>
       );
     };
@@ -19199,10 +19871,6 @@ export default function NonIntegratedDetailClient({
       const selectedValues = getUniqueNonEmptyStrings(values);
       const pickerOpen = planningLayoutBrandPickerSkuId === row.skuId;
       const pickerDropdownId = `planning-layout-brands-dropdown-${row.skuId}`;
-      const pickerPosition =
-        pickerOpen && planningLayoutBrandPickerPosition?.skuId === row.skuId
-          ? planningLayoutBrandPickerPosition
-          : null;
 
       return (
         <div className="w-max" style={{ minWidth }}>
@@ -19247,34 +19915,19 @@ export default function NonIntegratedDetailClient({
                   aria-expanded={pickerOpen}
                   aria-controls={pickerOpen ? pickerDropdownId : undefined}
                   data-testid={`planning-layout-brands-picker-${row.skuId}`}
-                  onClick={(event) => {
-                    const buttonRect =
-                      event.currentTarget.getBoundingClientRect();
+                  onClick={() => {
                     setPlanningLayoutBrandPickerSkuId((current) =>
                       current === row.skuId ? null : row.skuId,
                     );
-                    setPlanningLayoutBrandPickerPosition((current) =>
-                      current?.skuId === row.skuId
-                        ? null
-                        : {
-                            skuId: row.skuId,
-                            left: buttonRect.right - 148,
-                            top: buttonRect.bottom + 6,
-                          },
-                    );
                   }}
                   className="inline-flex h-5 w-5 shrink-0 items-center justify-center rounded-apple-sm bg-black text-[10px] text-white transition-opacity hover:opacity-80"
                 >
                   ✓
                 </button>
-                {pickerOpen && pickerPosition ? (
+                {pickerOpen ? (
                   <div
                     id={pickerDropdownId}
-                    className="fixed z-50 min-w-[148px] rounded-apple-lg border border-apple-separator bg-apple-bg-primary p-2 shadow-apple-md"
-                    style={{
-                      left: Math.max(8, pickerPosition.left),
-                      top: pickerPosition.top,
-                    }}
+                    className="absolute left-0 top-[calc(100%+6px)] z-50 min-w-[148px] rounded-apple-lg border border-apple-separator bg-apple-bg-primary p-2 shadow-apple-md"
                   >
                     <div className="space-y-1.5">
                       {options.map((brand) => {
@@ -19718,25 +20371,14 @@ export default function NonIntegratedDetailClient({
   }
 
   function renderProductPricingWorkspace() {
+    const isJstPricingPushEnabled = false;
     const renderReadOnlyCell = (value: string) => (
       <div className="min-w-[112px] rounded border border-apple-separator bg-apple-bg-secondary px-2 py-1.5 text-xs text-apple-label-primary">
         {value || "-"}
       </div>
     );
-    const renderPricingInput = (
-      row: ProductPricingDisplayRow,
-      key: Exclude<keyof NonIntegratedPricingRow, "skuId">,
-      placeholder: string,
-    ) => (
-      <SkuRowField
-        value={row[key]}
-        placeholder={placeholder}
-        readOnly={isReadOnly}
-        mode="singleLineResizable"
-        onChange={(value) => updateProductPricingRow(row.skuId, key, value)}
-      />
-    );
     const adjustCostPrice = (row: ProductPricingDisplayRow, offset: number) => {
+      if (isReadOnly || isProductPricingNodeLocked) return;
       const currentValue = Number(row.costPrice);
       const nextValue = Math.max(
         0,
@@ -19767,7 +20409,7 @@ export default function NonIntegratedDetailClient({
             </div>
           ) : (
             <div className="max-w-full overflow-x-auto overflow-y-hidden rounded-apple-lg border border-apple-separator pb-2">
-              <table className="min-w-[1400px] w-full border-collapse text-xs">
+              <table className="min-w-[1280px] w-full border-collapse text-xs">
                 <thead className="bg-apple-bg-secondary/40 text-apple-label-secondary">
                   <tr>
                     {[
@@ -19778,8 +20420,7 @@ export default function NonIntegratedDetailClient({
                       "规格名称",
                       "供应商名称",
                       "成本价",
-                      "商品标签",
-                      "查看条码分摊",
+                      "是否录入系统",
                     ].map((label) => (
                       <th
                         key={label}
@@ -19791,81 +20432,104 @@ export default function NonIntegratedDetailClient({
                   </tr>
                 </thead>
                 <tbody>
-                  {displayedProductPricingRows.map((row) => (
-                    <tr
-                      key={row.skuId}
-                      className="border-b border-apple-separator last:border-b-0"
-                    >
-                      <td className="px-3 py-2">
-                        {renderReadOnlyCell(row.model)}
-                      </td>
-                      <td className="px-3 py-2">
-                        {renderReadOnlyCell(row.skuCode)}
-                      </td>
-                      <td className="px-3 py-2">
-                        {renderReadOnlyCell(row.barcode)}
-                      </td>
-                      <td className="px-3 py-2">
-                        {renderReadOnlyCell(row.setCount)}
-                      </td>
-                      <td className="px-3 py-2">
-                        {renderReadOnlyCell(row.specName)}
-                      </td>
-                      <td className="px-3 py-2">
-                        {renderReadOnlyCell(row.supplierName)}
-                      </td>
-                      <td className="px-3 py-2">
-                        <div className="flex min-w-[136px] overflow-hidden rounded border border-apple-separator bg-apple-bg-secondary text-xs text-apple-label-primary">
-                          <button
-                            type="button"
-                            onClick={() => adjustCostPrice(row, -1)}
-                            disabled={isReadOnly}
-                            className="h-8 w-9 border-r border-apple-separator text-apple-label-secondary transition hover:bg-apple-bg-primary disabled:opacity-40"
-                            aria-label="减少成本价"
-                          >
-                            -
-                          </button>
-                          <input
-                            value={row.costPrice}
-                            onChange={(event) =>
-                              updateProductPricingRow(
-                                row.skuId,
-                                "costPrice",
-                                event.target.value,
-                              )
-                            }
-                            readOnly={isReadOnly}
-                            placeholder="0"
-                            className="h-8 w-16 bg-transparent px-2 text-center outline-none placeholder:text-apple-label-tertiary"
-                          />
-                          <button
-                            type="button"
-                            onClick={() => adjustCostPrice(row, 1)}
-                            disabled={isReadOnly}
-                            className="h-8 w-9 border-l border-apple-separator text-apple-label-secondary transition hover:bg-apple-bg-primary disabled:opacity-40"
-                            aria-label="增加成本价"
-                          >
-                            +
-                          </button>
-                        </div>
-                      </td>
-                      <td className="px-3 py-2">
-                        {renderPricingInput(row, "productTag", "请输入商品标签")}
-                      </td>
-                      <td className="px-3 py-2">
-                        <button
-                          type="button"
-                          className="inline-flex h-8 min-w-[56px] items-center justify-center rounded-full bg-[#1f8bff] px-3 text-xs font-apple-medium text-white shadow-sm transition hover:bg-[#1478df]"
-                          onClick={() => {
-                            setSaveMessage("条码分摊明细后续配置");
-                            setSaveMessageType("success");
-                          }}
-                        >
-                          查看
-                        </button>
-                      </td>
-                    </tr>
-                  ))}
+                  {displayedProductPricingRows.map((row) => {
+                    const isSystemEntered =
+                      isJstPricingPushEnabled &&
+                      row.systemEnteredAt.trim().length > 0;
+                    const pricingReadyForFuturePush =
+                      row.costPrice.trim().length > 0;
+
+                    return (
+                      <tr
+                        key={row.skuId}
+                        className="border-b border-apple-separator last:border-b-0"
+                      >
+                        <td className="px-3 py-2">
+                          {renderReadOnlyCell(row.model)}
+                        </td>
+                        <td className="px-3 py-2">
+                          {renderReadOnlyCell(row.skuCode)}
+                        </td>
+                        <td className="px-3 py-2">
+                          {renderReadOnlyCell(row.barcode)}
+                        </td>
+                        <td className="px-3 py-2">
+                          {renderReadOnlyCell(row.setCount)}
+                        </td>
+                        <td className="px-3 py-2">
+                          {renderReadOnlyCell(row.specName)}
+                        </td>
+                        <td className="px-3 py-2">
+                          {renderReadOnlyCell(row.supplierName)}
+                        </td>
+                        <td className="px-3 py-2">
+                          <div className="flex min-w-[136px] overflow-hidden rounded border border-apple-separator bg-apple-bg-secondary text-xs text-apple-label-primary">
+                            <button
+                              type="button"
+                              onClick={() => adjustCostPrice(row, -1)}
+                              disabled={isReadOnly || isProductPricingNodeLocked}
+                              className="h-8 w-9 border-r border-apple-separator text-apple-label-secondary transition hover:bg-apple-bg-primary disabled:opacity-40"
+                              aria-label="减少成本价"
+                            >
+                              -
+                            </button>
+                            <input
+                              value={row.costPrice}
+                              onChange={(event) =>
+                                updateProductPricingRow(
+                                  row.skuId,
+                                  "costPrice",
+                                  event.target.value,
+                                )
+                              }
+                              readOnly={isReadOnly || isProductPricingNodeLocked}
+                              placeholder="0"
+                              className="h-8 w-16 bg-transparent px-2 text-center outline-none placeholder:text-apple-label-tertiary"
+                            />
+                            <button
+                              type="button"
+                              onClick={() => adjustCostPrice(row, 1)}
+                              disabled={isReadOnly || isProductPricingNodeLocked}
+                              className="h-8 w-9 border-l border-apple-separator text-apple-label-secondary transition hover:bg-apple-bg-primary disabled:opacity-40"
+                              aria-label="增加成本价"
+                            >
+                              +
+                            </button>
+                          </div>
+                        </td>
+                        <td className="px-3 py-2">
+                          <div className="flex min-w-[168px] items-center gap-2">
+                            <span
+                              className={`inline-flex h-6 min-w-[52px] items-center justify-center rounded-full px-2 text-[11px] font-apple-medium ${
+                                isSystemEntered
+                                  ? "bg-[#dff7e8] text-[#137a38]"
+                                  : "bg-[#fff3df] text-[#9b6511]"
+                              }`}
+                            >
+                              {isSystemEntered ? "已录入" : "未录入"}
+                            </span>
+                            <button
+                              type="button"
+                              disabled
+                              title={
+                                isSystemEntered
+                                  ? "当前 SKU 已录入系统，后续以聚水潭回传状态为准"
+                                  : isJstPricingPushEnabled &&
+                                      pricingReadyForFuturePush
+                                    ? "请由采购/核价确认推送"
+                                    : pricingReadyForFuturePush
+                                      ? "聚水潭接口未接入，暂不可确认推送"
+                                      : "请先填写成本价；聚水潭接口未接入，暂不可确认推送"
+                              }
+                              className="inline-flex h-7 min-w-[52px] items-center justify-center rounded-full bg-[#1f8bff] px-3 text-xs font-apple-medium text-white shadow-sm transition hover:bg-[#1478df] disabled:cursor-not-allowed disabled:bg-apple-bg-tertiary disabled:text-apple-label-tertiary disabled:shadow-none"
+                            >
+                              确认推送
+                            </button>
+                          </div>
+                        </td>
+                      </tr>
+                    );
+                  })}
                 </tbody>
               </table>
             </div>
@@ -20136,24 +20800,21 @@ function renderFactoryQualityWorkspace() {
                           />
                         </td>
                         <td className="px-3 py-2">
-                          <select
-                            aria-label={`${row.model || row.skuCode}质检结论`}
+                          <InlineSelect
+                            ariaLabel={`${row.model || row.skuCode}质检结论`}
                             value={row.conclusion}
-                            disabled={isReadOnly}
-                            onChange={(event) =>
+                            options={["待检", "合格", "异常", "退回"]}
+                            readOnly={isReadOnly}
+                            onChange={(value) =>
                               updateFirstQualityRow(
                                 row.skuId,
                                 "conclusion",
-                                event.target.value,
+                                value,
                               )
                             }
-                            className="h-8 w-[92px] rounded border border-apple-separator bg-apple-bg-secondary px-2 text-xs text-apple-label-primary outline-none disabled:bg-apple-bg-primary disabled:text-apple-label-secondary"
-                          >
-                            <option>待检</option>
-                            <option>合格</option>
-                            <option>异常</option>
-                            <option>退回</option>
-                          </select>
+                            buttonClassName="h-8 w-[92px] rounded border border-apple-separator bg-apple-bg-secondary px-2 text-xs text-apple-label-primary outline-none disabled:bg-apple-bg-primary disabled:text-apple-label-secondary"
+                            panelClassName="absolute left-0 top-[calc(100%+4px)] z-50 max-h-48 min-w-full overflow-auto rounded-apple-lg border border-apple-separator bg-apple-bg-primary p-1 shadow-apple-md"
+                          />
                         </td>
                         <td className="px-3 py-2">
                           <textarea
@@ -20477,7 +21138,6 @@ function renderFactoryQualityWorkspace() {
       label: string;
       type?: BasicFieldType;
       options?: string[];
-      datalistId?: string;
       placeholder?: string;
       className?: string;
     }[] = [
@@ -20494,13 +21154,11 @@ function renderFactoryQualityWorkspace() {
       {
         key: "salesCategory",
         label: "二级类目",
-        datalistId: openingReferenceSecondaryCategoryDatalistId,
         placeholder: "如：桌类",
       },
       {
         key: "productCategory",
         label: "商品类目",
-        datalistId: openingReferenceProductCategoryDatalistId,
         placeholder: "如：书桌",
       },
       {
@@ -20510,19 +21168,16 @@ function renderFactoryQualityWorkspace() {
       {
         key: "designer",
         label: "外观设计师",
-        datalistId: openingReferenceDesignerDatalistId,
         placeholder: "请输入外观设计师",
       },
       {
         key: "structureDesigner",
         label: "结构设计师",
-        datalistId: openingReferenceDesignerDatalistId,
         placeholder: "请输入结构设计师",
       },
       {
         key: "planningOwner",
         label: "企划负责人",
-        datalistId: openingReferencePlanningOwnerDatalistId,
         placeholder: "请输入企划负责人",
       },
     ];
@@ -20531,7 +21186,6 @@ function renderFactoryQualityWorkspace() {
       label: string;
       type?: BasicFieldType;
       options?: string[];
-      datalistId?: string;
       placeholder?: string;
       className?: string;
     }[] = [
@@ -20615,13 +21269,27 @@ function renderFactoryQualityWorkspace() {
       label: string;
       type?: BasicFieldType;
       options?: string[];
-      datalistId?: string;
       placeholder?: string;
       className?: string;
     }) => {
       const fieldReadOnly =
         isSingleValueBrandReadOnly(field.key, isReadOnly) ||
         isLockedCategoryOpeningReferenceField(field.key);
+      const fieldOptions =
+        field.type === "select"
+          ? field.options
+          : field.key === "salesCategory"
+            ? openingReferenceSecondaryCategoryOptions
+            : field.key === "productCategory"
+              ? openingReferenceProductCategoryOptions
+              : field.key === "designer" ||
+                  field.key === "structureDesigner"
+                ? openingReferenceDesignerOptions
+                : field.key === "planningOwner"
+                  ? openingReferencePlanningOwnerOptions
+                  : field.key === "brand"
+                    ? BRAND_OPTIONS
+                    : field.options;
 
       return (
         <div
@@ -20649,36 +21317,33 @@ function renderFactoryQualityWorkspace() {
               }`}
             />
           ) : field.type === "select" ? (
-            <select
-              aria-label={field.label}
+            <InlineSelect
+              ariaLabel={field.label}
               value={openingReference[field.key]}
-              onChange={(event) =>
-                handleOpeningReferenceFieldChange(field.key, event.target.value)
+              options={field.options ?? []}
+              readOnly={fieldReadOnly}
+              onChange={(value) =>
+                handleOpeningReferenceFieldChange(field.key, value)
               }
-              disabled={fieldReadOnly}
-              className={`h-8 w-full rounded-apple-md border border-apple-separator px-2 text-xs text-apple-label-primary outline-none ${
+              buttonClassName={`h-8 w-full rounded-apple-md border border-apple-separator px-2 text-xs text-apple-label-primary outline-none disabled:cursor-not-allowed ${
                 fieldReadOnly
                   ? "bg-apple-bg-primary text-apple-label-secondary"
                   : "bg-apple-bg-secondary"
               }`}
-            >
-              {(field.options ?? []).map((option) => (
-                <option key={option} value={option}>
-                  {option}
-                </option>
-              ))}
-            </select>
+            />
           ) : (
-            <input
-              aria-label={field.label}
-              list={field.datalistId}
+            <InlineSuggestionInput
+              ariaLabel={field.label}
               value={openingReference[field.key]}
-              onChange={(event) =>
-                handleOpeningReferenceFieldChange(field.key, event.target.value)
+              onChange={(nextValue) =>
+                handleOpeningReferenceFieldChange(field.key, nextValue)
               }
+              options={fieldOptions}
               placeholder={field.placeholder}
               readOnly={fieldReadOnly}
-              className={`h-8 w-full rounded-apple-md border border-apple-separator px-2 text-xs text-apple-label-primary outline-none ${
+              inputClassName={`h-8 w-full rounded-apple-md border border-apple-separator px-2 text-xs text-apple-label-primary outline-none ${
+                !fieldReadOnly && (fieldOptions ?? []).length > 0 ? "pr-8" : ""
+              } ${
                 fieldReadOnly
                   ? "bg-apple-bg-primary text-apple-label-secondary"
                   : "bg-apple-bg-secondary"
@@ -20711,35 +21376,6 @@ function renderFactoryQualityWorkspace() {
         </div>
 
         <div className="min-h-0 flex-1 overflow-y-auto p-2.5">
-          {openingReferenceSecondaryCategoryOptions.length > 0 ? (
-            <datalist id={openingReferenceSecondaryCategoryDatalistId}>
-              {openingReferenceSecondaryCategoryOptions.map((option) => (
-                <option key={option} value={option} />
-              ))}
-            </datalist>
-          ) : null}
-          {openingReferenceProductCategoryOptions.length > 0 ? (
-            <datalist id={openingReferenceProductCategoryDatalistId}>
-              {openingReferenceProductCategoryOptions.map((option) => (
-                <option key={option} value={option} />
-              ))}
-            </datalist>
-          ) : null}
-          {openingReferenceDesignerOptions.length > 0 ? (
-            <datalist id={openingReferenceDesignerDatalistId}>
-              {openingReferenceDesignerOptions.map((option) => (
-                <option key={option} value={option} />
-              ))}
-            </datalist>
-          ) : null}
-          {openingReferencePlanningOwnerOptions.length > 0 ? (
-            <datalist id={openingReferencePlanningOwnerDatalistId}>
-              {openingReferencePlanningOwnerOptions.map((option) => (
-                <option key={option} value={option} />
-              ))}
-            </datalist>
-          ) : null}
-
           {mode !== "create" ? (
             <div className="mb-2.5 rounded-apple-xl border border-apple-separator bg-apple-bg-secondary/15 p-3">
               <ApprovalWorkflowWorkspace
@@ -21069,24 +21705,19 @@ function renderFactoryQualityWorkspace() {
                       1
                     </td>
                     <td className="border-b border-r border-apple-separator p-0">
-                      <select
-                        aria-label="专利状态"
+                      <InlineSelect
+                        ariaLabel="专利状态"
                         value={patentApplication.patentStatus || "待确认"}
-                        onChange={(event) =>
+                        options={PATENT_APPLICATION_STATUS_OPTIONS}
+                        readOnly={isReadOnly}
+                        onChange={(value) =>
                           handlePatentApplicationFieldChange(
                             "patentStatus",
-                            event.target.value,
+                            value,
                           )
                         }
-                        disabled={isReadOnly}
-                        className={tableSelectClassName}
-                      >
-                        {PATENT_APPLICATION_STATUS_OPTIONS.map((option) => (
-                          <option key={option || "empty"} value={option}>
-                            {option}
-                          </option>
-                        ))}
-                      </select>
+                        buttonClassName={tableSelectClassName}
+                      />
                     </td>
                     <td className="border-b border-r border-apple-separator px-2 py-1">
                       {linkedImage ? (
@@ -21144,44 +21775,34 @@ function renderFactoryQualityWorkspace() {
                       />
                     </td>
                     <td className="border-b border-r border-apple-separator p-0">
-                      <select
-                        aria-label="是否SA"
+                      <InlineSelect
+                        ariaLabel="是否SA"
                         value={patentApplication.saRequired || "否"}
-                        onChange={(event) =>
+                        options={PATENT_APPLICATION_SA_REQUIRED_OPTIONS}
+                        readOnly={isReadOnly}
+                        onChange={(value) =>
                           handlePatentApplicationFieldChange(
                             "saRequired",
-                            event.target.value,
+                            value,
                           )
                         }
-                        disabled={isReadOnly}
-                        className={tableSelectClassName}
-                      >
-                        {PATENT_APPLICATION_SA_REQUIRED_OPTIONS.map((option) => (
-                          <option key={option || "empty"} value={option}>
-                            {option}
-                          </option>
-                        ))}
-                      </select>
+                        buttonClassName={tableSelectClassName}
+                      />
                     </td>
                     <td className="border-b border-r border-apple-separator p-0">
-                      <select
-                        aria-label="销售状态"
+                      <InlineSelect
+                        ariaLabel="销售状态"
                         value={patentApplication.salesStatus || "在售"}
-                        onChange={(event) =>
+                        options={PATENT_APPLICATION_SALES_STATUS_OPTIONS}
+                        readOnly={isReadOnly}
+                        onChange={(value) =>
                           handlePatentApplicationFieldChange(
                             "salesStatus",
-                            event.target.value,
+                            value,
                           )
                         }
-                        disabled={isReadOnly}
-                        className={tableSelectClassName}
-                      >
-                        {PATENT_APPLICATION_SALES_STATUS_OPTIONS.map((option) => (
-                          <option key={option || "empty"} value={option}>
-                            {option}
-                          </option>
-                        ))}
-                      </select>
+                        buttonClassName={tableSelectClassName}
+                      />
                     </td>
                     <td className="border-b border-r border-apple-separator p-0">
                       <input
@@ -23217,24 +23838,6 @@ function renderFactoryQualityWorkspace() {
                               readOnly={isReadOnly}
                             />
                             <div className="flex flex-col justify-center gap-4">
-                              {isSeriesDevelopment ? (
-                                <>
-                                  <datalist id={basicInfoSecondaryCategoryDatalistId}>
-                                    {basicInfoSecondaryCategoryOptions.map(
-                                      (option) => (
-                                        <option key={option} value={option} />
-                                      ),
-                                    )}
-                                  </datalist>
-                                  <datalist id={basicInfoProductCategoryDatalistId}>
-                                    {basicInfoProductCategoryOptions.map(
-                                      (option) => (
-                                        <option key={option} value={option} />
-                                      ),
-                                    )}
-                                  </datalist>
-                                </>
-                              ) : null}
                               {isStockProductCreate ? (
                                 <>
                                   <BasicField
@@ -23311,7 +23914,7 @@ function renderFactoryQualityWorkspace() {
                                         label="二级类目"
                                         required
                                         placeholder="如：桌类"
-                                        datalistId={basicInfoSecondaryCategoryDatalistId}
+                                        options={basicInfoSecondaryCategoryOptions}
                                         value={formValues.salesCategory}
                                         readOnly={isReadOnly}
                                         compact
@@ -23323,7 +23926,7 @@ function renderFactoryQualityWorkspace() {
                                         label="商品类目"
                                         required
                                         placeholder="如：书桌"
-                                        datalistId={basicInfoProductCategoryDatalistId}
+                                        options={basicInfoProductCategoryOptions}
                                         value={formValues.productCategory}
                                         readOnly={isReadOnly}
                                         compact
@@ -23346,7 +23949,7 @@ function renderFactoryQualityWorkspace() {
                                 label="外观设计师"
                                 required
                                 placeholder="请输入外观设计师"
-                                datalistId={openingReferenceDesignerDatalistId}
+                                options={basicInfoDesignerOptions}
                                 value={openingReference.designer}
                                 readOnly={isReadOnly}
                                 compact
@@ -23372,7 +23975,7 @@ function renderFactoryQualityWorkspace() {
                                   label="企划负责人"
                                   required
                                   placeholder="请输入企划负责人"
-                                  datalistId={openingReferencePlanningOwnerDatalistId}
+                                  options={basicInfoPlanningOwnerOptions}
                                   value={openingReference.planningOwner}
                                   readOnly={isReadOnly}
                                   compact
@@ -23417,50 +24020,6 @@ function renderFactoryQualityWorkspace() {
                           }
                         >
                           <div className="grid gap-3 xl:grid-cols-[220px_minmax(0,1fr)]">
-                            {basicInfoSecondaryCategoryOptions.length > 0 ? (
-                              <datalist id={basicInfoSecondaryCategoryDatalistId}>
-                                {basicInfoSecondaryCategoryOptions.map(
-                                  (option) => (
-                                    <option key={option} value={option} />
-                                  ),
-                                )}
-                              </datalist>
-                            ) : null}
-                            {basicInfoProductCategoryOptions.length > 0 ? (
-                              <datalist id={basicInfoProductCategoryDatalistId}>
-                                {basicInfoProductCategoryOptions.map((option) => (
-                                  <option key={option} value={option} />
-                                ))}
-                              </datalist>
-                            ) : null}
-                            {basicInfoDesignerOptions.length > 0 ? (
-                              <datalist id={basicInfoDesignerDatalistId}>
-                                {basicInfoDesignerOptions.map((option) => (
-                                  <option key={option} value={option} />
-                                ))}
-                              </datalist>
-                            ) : null}
-                            {basicInfoPlanningOwnerOptions.length > 0 ? (
-                              <datalist id={basicInfoPlanningOwnerDatalistId}>
-                                {basicInfoPlanningOwnerOptions.map((option) => (
-                                  <option key={option} value={option} />
-                                ))}
-                              </datalist>
-                            ) : null}
-                            {basicInfoOperationOwnerOptions.length > 0 ? (
-                              <datalist id={basicInfoOperationOwnerDatalistId}>
-                                {basicInfoOperationOwnerOptions.map((option) => (
-                                  <option key={option} value={option} />
-                                ))}
-                              </datalist>
-                            ) : null}
-                            {basicInfoPurchasingOwnerOptions.length > 0 ? (
-                              <datalist id={basicInfoPurchasingOwnerDatalistId}>
-                                {basicInfoPurchasingOwnerOptions.map((option) => (
-                                  <option key={option} value={option} />
-                                ))}
-                              </datalist>
-                            ) : null}
                             <div className="rounded-apple-lg border border-apple-separator bg-apple-bg-secondary/30 p-3">
                               {sharedProductImage ? (
                                 <button
@@ -23491,24 +24050,24 @@ function renderFactoryQualityWorkspace() {
                                         label={field.label}
                                         type={field.type}
                                         placeholder={field.placeholder}
-                                        options={field.options}
-                                        datalistId={
-                                          field.key === "salesCategory"
-                                            ? basicInfoSecondaryCategoryDatalistId
+                                        options={
+                                          field.type === "select"
+                                            ? field.options
+                                            : field.key === "salesCategory"
+                                            ? basicInfoSecondaryCategoryOptions
                                             : field.key === "productCategory"
-                                            ? basicInfoProductCategoryDatalistId
-                                            : field.key === "designer"
-                                            ? basicInfoDesignerDatalistId
+                                            ? basicInfoProductCategoryOptions
+                                            : field.key === "designer" ||
+                                              field.key === "visualPlanning"
+                                            ? basicInfoDesignerOptions
                                             : field.key === "productPlanning"
-                                            ? basicInfoPlanningOwnerDatalistId
+                                            ? basicInfoPlanningOwnerOptions
                                             : field.key === "spuOwner" ||
                                               field.key === "operator"
-                                            ? basicInfoOperationOwnerDatalistId
+                                            ? basicInfoOperationOwnerOptions
                                             : field.key === "purchaseOwner"
-                                            ? basicInfoPurchasingOwnerDatalistId
-                                            : field.key === "visualPlanning"
-                                            ? basicInfoDesignerDatalistId
-                                            : field.datalistId
+                                            ? basicInfoPurchasingOwnerOptions
+                                            : field.options
                                         }
                                         value={
                                           field.key === "spu"
@@ -23533,7 +24092,7 @@ function renderFactoryQualityWorkspace() {
                                       <CreateFieldShell>
                                         <BasicField
                                           label="结构设计师"
-                                          datalistId={basicInfoDesignerDatalistId}
+                                          options={basicInfoDesignerOptions}
                                           value={
                                             openingReference.structureDesigner
                                           }
@@ -23649,7 +24208,9 @@ function renderFactoryQualityWorkspace() {
                             >
                               {isExportingSku ? "导出中..." : "下载资料"}
                             </button>
-                            {isSkuContentReadOnly ? null : (
+                            {!isSkuContentReadOnly &&
+                            activeSkuBatchNo &&
+                            !isActiveSkuBatchConfirmed ? (
                               <>
                                 <button
                                   type="button"
@@ -23670,6 +24231,10 @@ function renderFactoryQualityWorkspace() {
                                   className="hidden"
                                   onChange={handleImportSkuWorkbookChange}
                                 />
+                              </>
+                            ) : null}
+                            {isSkuContentReadOnly ? null : (
+                              <>
                                 <button
                                   type="button"
                                   onClick={() =>
@@ -23689,7 +24254,88 @@ function renderFactoryQualityWorkspace() {
                                 />
                               </>
                             )}
+                            <div
+                              className="ml-auto flex shrink-0 items-center gap-2"
+                              data-testid="non-integrated-sku-confirm-actions"
+                            >
+                              {canShowSkuReconfirmationAction ? (
+                                <button
+                                  type="button"
+                                  data-testid="non-integrated-reopen-sku-content"
+                                  onClick={() =>
+                                    void handleReopenSkuContentConfirmation()
+                                  }
+                                  disabled={isSampleMeasurementNodeApproved}
+                                  title={
+                                    isSampleMeasurementNodeApproved
+                                      ? "样包测量节点已确认，不能重新确认"
+                                      : "重新打开当前批次 SKU 信息"
+                                  }
+                                  className={getSkuToolbarButtonClass({
+                                    disabled: isSampleMeasurementNodeApproved,
+                                  })}
+                                >
+                                  重新确认
+                                </button>
+                              ) : null}
+                              {activeSkuTab === "skuInfo" &&
+                              !isSkuContentReadOnly ? (
+                                isActiveSkuBatchConfirmed ? (
+                                  <span
+                                    className={SKU_TOOLBAR_STATUS_CLASS}
+                                  >
+                                    已确认SKU信息
+                                  </span>
+                                ) : activeSkuBatchNo ? (
+                                  <button
+                                    type="button"
+                                    data-testid={
+                                      canConfirmActiveSkuBatch ||
+                                      isActiveSkuConfirmationPending
+                                        ? "non-integrated-confirm-sku-content"
+                                        : "non-integrated-check-sku-content"
+                                    }
+                                    onClick={() =>
+                                      void handleConfirmSkuContent()
+                                    }
+                                    className={getSkuToolbarButtonClass({
+                                      active:
+                                        pendingSkuConfirmationBatch ===
+                                        activeSkuBatchNo,
+                                    })}
+                                  >
+                                    {isActiveSkuConfirmationPending
+                                      ? "再次确认SKU信息"
+                                      : canConfirmActiveSkuBatch
+                                        ? "确认SKU信息"
+                                      : "检查SKU信息"}
+                                  </button>
+                                ) : (
+                                  <button
+                                    type="button"
+                                    disabled
+                                    className={getSkuToolbarButtonClass({
+                                      disabled: true,
+                                    })}
+                                  >
+                                    确认SKU信息
+                                  </button>
+                                )
+                              ) : null}
+                            </div>
                           </div>
+                          {activeSkuTab === "skuInfo" &&
+                          skuConfirmationPrompt ? (
+                            <div
+                              className={`rounded-apple-lg border px-3 py-2 text-xs ${
+                                skuConfirmationPrompt.type === "error"
+                                  ? "border-apple-red/30 bg-apple-red/5 text-apple-red"
+                                  : "border-apple-green/30 bg-apple-green/5 text-apple-green"
+                              }`}
+                            >
+                              {skuConfirmationPrompt.message}
+                            </div>
+                          ) : null}
 
                           {activeSkuTab === "componentSkuInfo" ? (
                             <div className="space-y-3">
@@ -23880,7 +24526,7 @@ function renderFactoryQualityWorkspace() {
                           ) : activeSkuTab === "skuInfo" ? (
                             <div className="space-y-3">
                               <div className="flex items-center gap-2 overflow-x-auto border-b border-apple-separator pb-3">
-                                {isSkuContentReadOnly ? null : (
+                                {canEditActiveSkuBatch ? (
                                   <Button
                                     size="small"
                                     className={SKU_PRIMARY_ACTION_BUTTON_CLASS}
@@ -23899,7 +24545,7 @@ function renderFactoryQualityWorkspace() {
                                   >
                                     新增SKU
                                   </Button>
-                                )}
+                                ) : null}
                                 {Array.from(
                                   { length: skuBatchCount },
                                   (_, batchIndex) => batchIndex + 1,
@@ -23980,30 +24626,23 @@ function renderFactoryQualityWorkspace() {
                                     </div>
                                     <label className="space-y-1 text-xs text-apple-label-secondary">
                                       <span>新增类型</span>
-                                      <select
+                                      <InlineSelect
+                                        ariaLabel="新增类型"
                                         value={pendingSkuBatchDraft.changeType}
-                                        onChange={(event) =>
+                                        options={SKU_BATCH_CHANGE_TYPE_OPTIONS}
+                                        placeholder="请选择"
+                                        onChange={(value) =>
                                           setPendingSkuBatchDraft((current) =>
                                             current
                                               ? {
                                                   ...current,
-                                                  changeType:
-                                                    event.target.value,
+                                                  changeType: value,
                                                 }
                                               : current,
                                           )
                                         }
-                                        className="h-8 w-full rounded border border-apple-separator bg-apple-bg-primary px-2 text-xs text-apple-label-primary outline-none"
-                                      >
-                                        <option value="">请选择</option>
-                                        {SKU_BATCH_CHANGE_TYPE_OPTIONS.map(
-                                          (option) => (
-                                            <option key={option} value={option}>
-                                              {option}
-                                            </option>
-                                          ),
-                                        )}
-                                      </select>
+                                        buttonClassName="h-8 w-full rounded border border-apple-separator bg-apple-bg-primary px-2 text-xs text-apple-label-primary outline-none"
+                                      />
                                     </label>
                                     <label className="space-y-1 text-xs text-apple-label-secondary">
                                       <span>钉钉流程号</span>
@@ -24055,30 +24694,27 @@ function renderFactoryQualityWorkspace() {
                                     </div>
                                     <label className="space-y-1 text-xs text-apple-label-secondary">
                                       <span>新增类型</span>
-                                      <select
+                                      <InlineSelect
+                                        ariaLabel="新增类型"
                                         value={
                                           skuBatchChangeTypes[
                                             String(activeSkuBatch)
                                           ] ?? ""
                                         }
-                                        disabled={isReadOnly}
-                                        onChange={(event) =>
+                                        options={SKU_BATCH_CHANGE_TYPE_OPTIONS}
+                                        placeholder="请选择"
+                                        readOnly={
+                                          isSkuContentReadOnly ||
+                                          isSkuBatchConfirmed(activeSkuBatch)
+                                        }
+                                        onChange={(value) =>
                                           handleUpdateSkuBatchChangeType(
                                             activeSkuBatch,
-                                            event.target.value,
+                                            value,
                                           )
                                         }
-                                        className="h-8 w-full rounded border border-apple-separator bg-apple-bg-primary px-2 text-xs text-apple-label-primary outline-none disabled:text-apple-label-secondary"
-                                      >
-                                        <option value="">请选择</option>
-                                        {SKU_BATCH_CHANGE_TYPE_OPTIONS.map(
-                                          (option) => (
-                                            <option key={option} value={option}>
-                                              {option}
-                                            </option>
-                                          ),
-                                        )}
-                                      </select>
+                                        buttonClassName="h-8 w-full rounded border border-apple-separator bg-apple-bg-primary px-2 text-xs text-apple-label-primary outline-none disabled:text-apple-label-secondary"
+                                      />
                                     </label>
                                     <label className="space-y-1 text-xs text-apple-label-secondary">
                                       <span>钉钉流程号</span>
@@ -24089,7 +24725,10 @@ function renderFactoryQualityWorkspace() {
                                             String(activeSkuBatch)
                                           ] ?? ""
                                         }
-                                        readOnly={isReadOnly}
+                                        readOnly={
+                                          isSkuContentReadOnly ||
+                                          isSkuBatchConfirmed(activeSkuBatch)
+                                        }
                                         onChange={(event) =>
                                           handleUpdateSkuBatchFlowNo(
                                             activeSkuBatch,
@@ -24105,20 +24744,8 @@ function renderFactoryQualityWorkspace() {
                               ) : null}
 
                               <div className="overflow-hidden rounded-apple-lg border border-apple-separator">
-                                <datalist id="non-integrated-supplier-name-options">
-                                  {SUPPLIER_DIRECTORY.map((entry) => (
-                                    <option key={entry.code} value={entry.name}>
-                                      {entry.code}
-                                    </option>
-                                  ))}
-                                </datalist>
-                                <datalist id="non-integrated-execution-standard-options">
-                                  {EXECUTION_STANDARD_OPTIONS.map((option) => (
-                                    <option key={option} value={option} />
-                                  ))}
-                                </datalist>
                                 <div className="overflow-x-auto">
-                                  <table className="min-w-[1960px] w-full text-left text-xs">
+                                  <table className="min-w-[2080px] w-full text-left text-xs">
                                     <thead className="bg-apple-bg-secondary/60 text-apple-label-secondary">
                                       <tr>
                                         {[
@@ -24132,6 +24759,7 @@ function renderFactoryQualityWorkspace() {
                                           "尺寸",
                                           "颜色",
                                           "材质",
+                                          "板材类型",
                                           "版本号",
                                           "属性代码",
                                           "图纸ID",
@@ -24143,7 +24771,7 @@ function renderFactoryQualityWorkspace() {
                                           "销售状态",
                                           "创建批次",
                                           "钉钉流程号",
-                                          ...(isSkuContentReadOnly ? [] : ["操作"]),
+                                          ...(showSkuActionColumn ? ["操作"] : []),
                                         ].map((label) => (
                                           <th
                                             key={label}
@@ -24158,7 +24786,7 @@ function renderFactoryQualityWorkspace() {
                                       {displayedSkuItems.length === 0 ? (
                                         <tr>
                                           <td
-                                            colSpan={isSkuContentReadOnly ? 21 : 22}
+                                            colSpan={showSkuActionColumn ? 23 : 22}
                                             className="px-3 py-6 text-center text-xs text-apple-label-secondary"
                                           >
                                             这个批次还没有 SKU。请在最新批次下点击“新增SKU”录入本批内容。
@@ -24201,6 +24829,13 @@ function renderFactoryQualityWorkspace() {
                                             : derivedItem.drawingId;
                                         const skuRowReadOnly =
                                           isSkuContentReadOnly ||
+                                          isSkuBatchConfirmed(
+                                            derivedItem.batchNo || 1,
+                                          ) ||
+                                          isImportedSkuContentLocked(item);
+                                        const skuImageReadOnly =
+                                          isReadOnly ||
+                                          isStockProductRecord ||
                                           isImportedSkuContentLocked(item);
 
                                         return (
@@ -24247,12 +24882,12 @@ function renderFactoryQualityWorkspace() {
                                                     alt={`${item.model || "SKU"} 图片`}
                                                     className="h-full w-full object-cover"
                                                   />
-                                                ) : skuRowReadOnly ? (
+                                                ) : skuImageReadOnly ? (
                                                   "暂无图片"
                                                 ) : (
                                                   "点击上传"
                                                 )}
-                                                {skuRowReadOnly ? null : (
+                                                {skuImageReadOnly ? null : (
                                                   <input
                                                     id={`sku-image-input-${item.id}`}
                                                     type="file"
@@ -24451,6 +25086,43 @@ function renderFactoryQualityWorkspace() {
                                                 }
                                               />
                                             </td>
+                                            <td className="px-2 py-2">
+                                              <SkuColumnResizableFrame
+                                                columnWidth={
+                                                  skuColumnWidths.boardMaterialType
+                                                }
+                                                minWidth={
+                                                  SKU_COLUMN_DEFAULT_WIDTHS.boardMaterialType
+                                                }
+                                                onColumnResize={(width) =>
+                                                  handleSkuColumnResize(
+                                                    "boardMaterialType",
+                                                    width,
+                                                  )
+                                                }
+                                                className="overflow-visible rounded border border-apple-separator bg-apple-bg-secondary"
+                                              >
+                                                <InlineSelect
+                                                  ariaLabel={`${
+                                                    item.model ||
+                                                    `SKU ${index + 1}`
+                                                  } 板材类型`}
+                                                  value={item.boardMaterialType ?? ""}
+                                                  options={SKU_BOARD_MATERIAL_TYPE_OPTIONS}
+                                                  placeholder="请选择"
+                                                  readOnly={skuRowReadOnly}
+                                                  onChange={(value) =>
+                                                    updateSkuItem(
+                                                      item.id,
+                                                      "boardMaterialType",
+                                                      value,
+                                                    )
+                                                  }
+                                                  buttonClassName="h-8 w-full border-0 bg-transparent px-2 text-xs text-apple-label-primary outline-none disabled:bg-apple-bg-primary disabled:text-apple-label-secondary"
+                                                  panelClassName="absolute left-0 top-[calc(100%+4px)] z-50 max-h-48 min-w-full overflow-auto rounded-apple-lg border border-apple-separator bg-apple-bg-primary p-1 shadow-apple-md"
+                                                />
+                                              </SkuColumnResizableFrame>
+                                            </td>
                                             <td className="px-2 py-2">
                                               <SkuRowField
                                                 value={derivedItem.versionNo}
@@ -24538,38 +25210,28 @@ function renderFactoryQualityWorkspace() {
                                                     width,
                                                   )
                                                 }
-                                                className="rounded border border-apple-separator bg-apple-bg-secondary"
+                                                className="overflow-visible rounded border border-apple-separator bg-apple-bg-secondary"
                                               >
-                                                <select
-                                                  aria-label={`${
+                                                <InlineSelect
+                                                  ariaLabel={`${
                                                     item.model ||
                                                     `SKU ${index + 1}`
                                                   } 安装方式`}
                                                   value={editableInstallMethod}
-                                                  disabled={skuRowReadOnly}
-                                                  onChange={(event) =>
+                                                  options={INSTALL_METHOD_OPTIONS}
+                                                  placeholder="请选择"
+                                                  emptyOptionDisabled
+                                                  readOnly={skuRowReadOnly}
+                                                  onChange={(value) =>
                                                     updateSkuItem(
                                                       item.id,
                                                       "installMethod",
-                                                      event.target.value,
+                                                      value,
                                                     )
                                                   }
-                                                  className="h-8 w-full border-0 bg-transparent px-2 text-xs text-apple-label-primary outline-none disabled:bg-apple-bg-primary disabled:text-apple-label-secondary"
-                                                >
-                                                  <option value="" disabled>
-                                                    请选择
-                                                  </option>
-                                                  {INSTALL_METHOD_OPTIONS.map(
-                                                    (option) => (
-                                                      <option
-                                                        key={option}
-                                                        value={option}
-                                                      >
-                                                        {option}
-                                                      </option>
-                                                    ),
-                                                  )}
-                                                </select>
+                                                  buttonClassName="h-8 w-full border-0 bg-transparent px-2 text-xs text-apple-label-primary outline-none disabled:bg-apple-bg-primary disabled:text-apple-label-secondary"
+                                                  panelClassName="absolute left-0 top-[calc(100%+4px)] z-50 max-h-48 min-w-full overflow-auto rounded-apple-lg border border-apple-separator bg-apple-bg-primary p-1 shadow-apple-md"
+                                                />
                                               </SkuColumnResizableFrame>
                                             </td>
                                             <td className="px-2 py-2">
@@ -24677,38 +25339,27 @@ function renderFactoryQualityWorkspace() {
                                                     width,
                                                   )
                                                 }
-                                                className="rounded border border-apple-separator bg-apple-bg-secondary"
+                                                className="overflow-visible rounded border border-apple-separator bg-apple-bg-secondary"
                                               >
-                                                <select
-                                                  aria-label={`${
+                                                <InlineSelect
+                                                  ariaLabel={`${
                                                     item.model ||
                                                     `SKU ${index + 1}`
                                                   } 销售状态`}
                                                   value={item.salesStatus ?? ""}
-                                                  disabled={skuRowReadOnly}
-                                                  onChange={(event) =>
+                                                  options={SKU_SALES_STATUS_OPTIONS}
+                                                  placeholder="请选择"
+                                                  readOnly={skuRowReadOnly}
+                                                  onChange={(value) =>
                                                     updateSkuItem(
                                                       item.id,
                                                       "salesStatus",
-                                                      event.target.value,
+                                                      value,
                                                     )
                                                   }
-                                                  className="h-8 w-full border-0 bg-transparent px-2 text-xs text-apple-label-primary outline-none disabled:bg-apple-bg-primary disabled:text-apple-label-secondary"
-                                                >
-                                                  <option value="">
-                                                    请选择
-                                                  </option>
-                                                  {SKU_SALES_STATUS_OPTIONS.map(
-                                                    (option) => (
-                                                      <option
-                                                        key={option}
-                                                        value={option}
-                                                      >
-                                                        {option}
-                                                      </option>
-                                                    ),
-                                                  )}
-                                                </select>
+                                                  buttonClassName="h-8 w-full border-0 bg-transparent px-2 text-xs text-apple-label-primary outline-none disabled:bg-apple-bg-primary disabled:text-apple-label-secondary"
+                                                  panelClassName="absolute left-0 top-[calc(100%+4px)] z-50 max-h-48 min-w-full overflow-auto rounded-apple-lg border border-apple-separator bg-apple-bg-primary p-1 shadow-apple-md"
+                                                />
                                               </SkuColumnResizableFrame>
                                             </td>
                                             <td className="px-2 py-2">
@@ -24753,20 +25404,22 @@ function renderFactoryQualityWorkspace() {
                                                 onChange={() => {}}
                                               />
                                             </td>
-                                            {skuRowReadOnly ? null : (
+                                            {showSkuActionColumn ? (
                                               <td className="px-3 py-2">
-                                                <Button
-                                                  variant="plain"
-                                                  size="small"
-                                                  data-testid={`non-integrated-delete-sku-${item.id}`}
-                                                  onClick={() =>
-                                                    handleDeleteSku(item.id)
-                                                  }
-                                                >
-                                                  删除
-                                                </Button>
+                                                {skuRowReadOnly ? null : (
+                                                  <Button
+                                                    variant="plain"
+                                                    size="small"
+                                                    data-testid={`non-integrated-delete-sku-${item.id}`}
+                                                    onClick={() =>
+                                                      handleDeleteSku(item.id)
+                                                    }
+                                                  >
+                                                    删除
+                                                  </Button>
+                                                )}
                                               </td>
-                                            )}
+                                            ) : null}
                                           </tr>
                                         );
                                       })}
@@ -24812,26 +25465,26 @@ function renderFactoryQualityWorkspace() {
                                   </DocumentWorkspaceActionButton>
                                   <label className="flex items-center gap-2 text-xs text-apple-label-secondary">
                                     <span>批量分类</span>
-                                    <select
-                                      aria-label="批量分类"
+                                    <InlineSelect
+                                      ariaLabel="批量分类"
                                       value={bulkUploadCategory}
-                                      onChange={(event) =>
-                                        handleBatchUploadCategoryChange(
-                                          event.target
-                                            .value as UploadCategoryKey,
-                                        )
-                                      }
-                                      disabled={
+                                      options={UPLOAD_CATEGORY_OPTIONS.map(
+                                        (option) => ({
+                                          value: option,
+                                          label:
+                                            getUploadCategoryOptionLabel(option),
+                                        }),
+                                      )}
+                                      readOnly={
                                         selectedUploadFileIds.length === 0
                                       }
-                                      className="h-8 rounded-apple-lg border border-apple-separator bg-apple-bg-secondary px-2 text-xs text-apple-label-primary outline-none disabled:opacity-50"
-                                    >
-                                      {UPLOAD_CATEGORY_OPTIONS.map((option) => (
-                                        <option key={option} value={option}>
-                                          {getUploadCategoryOptionLabel(option)}
-                                        </option>
-                                      ))}
-                                    </select>
+                                      onChange={(value) =>
+                                        handleBatchUploadCategoryChange(
+                                          value as UploadCategoryKey,
+                                        )
+                                      }
+                                      buttonClassName="h-8 rounded-apple-lg border border-apple-separator bg-apple-bg-secondary px-2 text-xs text-apple-label-primary outline-none disabled:opacity-50"
+                                    />
                                   </label>
                                   <input
                                     ref={fileUploadInputRef}
@@ -24893,31 +25546,26 @@ function renderFactoryQualityWorkspace() {
                                           ) : (
                                             <label className="flex items-center gap-2 text-xs text-apple-label-secondary">
                                               <span>分类</span>
-                                              <select
-                                                aria-label={`${file.name} 分类`}
+                                              <InlineSelect
+                                                ariaLabel={`${file.name} 分类`}
                                                 value={file.category}
-                                                onChange={(event) =>
+                                                options={UPLOAD_CATEGORY_OPTIONS.map(
+                                                  (option) => ({
+                                                    value: option,
+                                                    label:
+                                                      getUploadCategoryOptionLabel(
+                                                        option,
+                                                      ),
+                                                  }),
+                                                )}
+                                                onChange={(value) =>
                                                   handleUploadFileCategoryChange(
                                                     file.id,
-                                                    event.target
-                                                      .value as UploadCategoryKey,
+                                                    value as UploadCategoryKey,
                                                   )
                                                 }
-                                                className="h-8 rounded-apple-lg border border-apple-separator bg-apple-bg-secondary px-2 text-xs text-apple-label-primary outline-none"
-                                              >
-                                                {UPLOAD_CATEGORY_OPTIONS.map(
-                                                  (option) => (
-                                                    <option
-                                                      key={option}
-                                                      value={option}
-                                                    >
-                                                      {getUploadCategoryOptionLabel(
-                                                        option,
-                                                      )}
-                                                    </option>
-                                                  ),
-                                                )}
-                                              </select>
+                                                buttonClassName="h-8 rounded-apple-lg border border-apple-separator bg-apple-bg-secondary px-2 text-xs text-apple-label-primary outline-none"
+                                              />
                                             </label>
                                           )}
                                           <DocumentWorkspaceActionButton
@@ -25094,32 +25742,29 @@ function renderFactoryQualityWorkspace() {
                               <div className="grid gap-x-3 gap-y-2 md:grid-cols-2 xl:grid-cols-2">
                                 <div>
                                   <FieldLabel label="选择条码" />
-                                  <select
-                                    aria-label="选择条码"
+                                  <InlineSelect
+                                    ariaLabel="选择条码"
                                     value={effectiveSupplementSelectValue}
-                                    onChange={(event) => {
+                                    options={supplementBarcodeOptions.map(
+                                      (option) => ({
+                                        value: option.value,
+                                        label: option.label,
+                                      }),
+                                    )}
+                                    onChange={(value) => {
                                       if (isComponentSupplementMode) {
                                         setSelectedSupplementComponentCode(
-                                          event.target.value,
+                                          value,
                                         );
                                         return;
                                       }
 
                                       setSelectedSupplementSkuId(
-                                        event.target.value,
+                                        value,
                                       );
                                     }}
-                                    className="h-10 w-full rounded-apple-lg border border-apple-separator bg-apple-bg-secondary px-3 text-sm text-apple-label-primary outline-none"
-                                  >
-                                    {supplementBarcodeOptions.map((option) => (
-                                      <option
-                                        key={option.value}
-                                        value={option.value}
-                                      >
-                                        {option.label}
-                                      </option>
-                                    ))}
-                                  </select>
+                                    buttonClassName="h-10 w-full rounded-apple-lg border border-apple-separator bg-apple-bg-secondary px-3 text-sm text-apple-label-primary outline-none"
+                                  />
                                 </div>
                                 <div>
                                   <FieldLabel label="尺寸" />
@@ -25929,6 +26574,23 @@ function renderFactoryQualityWorkspace() {
                         </div>
                       ) : isProductFactoryWorkspace ? (
                         <div className={DOCUMENT_WORKSPACE_ACTION_GROUP_CLASS}>
+                          {isCurrentUserAdmin &&
+                          displayedProductFactoryRows.length > 0 &&
+                          !displayedProductFactoryHasPendingRows ? (
+                            <Button
+                              size="small"
+                              data-testid="product-factory-reopen-confirmation"
+                              onClick={handleReopenProductFactoryConfirmation}
+                              disabled={isReadOnly || isSampleMeasurementNodeLocked}
+                              title={
+                                isSampleMeasurementNodeLocked
+                                  ? "样包测量节点已确认，产品定厂不能重新确认"
+                                  : "重新打开产品定厂，可修改后再次确认"
+                              }
+                            >
+                              重新确认
+                            </Button>
+                          ) : null}
                           <Button
                             size="small"
                             onClick={handleConfirmProductFactoryRows}
diff --git a/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts b/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts
index eb289416..a1cd3d61 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts
@@ -297,6 +297,7 @@ export type NonIntegratedSkuItem = {
   size: string;
   color: string;
   material: string;
+  boardMaterialType?: string;
   versionNo: string;
   attributeCode: string;
   drawingId: string;
@@ -355,6 +356,7 @@ export type NonIntegratedPricingRow = {
   skuId: string;
   costPrice: string;
   productTag: string;
+  systemEnteredAt?: string;
 };
 
 export type NonIntegratedProductLimitRow = {
@@ -590,6 +592,7 @@ export type NonIntegratedProductRecord = {
   skuBatchCount?: number;
   skuBatchFlowNos?: Record<string, string>;
   skuBatchChangeTypes?: Record<string, string>;
+  skuBatchConfirmedAt?: Record<string, string>;
   factoryRows: NonIntegratedFactoryRow[];
   pricingRows: NonIntegratedPricingRow[];
   planningLayoutRows: NonIntegratedPlanningLayoutRow[];
@@ -1056,6 +1059,18 @@ function normalizeSkuBatchChangeTypes(value: unknown): Record<string, string> {
   );
 }
 
+function normalizeSkuBatchConfirmedAt(value: unknown): Record<string, string> {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return {};
+  }
+
+  return Object.fromEntries(
+    Object.entries(value as Record<string, unknown>)
+      .map(([key, confirmedAt]) => [key, normalizeString(confirmedAt)])
+      .filter(([, confirmedAt]) => confirmedAt.length > 0),
+  );
+}
+
 function normalizeSkuComponentQuantity(value: unknown) {
   if (typeof value === "number" && Number.isFinite(value)) {
     return String(value);
@@ -1129,6 +1144,7 @@ function normalizeSkuItem(
     size: normalizeString(item.size),
     color: normalizeString(item.color),
     material: normalizeString(item.material),
+    boardMaterialType: normalizeString(item.boardMaterialType),
     versionNo:
       typeof item.versionNo === "string"
         ? normalizeString(item.versionNo)
@@ -1198,6 +1214,7 @@ function normalizePricingRow(
   item: Partial<NonIntegratedPricingRow>,
 ): NonIntegratedPricingRow | null {
   if (typeof item.skuId !== "string") return null;
+  const systemEnteredAt = normalizeString(item.systemEnteredAt);
 
   return {
     skuId: item.skuId,
@@ -1208,6 +1225,7 @@ function normalizePricingRow(
           ? String(item.costPrice)
           : "",
     productTag: normalizeString(item.productTag),
+    ...(systemEnteredAt ? { systemEnteredAt } : {}),
   };
 }
 
@@ -1898,6 +1916,9 @@ function toProductRecord(
     skuBatchChangeTypes: normalizeSkuBatchChangeTypes(
       item.skuBatchChangeTypes,
     ),
+    skuBatchConfirmedAt: normalizeSkuBatchConfirmedAt(
+      item.skuBatchConfirmedAt,
+    ),
     factoryRows: Array.isArray(item.factoryRows)
       ? item.factoryRows
           .map((entry) => normalizeFactoryRow(entry))
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 64887fe5..bf65171d 100644
--- a/furniture-3d-system/src/lib/non-integrated-sku-export.ts
+++ b/furniture-3d-system/src/lib/non-integrated-sku-export.ts
@@ -10,6 +10,7 @@ export type NonIntegratedSkuExportRow = {
   size: string
   color: string
   material: string
+  boardMaterialType: string
   versionNo: string
   attributeCode: string
   drawingId: string
@@ -44,6 +45,7 @@ export const NON_INTEGRATED_SKU_TEMPLATE_COLUMNS: {
   { key: 'size', label: '尺寸', width: 16 },
   { key: 'color', label: '颜色', width: 14 },
   { key: 'material', label: '材质', width: 18 },
+  { key: 'boardMaterialType', label: '板材类型', width: 14 },
   { key: 'versionNo', label: '版本号', width: 10 },
   { key: 'attributeCode', label: '属性代码', width: 12 },
   { key: 'drawingId', label: '图纸ID', width: 22 },
@@ -263,7 +265,7 @@ export async function parseNonIntegratedSkuWorkbook(file: File) {
     }
   })
 
-  const optionalLabels = new Set(['销售状态'])
+  const optionalLabels = new Set(['板材类型', '销售状态'])
   const missingLabels = NON_INTEGRATED_SKU_TEMPLATE_COLUMNS.filter(
     (column) =>
       !optionalLabels.has(column.label) && !headerIndexByLabel.has(column.label),

From 0a5c6b7a436b694e08f4a0f49ff8364b8355648c Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Tue, 19 May 2026 19:09:16 +0800
Subject: [PATCH 19/21] fix: treat stock sku batches as confirmed

---
 .../NonIntegratedDetailClient.test.tsx        | 46 +++++++++++
 .../NonIntegratedDetailClient.tsx             | 77 ++++++++++++++++---
 2 files changed, 112 insertions(+), 11 deletions(-)

diff --git a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
index 37ed7766..b92c5023 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
@@ -668,6 +668,9 @@ describe("NonIntegratedDetailClient", () => {
     expect(savedProducts[0]?.spu).toBe("CJ0250");
     expect(savedProducts[0]?.openingReference.productName).toBe("单板桌系列");
     expect(savedProducts[0]?.processTemplate).toBe("存量商品");
+    expect(savedProducts[0]?.skuBatchConfirmedAt?.["1"]).toEqual(
+      expect.any(String),
+    );
     expect(savedProducts[0]?.skuItems).toHaveLength(2);
     expect(savedProducts[0]?.skuItems.map((item) => item.skuCode)).toEqual([
       "CJ025001",
@@ -3728,6 +3731,49 @@ describe("NonIntegratedDetailClient", () => {
     ).not.toBeInTheDocument();
   });
 
+  it("treats stock product SKU batches as confirmed without a saved confirmation timestamp", async () => {
+    const actor = userEvent.setup();
+    const planningLayoutCategory = NON_INTEGRATED_DOCUMENT_WORKSPACE_CATEGORIES[5];
+
+    saveNonIntegratedProduct(
+      createProductRecord({
+        id: "STOCK001-confirmed-sku",
+        processTemplate: "\u5b58\u91cf\u5546\u54c1",
+        openingReference: {
+          ...createEmptyNonIntegratedOpeningReference(),
+          currentStage: "\u5b58\u91cf\u5546\u54c1",
+        },
+        skuItems: [
+          createSkuItem({
+            id: "stock-sku-confirmed-1",
+            model: "STOCKK01",
+            skuCode: "STOCK001",
+            barcode: "STOCK001V01",
+            specName: "Stock SKU",
+            salesStatus: "\u9500\u552e",
+          }),
+        ],
+      }),
+    );
+
+    render(
+      <NonIntegratedDetailClient
+        mode="edit"
+        productId="STOCK001-confirmed-sku"
+      />,
+    );
+
+    await actor.click(screen.getByTestId("document-workspace-basic-info-trigger"));
+    expect(screen.getByText("已确认SKU信息")).toBeInTheDocument();
+
+    await actor.click(
+      screen.getByTestId(`document-workspace-trigger-${planningLayoutCategory}`),
+    );
+    const planningWorkspace = screen.getByTestId("planning-layout-workspace");
+    expect(planningWorkspace).toHaveTextContent("STOCKK01");
+    expect(planningWorkspace).toHaveTextContent("STOCK001V01");
+  });
+
   it("persists planning layout classification fields per SKU row", async () => {
     const actor = userEvent.setup();
 
diff --git a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
index 5f4cf2ed..776842c0 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
@@ -1534,6 +1534,7 @@ const DEFAULT_DOCUMENT_WORKSPACE_CATEGORY: DocumentWorkspaceCategory =
 const PRODUCT_PHOTO_CATEGORY: DocumentWorkspaceCategory = "产品实拍图";
 const AUTO_SAVE_DELAY_MS = 500;
 const SKU_CONFIRMATION_PROMPT_VISIBLE_MS = 5000;
+const STOCK_PRODUCT_LABEL = "\u5b58\u91cf\u5546\u54c1";
 
 function getChangedWorkflowNodeCategories(
   previousSignatures: Record<WorkflowNodeCategory, string> | null | undefined,
@@ -8671,6 +8672,47 @@ function BomSteelMaterialField({
   );
 }
 
+function collectSkuBatchKeys(
+  skuItems: NonIntegratedSkuItem[],
+  skuBatchCount: number,
+) {
+  const normalizedBatchCount = Math.max(
+    1,
+    Number.isFinite(skuBatchCount) ? Math.floor(skuBatchCount) : 1,
+  );
+  const batchKeys = new Set<string>();
+
+  for (let batchNo = 1; batchNo <= normalizedBatchCount; batchNo += 1) {
+    batchKeys.add(String(batchNo));
+  }
+
+  skuItems.forEach((item) => {
+    const batchNo = Number.isFinite(item.batchNo)
+      ? Math.max(1, Math.floor(item.batchNo))
+      : 1;
+    batchKeys.add(String(batchNo));
+  });
+
+  return batchKeys;
+}
+
+function ensureSkuBatchConfirmedAt(
+  skuItems: NonIntegratedSkuItem[],
+  skuBatchCount: number,
+  currentConfirmedAt: Record<string, string>,
+  confirmedAt: string,
+) {
+  const nextConfirmedAt = { ...currentConfirmedAt };
+
+  collectSkuBatchKeys(skuItems, skuBatchCount).forEach((batchKey) => {
+    if (!nextConfirmedAt[batchKey]?.trim()) {
+      nextConfirmedAt[batchKey] = confirmedAt;
+    }
+  });
+
+  return nextConfirmedAt;
+}
+
 function buildProductPayload(
   id: string,
   formValues: FormValues,
@@ -8932,6 +8974,17 @@ function buildProductPayload(
     productImage: sharedProductImage,
     productImageName: sharedProductImageName,
   };
+  const isStockProductPayload =
+    formValues.processTemplate.trim() === STOCK_PRODUCT_LABEL ||
+    normalizedOpeningReference.currentStage.trim() === STOCK_PRODUCT_LABEL;
+  const normalizedSkuBatchConfirmedAt = isStockProductPayload
+    ? ensureSkuBatchConfirmedAt(
+        skuItems,
+        skuBatchCount,
+        skuBatchConfirmedAt,
+        now,
+      )
+    : skuBatchConfirmedAt;
 
   return {
     id,
@@ -9033,7 +9086,7 @@ function buildProductPayload(
     skuBatchCount,
     skuBatchFlowNos,
     skuBatchChangeTypes,
-    skuBatchConfirmedAt,
+    skuBatchConfirmedAt: normalizedSkuBatchConfirmedAt,
     factoryRows: normalizeFactoryRowsForPayload(factoryRows),
     pricingRows: normalizePricingRowsForPayload(pricingRows),
     planningLayoutRows: normalizePlanningLayoutRowsForPayload(
@@ -10217,12 +10270,14 @@ export default function NonIntegratedDetailClient({
   const normalizedExistingOpeningReference =
     normalizeNonIntegratedOpeningReference(existingProduct?.openingReference);
   const isStockProductRecord =
-    existingProduct?.processTemplate?.trim() === "存量商品" ||
-    normalizedExistingOpeningReference.currentStage.trim() === "存量商品";
+    existingProduct?.processTemplate?.trim() === STOCK_PRODUCT_LABEL ||
+    normalizedExistingOpeningReference.currentStage.trim() ===
+      STOCK_PRODUCT_LABEL;
   const isSkuContentReadOnly = isReadOnly || isStockProductRecord;
   const isSkuBatchConfirmed = useCallback(
-    (batchNo: number | string) => Boolean(skuBatchConfirmedAt[String(batchNo)]),
-    [skuBatchConfirmedAt],
+    (batchNo: number | string) =>
+      isStockProductRecord || Boolean(skuBatchConfirmedAt[String(batchNo)]),
+    [isStockProductRecord, skuBatchConfirmedAt],
   );
   const activeSkuBatchNo = activeSkuBatch === "all" ? null : activeSkuBatch;
   const isActiveSkuBatchConfirmed =
@@ -12608,7 +12663,7 @@ export default function NonIntegratedDetailClient({
         const nextFormValuesForPayload = isStockProductRecord
           ? {
               ...formValuesRef.current,
-              processTemplate: "存量商品",
+              processTemplate: STOCK_PRODUCT_LABEL,
             }
           : formValuesRef.current;
         const nextProduct = await normalizeProductAssetsForStorage(
@@ -24278,15 +24333,15 @@ function renderFactoryQualityWorkspace() {
                                   重新确认
                                 </button>
                               ) : null}
-                              {activeSkuTab === "skuInfo" &&
-                              !isSkuContentReadOnly ? (
+                              {activeSkuTab === "skuInfo" ? (
                                 isActiveSkuBatchConfirmed ? (
                                   <span
                                     className={SKU_TOOLBAR_STATUS_CLASS}
                                   >
                                     已确认SKU信息
                                   </span>
-                                ) : activeSkuBatchNo ? (
+                                ) : !isSkuContentReadOnly &&
+                                  activeSkuBatchNo ? (
                                   <button
                                     type="button"
                                     data-testid={
@@ -24310,7 +24365,7 @@ function renderFactoryQualityWorkspace() {
                                         ? "确认SKU信息"
                                       : "检查SKU信息"}
                                   </button>
-                                ) : (
+                                ) : !isSkuContentReadOnly ? (
                                   <button
                                     type="button"
                                     disabled
@@ -24320,7 +24375,7 @@ function renderFactoryQualityWorkspace() {
                                   >
                                     确认SKU信息
                                   </button>
-                                )
+                                ) : null
                               ) : null}
                             </div>
                           </div>

From 954948dae10251e2588e71d29826b9eb2c48e157 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Tue, 19 May 2026 19:23:03 +0800
Subject: [PATCH 20/21] fix: align intake brand copy workflow

---
 .../src/app/intake/IntakeClient.test.tsx      |  38 ++++++
 .../src/app/intake/IntakeClient.tsx           |  30 ++++-
 .../NonIntegratedDetailClient.test.tsx        |  56 ++++++++-
 .../NonIntegratedDetailClient.tsx             | 114 +++++++-----------
 .../nonIntegratedStorage.test.ts              |  41 +++++++
 .../non-integrated/nonIntegratedStorage.ts    |  65 ++++++++--
 6 files changed, 255 insertions(+), 89 deletions(-)

diff --git a/furniture-3d-system/src/app/intake/IntakeClient.test.tsx b/furniture-3d-system/src/app/intake/IntakeClient.test.tsx
index 67826f6c..1b3be89b 100644
--- a/furniture-3d-system/src/app/intake/IntakeClient.test.tsx
+++ b/furniture-3d-system/src/app/intake/IntakeClient.test.tsx
@@ -2848,6 +2848,44 @@ describe('IntakeClient', () => {
     ).toBe(true)
   })
 
+  it('only offers adaptable brands that do not already have copied brand data', async () => {
+    const actor = userEvent.setup()
+    const [sourceBrand, existingBrand, availableBrand] = Object.keys(
+      NON_INTEGRATED_BRAND_PREFIX_MAP,
+    )
+
+    window.localStorage.setItem(
+      NON_INTEGRATED_STORAGE_KEY,
+      JSON.stringify([
+        createNonIntegratedProduct({
+          id: 'SZ0230-source',
+          spu: 'SZ0230',
+          brand: sourceBrand,
+          adaptableBrands: [sourceBrand, existingBrand, availableBrand],
+        }),
+        createNonIntegratedProduct({
+          id: 'GBGJ-SZ0230-copy',
+          spu: `${NON_INTEGRATED_BRAND_PREFIX_MAP[existingBrand]}SZ0230`,
+          brand: existingBrand,
+          adaptableBrands: [existingBrand],
+          copiedFromProductId: 'SZ0230-source',
+          copiedFromSpu: 'SZ0230',
+        }),
+      ]),
+    )
+
+    renderSelector({ eligibleSkuList: [] })
+
+    const sourceRow = screen.getByText('SZ0230').closest('tr')
+    expect(sourceRow).not.toBeNull()
+
+    await actor.click(within(sourceRow as HTMLElement).getByRole('button', { name: '复制' }))
+
+    expect(screen.getByLabelText('目标品牌')).toHaveValue(availableBrand)
+    expect(screen.queryByRole('option', { name: existingBrand })).not.toBeInTheDocument()
+    expect(screen.getByRole('option', { name: availableBrand })).toBeInTheDocument()
+  })
+
   it('shows owner fields and filters non-integrated products by query button', async () => {
     const actor = userEvent.setup()
 
diff --git a/furniture-3d-system/src/app/intake/IntakeClient.tsx b/furniture-3d-system/src/app/intake/IntakeClient.tsx
index fa002e12..802ebf35 100644
--- a/furniture-3d-system/src/app/intake/IntakeClient.tsx
+++ b/furniture-3d-system/src/app/intake/IntakeClient.tsx
@@ -55,13 +55,13 @@ import {
   hasPendingDocumentWorkspaceConfirmation,
   listNonIntegratedProducts,
   NON_INTEGRATED_BASIC_INFO_WORKSPACE_CATEGORY,
-  NON_INTEGRATED_BRAND_PREFIX_MAP,
   NON_INTEGRATED_DOCUMENT_WORKSPACE_CATEGORIES,
   NON_INTEGRATED_WORKFLOW_NODE_CATEGORIES,
   NON_INTEGRATED_PRODUCTS_UPDATED,
   getNonIntegratedDocumentWorkspaceCategoryLabel,
   normalizeNonIntegratedPatentApplication,
   saveNonIntegratedProduct,
+  stripNonIntegratedBrandPrefix,
   type NonIntegratedDocumentWorkspaceCategory,
   type NonIntegratedProductRecord,
   type NonIntegratedSkuComponentDetail,
@@ -3011,11 +3011,31 @@ function NonIntegratedPendingDetail({
   }
 
   function getAvailableCopyBrands(product: NonIntegratedProductRecord) {
-    const configuredBrands = product.adaptableBrands?.length
-      ? product.adaptableBrands
-      : Object.keys(NON_INTEGRATED_BRAND_PREFIX_MAP);
+    const configuredBrands = Array.from(
+      new Set([
+        product.brand,
+        ...(product.adaptableBrands ?? []),
+        ...(product.openingReference?.adaptableBrands ?? []),
+      ]),
+    ).filter((brand) => brand.trim().length > 0);
+    const sourceBaseSpu = stripNonIntegratedBrandPrefix(
+      product.copiedFromSpu || product.spu,
+    );
+    const existingBrandsForSpu = new Set(
+      products
+        .filter(
+          (currentProduct) =>
+            stripNonIntegratedBrandPrefix(
+              currentProduct.copiedFromSpu || currentProduct.spu,
+            ) === sourceBaseSpu,
+        )
+        .map((currentProduct) => currentProduct.brand)
+        .filter((brand) => brand.trim().length > 0),
+    );
 
-    return configuredBrands.filter((brand) => brand !== product.brand);
+    return configuredBrands.filter(
+      (brand) => brand !== product.brand && !existingBrandsForSpu.has(brand),
+    );
   }
 
   function openCopyDialog(product: NonIntegratedProductRecord) {
diff --git a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
index b92c5023..810ad9a3 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
@@ -1458,6 +1458,34 @@ describe("NonIntegratedDetailClient", () => {
     expect(openingReferenceBrandInput).toHaveAttribute("readonly");
     expect(screen.queryByRole("combobox", { name: "品牌" })).not.toBeInTheDocument();
     expect(openingReferenceAdaptableBrandButton).toBeInTheDocument();
+    expect(openingReferenceAdaptableBrandButton).toHaveAttribute(
+      "title",
+      "基本盘、顾家",
+    );
+
+    await actor.click(openingReferenceAdaptableBrandButton);
+    await actor.click(screen.getByLabelText("索菲亚"));
+
+    await actor.click(screen.getByTestId("document-workspace-basic-info-trigger"));
+
+    expect(screen.getByRole("button", { name: "适配品牌" })).toHaveAttribute(
+      "title",
+      "基本盘、顾家、索菲亚",
+    );
+
+    await waitFor(() => {
+      const savedProduct = getNonIntegratedProductById("DNZ0001-brand-single");
+      expect(savedProduct?.adaptableBrands).toEqual([
+        "基本盘",
+        "顾家",
+        "索菲亚",
+      ]);
+      expect(savedProduct?.openingReference.adaptableBrands).toEqual([
+        "基本盘",
+        "顾家",
+        "索菲亚",
+      ]);
+    });
   });
 
   it("shows the document sidebar in the updated workflow order", () => {
@@ -4531,7 +4559,9 @@ describe("NonIntegratedDetailClient", () => {
     }
   });
 
-  it("locks copied products to a single brand and shows a read-only adaptable brand field", () => {
+  it("locks copied products to a single brand while keeping adaptable brands editable", async () => {
+    const actor = userEvent.setup();
+
     window.localStorage.setItem(
       NON_INTEGRATED_STORAGE_KEY,
       JSON.stringify([
@@ -4565,9 +4595,31 @@ describe("NonIntegratedDetailClient", () => {
     expect(adaptableBrandField).not.toBeNull();
     expect(brandInput).toHaveValue("顾家");
     expect(within(adaptableBrandField!).getByText("顾家")).toBeInTheDocument();
+    expect(within(adaptableBrandField!).getByText("+2")).toBeInTheDocument();
     expect(brandInput).toHaveAttribute("readonly");
     expect(screen.queryByRole("combobox", { name: "品牌" })).not.toBeInTheDocument();
-    expect(screen.queryByRole("button", { name: "适配品牌" })).not.toBeInTheDocument();
+    const adaptableBrandButton = screen.getByRole("button", { name: "适配品牌" });
+    expect(adaptableBrandButton).toBeInTheDocument();
+
+    await actor.click(adaptableBrandButton);
+    await actor.click(screen.getByLabelText("朴美"));
+
+    await waitFor(() => {
+      const savedProduct = getNonIntegratedProductById("GBGJ-DNZ0001-copied-brand");
+      expect(savedProduct?.brand).toBe("顾家");
+      expect(savedProduct?.adaptableBrands).toEqual([
+        "顾家",
+        "基本盘",
+        "索菲亚",
+        "朴美",
+      ]);
+      expect(savedProduct?.openingReference.adaptableBrands).toEqual([
+        "顾家",
+        "基本盘",
+        "索菲亚",
+        "朴美",
+      ]);
+    });
   });
 
   it("keeps the brand field locked after an original product is created", async () => {
diff --git a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
index 776842c0..a90389e8 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
@@ -5509,9 +5509,7 @@ function createFormValuesFromProduct(
     flatOutputPath: product.flatOutputPath ?? "",
     output3dPath: product.output3dPath ?? "",
     brand: normalizedBrand,
-    adaptableBrands: product.copiedFromProductId
-      ? [normalizedBrand]
-      : normalizedAdaptableBrands,
+    adaptableBrands: normalizedAdaptableBrands,
     designer: normalizedOpeningReference.designer || product.designer || "",
     operator: product.operator ?? "",
     purchaser: product.purchaser ?? "",
@@ -8888,16 +8886,14 @@ function buildProductPayload(
     .filter((detail) => detail !== null) as NonIntegratedBomDetail[];
 
   const normalizedBrand = formValues.brand.trim() || "基本盘";
-  const normalizedAdaptableBrands = copiedFromProductId
-    ? [normalizedBrand]
-    : Array.from(
-        new Set([
-          normalizedBrand,
-          ...BRAND_OPTIONS.filter((brand) =>
-            formValues.adaptableBrands.includes(brand),
-          ),
-        ]),
-      );
+  const normalizedAdaptableBrands = Array.from(
+    new Set([
+      normalizedBrand,
+      ...BRAND_OPTIONS.filter((brand) =>
+        formValues.adaptableBrands.includes(brand),
+      ),
+    ]),
+  );
   const normalizedReviewRounds = (
     reviewRounds.length > 0 ? reviewRounds : [createReviewRound(1)]
   ).map((round, index) => {
@@ -8971,6 +8967,8 @@ function buildProductPayload(
       rawOpeningReference.productImageName.trim();
   const normalizedOpeningReference = {
     ...rawOpeningReference,
+    brand: normalizedBrand,
+    adaptableBrands: normalizedAdaptableBrands,
     productImage: sharedProductImage,
     productImageName: sharedProductImageName,
   };
@@ -10164,7 +10162,6 @@ export default function NonIntegratedDetailClient({
     };
   }, []);
 
-  const isCopiedBrandProduct = Boolean(existingProduct?.copiedFromProductId);
   const isDocumentWorkspaceMode = documentWorkspaceView === "document";
   const sharedProductImage =
     openingReference.productImage.trim() || formValues.previewImage.trim();
@@ -13840,9 +13837,10 @@ export default function NonIntegratedDetailClient({
   function updateAdaptableBrands(value: string[]) {
     if (isReadOnly) return;
 
+    const nextBrand = formValues.brand.trim() || "基本盘";
     const nextAdaptableBrands = Array.from(
       new Set([
-        formValues.brand,
+        nextBrand,
         ...BRAND_OPTIONS.filter((brand) => value.includes(brand)),
       ]),
     );
@@ -13851,8 +13849,14 @@ export default function NonIntegratedDetailClient({
       ...current,
       adaptableBrands: nextAdaptableBrands,
     }));
+    setOpeningReferenceAndRef((current) => ({
+      ...current,
+      brand: current.brand.trim() || nextBrand,
+      adaptableBrands: nextAdaptableBrands,
+    }));
     setSaveMessage("");
     setSaveMessageType("success");
+    scheduleAutoSave();
   }
 
   function updateSkuItem(
@@ -15479,21 +15483,29 @@ export default function NonIntegratedDetailClient({
   function handleOpeningReferenceAdaptableBrandsChange(value: string[]) {
     if (isReadOnly) return;
 
-    setOpeningReferenceAndRef((current) => {
-      const nextBrand = current.brand.trim() || "基本盘";
+    const nextBrand =
+      formValues.brand.trim() ||
+      openingReferenceRef.current.brand.trim() ||
+      "基本盘";
+    const nextAdaptableBrands = Array.from(
+      new Set([
+        nextBrand,
+        ...BRAND_OPTIONS.filter((brand) => value.includes(brand)),
+      ]),
+    );
 
-      return {
-        ...current,
-        adaptableBrands: Array.from(
-          new Set([
-            nextBrand,
-            ...BRAND_OPTIONS.filter((brand) => value.includes(brand)),
-          ]),
-        ),
-      };
-    });
+    setOpeningReferenceAndRef((current) => ({
+      ...current,
+      brand: current.brand.trim() || nextBrand,
+      adaptableBrands: nextAdaptableBrands,
+    }));
+    setFormValuesAndRef((current) => ({
+      ...current,
+      adaptableBrands: nextAdaptableBrands,
+    }));
     setSaveMessage("");
     setSaveMessageType("success");
+    scheduleAutoSave();
   }
 
   async function handleOpeningReferenceImageChange(
@@ -24164,19 +24176,12 @@ function renderFactoryQualityWorkspace() {
                                     ) : null}
                                     {field.key === "operator" ? (
                                       <CreateFieldShell>
-                                        {isCopiedBrandProduct ? (
-                                          <SingleAdaptableBrandField
-                                            value={formValues.brand}
-                                            compact
-                                          />
-                                        ) : (
-                                          <AdaptableBrandField
-                                            value={formValues.adaptableBrands}
-                                            readOnly={isReadOnly}
-                                            onChange={updateAdaptableBrands}
-                                            compact
-                                          />
-                                        )}
+                                        <AdaptableBrandField
+                                          value={formValues.adaptableBrands}
+                                          readOnly={isReadOnly}
+                                          onChange={updateAdaptableBrands}
+                                          compact
+                                        />
                                       </CreateFieldShell>
                                     ) : null}
                                   </Fragment>
@@ -27836,32 +27841,3 @@ function renderFactoryQualityWorkspace() {
     </div>
   );
 }
-
-function SingleAdaptableBrandField({
-  value,
-  compact = false,
-}: {
-  value: string;
-  compact?: boolean;
-}) {
-  return (
-    <div
-      className={
-        compact
-          ? ""
-          : "rounded-apple-lg border border-apple-separator bg-apple-bg-primary p-2"
-      }
-    >
-      <FieldLabel label="适配品牌" />
-      <div
-        className={
-          compact
-            ? "inline-flex h-6 max-w-full items-center rounded-full border border-apple-separator/70 bg-apple-bg-secondary/50 px-2 text-xs text-apple-label-primary"
-            : "flex h-8 w-full items-center rounded-apple-lg border border-apple-separator bg-apple-bg-secondary px-2.5 text-xs text-apple-label-primary"
-        }
-      >
-        <span className="truncate">{value || "-"}</span>
-      </div>
-    </div>
-  );
-}
diff --git a/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.test.ts b/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.test.ts
index d40b4db7..8b5fe522 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.test.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.test.ts
@@ -555,13 +555,54 @@ describe('nonIntegratedStorage', () => {
       id: 'source-product',
       spu: 'SZ0230',
       brand: '基本盘',
+      adaptableBrands: ['基本盘', '顾家', '索菲亚'],
+      skuItems: [
+        {
+          id: 'sku-1',
+          skuSequence: 1,
+          batchNo: 1,
+          packageGroupId: '',
+          packageSuffix: '',
+          image: '',
+          imageName: '',
+          model: 'SZ0230K01',
+          skuCode: 'SZ023001',
+          setCount: '1',
+          specName: '款式一',
+          barcode: 'SZ023001N1280V01',
+          size: '140/60/75',
+          color: '胡桃色',
+          material: '橡胶木',
+          versionNo: 'V01',
+          attributeCode: 'A',
+          drawingId: 'SZ0230K01AV01',
+          installMethod: '拆装',
+          executeStandard: '',
+          nationalStandardCompliant: '',
+          manufacturer: '',
+          manufacturerCode: 'N1280',
+          salesStatus: '销售',
+          tagMaterial: '',
+          model3dFileName: '',
+          model3dDataUrl: '',
+        },
+      ],
     })
 
     const copiedProduct = createCopiedNonIntegratedProduct(sourceProduct, '顾家')
 
     expect(copiedProduct.id).not.toBe(sourceProduct.id)
     expect(copiedProduct.brand).toBe('顾家')
+    expect(copiedProduct.adaptableBrands).toEqual(['顾家', '基本盘', '索菲亚'])
+    expect(copiedProduct.openingReference.adaptableBrands).toEqual([
+      '顾家',
+      '基本盘',
+      '索菲亚',
+    ])
     expect(copiedProduct.spu).toBe('GBGJ-SZ0230')
+    expect(copiedProduct.skuItems[0]?.model).toBe('GBGJ-SZ0230K01')
+    expect(copiedProduct.skuItems[0]?.skuCode).toBe('GBGJ-SZ023001')
+    expect(copiedProduct.skuItems[0]?.barcode).toBe('GBGJ-SZ023001N1280V01')
     expect(copiedProduct.copiedFromProductId).toBe('source-product')
     expect(copiedProduct.copiedFromSpu).toBe('SZ0230')
     expect(Object.values(copiedProduct.documentWorkspaceConfirmations)).toEqual(
diff --git a/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts b/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts
index a1cd3d61..1e2325b6 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts
@@ -620,6 +620,7 @@ export function stripNonIntegratedBrandPrefix(value: string) {
   const normalizedValue = normalizeNonIntegratedCode(value);
 
   for (const prefix of Object.values(NON_INTEGRATED_BRAND_PREFIX_MAP)) {
+    if (!prefix) continue;
     if (prefix && normalizedValue.startsWith(prefix)) {
       return normalizedValue.slice(prefix.length);
     }
@@ -639,6 +640,19 @@ export function applyBrandPrefixToNonIntegratedCode(
   return `${prefix}${normalizedBaseValue}`;
 }
 
+function replaceExistingBrandPrefix(value: string, targetBrand: string) {
+  const normalizedValue = normalizeNonIntegratedCode(value);
+  if (!normalizedValue) return "";
+
+  const hasBrandPrefix = Object.values(NON_INTEGRATED_BRAND_PREFIX_MAP).some(
+    (prefix) => Boolean(prefix) && normalizedValue.startsWith(prefix),
+  );
+
+  return hasBrandPrefix
+    ? applyBrandPrefixToNonIntegratedCode(normalizedValue, targetBrand)
+    : value;
+}
+
 export function getSearchableNonIntegratedSpuKeywords(spu: string) {
   const normalizedSpu = normalizeNonIntegratedCode(spu);
   const baseSpu = stripNonIntegratedBrandPrefix(spu);
@@ -2195,6 +2209,16 @@ export function createCopiedNonIntegratedProduct(
     sourceProduct.spu,
     targetBrand,
   );
+  const sourceOpeningReference = normalizeNonIntegratedOpeningReference(
+    sourceProduct.openingReference,
+  );
+  const nextAdaptableBrands = Array.from(
+    new Set([
+      targetBrand,
+      ...sourceProduct.adaptableBrands,
+      ...sourceOpeningReference.adaptableBrands,
+    ].filter((brand) => brand.trim().length > 0)),
+  );
   const now = new Date().toISOString();
 
   return {
@@ -2208,13 +2232,13 @@ export function createCopiedNonIntegratedProduct(
       sourceProduct.projectReview,
     ),
     openingReference: {
-      ...normalizeNonIntegratedOpeningReference(sourceProduct.openingReference),
+      ...sourceOpeningReference,
       temporaryCode: nextSpu,
       brand: targetBrand,
-      adaptableBrands: [targetBrand],
+      adaptableBrands: nextAdaptableBrands,
     },
     brand: targetBrand,
-    adaptableBrands: [targetBrand],
+    adaptableBrands: nextAdaptableBrands,
     styleDetails: sourceProduct.styleDetails.map((detail) => ({
       ...detail,
       model3dNodeOffsets: detail.model3dNodeOffsets
@@ -2264,16 +2288,31 @@ export function createCopiedNonIntegratedProduct(
         ...row,
       })),
     },
-    skuItems: sourceProduct.skuItems.map((item) => ({
-      ...item,
-      model: applyBrandPrefixToNonIntegratedCode(item.model, targetBrand),
-      model3dNodeOffsets: item.model3dNodeOffsets
-        ? { ...item.model3dNodeOffsets }
-        : {},
-      model3dNodeRotations: item.model3dNodeRotations
-        ? { ...item.model3dNodeRotations }
-        : {},
-    })),
+    skuItems: sourceProduct.skuItems.map((item) => {
+      const nextModel = applyBrandPrefixToNonIntegratedCode(
+        item.model,
+        targetBrand,
+      );
+      const nextSkuCode = applyBrandPrefixToNonIntegratedCode(
+        item.skuCode,
+        targetBrand,
+      );
+
+      return {
+        ...item,
+        model: nextModel,
+        skuCode: nextSkuCode,
+        barcode: applyBrandPrefixToNonIntegratedCode(item.barcode, targetBrand),
+        specName: replaceExistingBrandPrefix(item.specName, targetBrand),
+        drawingId: replaceExistingBrandPrefix(item.drawingId, targetBrand),
+        model3dNodeOffsets: item.model3dNodeOffsets
+          ? { ...item.model3dNodeOffsets }
+          : {},
+        model3dNodeRotations: item.model3dNodeRotations
+          ? { ...item.model3dNodeRotations }
+          : {},
+      };
+    }),
     factoryRows: [],
     pricingRows: [],
     planningLayoutRows: sourceProduct.planningLayoutRows.map((row) => ({

From e2be21d21b1866d0568732d6b1f7eda0a4b0418b Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Tue, 19 May 2026 19:34:35 +0800
Subject: [PATCH 21/21] fix: load jst directory options for intake

---
 .../api/intake/jst-directory-options/route.ts |  21 ++
 .../NonIntegratedDetailClient.tsx             | 250 +++++++++++++++---
 .../jst-planning-directory.service.ts         | 178 +++++++++++++
 3 files changed, 414 insertions(+), 35 deletions(-)
 create mode 100644 furniture-3d-system/src/app/api/intake/jst-directory-options/route.ts
 create mode 100644 furniture-3d-system/src/server/services/jst-planning-directory.service.ts

diff --git a/furniture-3d-system/src/app/api/intake/jst-directory-options/route.ts b/furniture-3d-system/src/app/api/intake/jst-directory-options/route.ts
new file mode 100644
index 00000000..e8e5a362
--- /dev/null
+++ b/furniture-3d-system/src/app/api/intake/jst-directory-options/route.ts
@@ -0,0 +1,21 @@
+import { NextRequest } from 'next/server'
+import { handleRequest, jsonSuccess } from '@/server/core/response'
+import { jstPlanningDirectoryService } from '@/server/services/jst-planning-directory.service'
+
+export const dynamic = 'force-dynamic'
+
+export async function GET(request: NextRequest) {
+  return handleRequest(
+    request,
+    async (ctx) => {
+      try {
+        const options = await jstPlanningDirectoryService.listOptions()
+        return jsonSuccess(options, 200, ctx.requestId)
+      } catch (error) {
+        console.error('Failed to load JST planning directory options', error)
+        return jsonSuccess({ suppliers: [], warehouses: [] }, 200, ctx.requestId)
+      }
+    },
+    { requireAuth: true },
+  )
+}
diff --git a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
index a90389e8..fbb75a92 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
@@ -231,7 +231,11 @@ import {
   EXECUTION_STANDARD_OPTIONS,
   normalizeExecutionStandardLookupKey,
 } from "./executionStandardDirectory";
-import { SUPPLIER_CODE_BY_NAME, SUPPLIER_DIRECTORY } from "./supplierDirectory";
+import {
+  SUPPLIER_CODE_BY_NAME,
+  SUPPLIER_DIRECTORY,
+  type SupplierDirectoryEntry,
+} from "./supplierDirectory";
 import {
   canCreateNonIntegratedProductFromIntake,
   canEditNonIntegratedProductIdentity,
@@ -801,6 +805,31 @@ function getUniqueNonEmptyStrings(
   );
 }
 
+function normalizeJstSupplierOptions(value: unknown): SupplierDirectoryEntry[] {
+  if (!Array.isArray(value)) return [];
+
+  const supplierByName = new Map<string, SupplierDirectoryEntry>();
+  value.forEach((item) => {
+    if (!item || typeof item !== "object") return;
+    const record = item as { name?: unknown; code?: unknown };
+    const name = typeof record.name === "string" ? record.name.trim() : "";
+    if (!name || supplierByName.has(name)) return;
+    supplierByName.set(name, {
+      name,
+      code: typeof record.code === "string" ? record.code.trim().toUpperCase() : "",
+    });
+  });
+
+  return Array.from(supplierByName.values());
+}
+
+function normalizeJstWarehouseOptions(value: unknown) {
+  if (!Array.isArray(value)) return [];
+  return getUniqueNonEmptyStrings(
+    value.map((item) => (typeof item === "string" ? item : "")),
+  );
+}
+
 function normalizeSeriesNameKey(value: string) {
   return value.trim().toLowerCase();
 }
@@ -4810,9 +4839,15 @@ function buildSkuItemFromImportedRow(
   };
 }
 
-function normalizeFactorySupplier(value: string) {
+function normalizeFactorySupplier(
+  value: string,
+  supplierCodeByName: ReadonlyMap<string, string> = SUPPLIER_CODE_BY_NAME,
+) {
   const normalizedName = value.trim();
-  const matchedSupplier = resolveSupplierEntryByName(normalizedName);
+  const matchedSupplier = resolveSupplierEntryByName(
+    normalizedName,
+    supplierCodeByName,
+  );
 
   return {
     name: matchedSupplier ? matchedSupplier.name : normalizedName,
@@ -4847,6 +4882,7 @@ function resolveAutoAwareBarcode(
 function createProductFactoryRowFromSku(
   sku: NonIntegratedSkuItem,
   existingRow?: NonIntegratedFactoryRow,
+  supplierCodeByName: ReadonlyMap<string, string> = SUPPLIER_CODE_BY_NAME,
 ): NonIntegratedFactoryRow {
   const confirmed = existingRow?.confirmed ?? false;
   const savedSupplierName = existingRow?.supplierName?.trim() ?? "";
@@ -4857,7 +4893,7 @@ function createProductFactoryRowFromSku(
       : confirmed
         ? sku.manufacturer || savedSupplierName
         : savedSupplierName || sku.manufacturer;
-  const supplier = normalizeFactorySupplier(supplierSource);
+  const supplier = normalizeFactorySupplier(supplierSource, supplierCodeByName);
   const supplierCode =
     importedContentLocked && !confirmed
       ? supplier.code ||
@@ -4904,19 +4940,28 @@ function createProductFactoryRowFromSku(
 function buildProductFactoryRows(
   skuItems: NonIntegratedSkuItem[],
   savedRows: NonIntegratedFactoryRow[],
+  supplierCodeByName: ReadonlyMap<string, string> = SUPPLIER_CODE_BY_NAME,
 ) {
   const rowBySkuId = new Map(savedRows.map((row) => [row.skuId, row]));
 
   return skuItems.map((sku) =>
-    createProductFactoryRowFromSku(sku, rowBySkuId.get(sku.id)),
+    createProductFactoryRowFromSku(
+      sku,
+      rowBySkuId.get(sku.id),
+      supplierCodeByName,
+    ),
   );
 }
 
 function normalizeFactoryRowsForPayload(
   rows: NonIntegratedFactoryRow[],
+  supplierCodeByName: ReadonlyMap<string, string> = SUPPLIER_CODE_BY_NAME,
 ): NonIntegratedFactoryRow[] {
   return rows.map((row) => {
-    const supplier = normalizeFactorySupplier(row.supplierName);
+    const supplier = normalizeFactorySupplier(
+      row.supplierName,
+      supplierCodeByName,
+    );
     const supplierName = supplier.name || row.supplierName.trim();
     const supplierCode =
       row.supplierCode.trim().toUpperCase() || supplier.code;
@@ -7685,11 +7730,14 @@ function attachModelFileNameToUrl(objectUrl: string, fileName: string) {
   return `${objectUrl}#${encodeURIComponent(normalizedFileName)}`;
 }
 
-function resolveSupplierEntryByName(value: string) {
+function resolveSupplierEntryByName(
+  value: string,
+  supplierCodeByName: ReadonlyMap<string, string> = SUPPLIER_CODE_BY_NAME,
+) {
   const normalizedName = value.trim();
   if (!normalizedName) return null;
 
-  const code = SUPPLIER_CODE_BY_NAME.get(normalizedName);
+  const code = supplierCodeByName.get(normalizedName);
   if (!code) return null;
 
   return {
@@ -7997,6 +8045,7 @@ function SkuBarcodeField({
 
 function SkuSupplierNameField({
   value,
+  options = SUPPLIER_DIRECTORY.map((entry) => entry.name),
   readOnly = false,
   columnWidth = SKU_COLUMN_DEFAULT_WIDTHS.supplierName,
   onChange,
@@ -8004,6 +8053,7 @@ function SkuSupplierNameField({
   onColumnResize,
 }: {
   value: string;
+  options?: readonly string[];
   readOnly?: boolean;
   columnWidth?: number;
   onChange: (value: string) => void;
@@ -8022,7 +8072,7 @@ function SkuSupplierNameField({
       <InlineSuggestionInput
         ariaLabel="供应商名称"
         value={value}
-        options={SUPPLIER_DIRECTORY.map((entry) => entry.name)}
+        options={options}
         placeholder="搜索供应商名称"
         readOnly={readOnly}
         filterOptions
@@ -8037,6 +8087,40 @@ function SkuSupplierNameField({
   );
 }
 
+function FactoryWarehouseField({
+  value,
+  options,
+  readOnly = false,
+  onChange,
+}: {
+  value: string;
+  options: readonly string[];
+  readOnly?: boolean;
+  onChange: (value: string) => void;
+}) {
+  return (
+    <div
+      className={`relative overflow-visible rounded border border-apple-separator ${
+        readOnly ? "bg-apple-bg-primary" : "bg-[#eef1f4]"
+      }`}
+    >
+      <InlineSuggestionInput
+        ariaLabel="仓库"
+        value={value}
+        options={options}
+        placeholder="搜索仓库"
+        readOnly={readOnly}
+        filterOptions
+        onChange={onChange}
+        inputClassName={`h-8 w-full border-0 bg-transparent px-2 pr-8 text-xs text-apple-label-primary outline-none ${
+          readOnly ? "text-apple-label-secondary" : ""
+        }`}
+        panelClassName="absolute left-0 top-[calc(100%+4px)] z-50 max-h-56 min-w-full overflow-auto rounded-apple-lg border border-apple-separator bg-apple-bg-primary p-1 shadow-apple-md"
+      />
+    </div>
+  );
+}
+
 function SkuExecutionStandardField({
   value,
   readOnly = false,
@@ -9999,6 +10083,63 @@ export default function NonIntegratedDetailClient({
     WorkflowNodeCategory,
     string
   > | null>(null);
+  const [supplierDirectoryOptions, setSupplierDirectoryOptions] =
+    useState<SupplierDirectoryEntry[]>(SUPPLIER_DIRECTORY);
+  const [warehouseDirectoryOptions, setWarehouseDirectoryOptions] = useState<
+    string[]
+  >([]);
+  const supplierNameOptions = useMemo(
+    () => supplierDirectoryOptions.map((entry) => entry.name),
+    [supplierDirectoryOptions],
+  );
+  const supplierCodeByName = useMemo(
+    () =>
+      new Map(
+        supplierDirectoryOptions.map((entry) => [
+          entry.name,
+          entry.code.trim().toUpperCase(),
+        ]),
+      ),
+    [supplierDirectoryOptions],
+  );
+
+  useEffect(() => {
+    let cancelled = false;
+
+    async function loadDirectoryOptions() {
+      try {
+        const response = await fetch("/api/intake/jst-directory-options", {
+          credentials: "same-origin",
+        });
+        if (!response.ok) return;
+        const payload = (await response.json()) as {
+          data?: {
+            suppliers?: unknown;
+            warehouses?: unknown;
+          };
+        };
+        if (cancelled) return;
+
+        const suppliers = normalizeJstSupplierOptions(payload.data?.suppliers);
+        const warehouses = normalizeJstWarehouseOptions(
+          payload.data?.warehouses,
+        );
+
+        if (suppliers.length > 0) {
+          setSupplierDirectoryOptions(suppliers);
+        }
+        setWarehouseDirectoryOptions(warehouses);
+      } catch {
+        // Keep local fallback options when the planning database is unavailable.
+      }
+    }
+
+    loadDirectoryOptions();
+
+    return () => {
+      cancelled = true;
+    };
+  }, []);
 
   const isFlowAbandoned = projectStatus === "rejected";
   const hasCurrentUserContext = Boolean(currentUserRole);
@@ -10571,8 +10712,13 @@ export default function NonIntegratedDetailClient({
     orderedComponentSkuRows,
   ]);
   const productFactoryRows = useMemo(
-    () => buildProductFactoryRows(derivedSkuItems, factoryRows),
-    [derivedSkuItems, factoryRows],
+    () =>
+      buildProductFactoryRows(
+        derivedSkuItems,
+        factoryRows,
+        supplierCodeByName,
+      ),
+    [derivedSkuItems, factoryRows, supplierCodeByName],
   );
   const productPricingRows = useMemo(
     () => buildProductPricingRows(derivedSkuItems, pricingRows),
@@ -13939,7 +14085,10 @@ export default function NonIntegratedDetailClient({
     index: number,
     value: string,
   ) {
-    const matchedSupplier = resolveSupplierEntryByName(value);
+    const matchedSupplier = resolveSupplierEntryByName(
+      value,
+      supplierCodeByName,
+    );
     const nextItem = {
       ...item,
       manufacturer: matchedSupplier ? matchedSupplier.name : value,
@@ -14058,7 +14207,7 @@ export default function NonIntegratedDetailClient({
     if (currentFactoryRow?.confirmed) return;
 
     if (key === "supplierName") {
-      const supplier = normalizeFactorySupplier(value);
+      const supplier = normalizeFactorySupplier(value, supplierCodeByName);
       const supplierName = supplier.name || value;
 
       setSkuItems((current) =>
@@ -14074,7 +14223,11 @@ export default function NonIntegratedDetailClient({
     }
 
     setFactoryRows((current) => {
-      const currentRows = buildProductFactoryRows(derivedSkuItems, current);
+      const currentRows = buildProductFactoryRows(
+        derivedSkuItems,
+        current,
+        supplierCodeByName,
+      );
       return currentRows.map((row) => {
         if (row.skuId !== skuId || row.confirmed) return row;
         const derivedSkuItem = derivedSkuItems.find(
@@ -14083,7 +14236,7 @@ export default function NonIntegratedDetailClient({
         const versionNo = derivedSkuItem?.versionNo ?? "V01";
 
         if (key === "supplierName") {
-          const supplier = normalizeFactorySupplier(value);
+          const supplier = normalizeFactorySupplier(value, supplierCodeByName);
           const supplierName = supplier.name || value;
           const supplierCode = supplier.code;
           const importedContentLocked =
@@ -14344,7 +14497,10 @@ export default function NonIntegratedDetailClient({
 
     const currentRow = productFactoryRows.find((row) => row.skuId === skuId);
     if (currentRow?.confirmed) return;
-    const supplier = normalizeFactorySupplier(currentRow?.supplierName ?? "");
+    const supplier = normalizeFactorySupplier(
+      currentRow?.supplierName ?? "",
+      supplierCodeByName,
+    );
     const supplierName =
       supplier.name || currentRow?.supplierName.trim() || "";
 
@@ -14359,7 +14515,11 @@ export default function NonIntegratedDetailClient({
     }
 
     setFactoryRows((current) => {
-      const currentRows = buildProductFactoryRows(derivedSkuItems, current);
+      const currentRows = buildProductFactoryRows(
+        derivedSkuItems,
+        current,
+        supplierCodeByName,
+      );
       return currentRows.map((row) => {
         if (row.skuId !== skuId || row.confirmed) return row;
         const derivedSkuItem = derivedSkuItems.find(
@@ -14367,7 +14527,10 @@ export default function NonIntegratedDetailClient({
         );
         const versionNo = derivedSkuItem?.versionNo ?? "V01";
 
-        const supplier = normalizeFactorySupplier(row.supplierName);
+        const supplier = normalizeFactorySupplier(
+          row.supplierName,
+          supplierCodeByName,
+        );
         const supplierName = supplier.name || row.supplierName.trim();
         const supplierCode =
           row.supplierCode.trim().toUpperCase() || supplier.code;
@@ -14402,14 +14565,16 @@ export default function NonIntegratedDetailClient({
     const targetSkuIds = new Set(
       displayedProductFactoryRows.map((row) => row.skuId),
     );
-    const normalizedRows = normalizeFactoryRowsForPayload(productFactoryRows).map(
-      (row) =>
-        targetSkuIds.has(row.skuId)
-          ? {
-              ...row,
-              confirmed: true,
-            }
-          : row,
+    const normalizedRows = normalizeFactoryRowsForPayload(
+      productFactoryRows,
+      supplierCodeByName,
+    ).map((row) =>
+      targetSkuIds.has(row.skuId)
+        ? {
+            ...row,
+            confirmed: true,
+          }
+        : row,
     );
     const allRowsConfirmed = normalizedRows.every((row) => row.confirmed);
     const nextConfirmations = {
@@ -14449,14 +14614,16 @@ export default function NonIntegratedDetailClient({
     const targetSkuIds = new Set(
       displayedProductFactoryRows.map((row) => row.skuId),
     );
-    const normalizedRows = normalizeFactoryRowsForPayload(productFactoryRows).map(
-      (row) =>
-        targetSkuIds.has(row.skuId)
-          ? {
-              ...row,
-              confirmed: false,
-            }
-          : row,
+    const normalizedRows = normalizeFactoryRowsForPayload(
+      productFactoryRows,
+      supplierCodeByName,
+    ).map((row) =>
+      targetSkuIds.has(row.skuId)
+        ? {
+            ...row,
+            confirmed: false,
+          }
+        : row,
     );
     const nextConfirmations = {
       ...documentWorkspaceConfirmations,
@@ -19468,6 +19635,7 @@ export default function NonIntegratedDetailClient({
                       <td className="px-2 py-2">
                         <SkuSupplierNameField
                           value={row.supplierName}
+                          options={supplierNameOptions}
                           readOnly={isReadOnly || row.confirmed}
                           onChange={(value) =>
                             updateProductFactoryRow(
@@ -19482,7 +19650,18 @@ export default function NonIntegratedDetailClient({
                         />
                       </td>
                       <td className="px-2 py-2">
-                        {renderFactoryInput(row, "warehouse", "请输入仓库")}
+                        <FactoryWarehouseField
+                          value={row.warehouse}
+                          options={warehouseDirectoryOptions}
+                          readOnly={isReadOnly || row.confirmed}
+                          onChange={(value) =>
+                            updateProductFactoryRow(
+                              row.skuId,
+                              "warehouse",
+                              value,
+                            )
+                          }
+                        />
                       </td>
                       <td className="px-2 py-2">
                         {renderFactoryInput(
@@ -25347,6 +25526,7 @@ function renderFactoryQualityWorkspace() {
                                             <td className="px-2 py-2">
                                               <SkuSupplierNameField
                                                 value={item.manufacturer}
+                                                options={supplierNameOptions}
                                                 readOnly={skuRowReadOnly}
                                                 columnWidth={
                                                   skuColumnWidths.supplierName
diff --git a/furniture-3d-system/src/server/services/jst-planning-directory.service.ts b/furniture-3d-system/src/server/services/jst-planning-directory.service.ts
new file mode 100644
index 00000000..45dbdfb0
--- /dev/null
+++ b/furniture-3d-system/src/server/services/jst-planning-directory.service.ts
@@ -0,0 +1,178 @@
+import mysql, {
+  type ConnectionOptions,
+  type RowDataPacket,
+} from 'mysql2/promise'
+
+export type JstPlanningSupplierOption = {
+  name: string
+  code: string
+}
+
+export type JstPlanningDirectoryOptions = {
+  suppliers: JstPlanningSupplierOption[]
+  warehouses: string[]
+}
+
+const SUPPLIER_TABLE = 'jst_supplier'
+const WAREHOUSE_TABLE = 'jst_warehouseInfo'
+const CACHE_TTL_MS = 5 * 60 * 1000
+
+let cachedOptions:
+  | {
+      expiresAt: number
+      value: JstPlanningDirectoryOptions
+    }
+  | null = null
+
+function readEnv(name: string) {
+  return process.env[name]?.trim() ?? ''
+}
+
+function readFirstEnv(names: string[]) {
+  return names.map(readEnv).find(Boolean) ?? ''
+}
+
+function createMysqlConnectionConfig(): string | ConnectionOptions {
+  const databaseUrl = readFirstEnv([
+    'JST_PLANNING_DATABASE_URL',
+    'PLANNING_DATABASE_URL',
+    'JST_SKU_DATABASE_URL',
+  ])
+
+  if (databaseUrl) {
+    return databaseUrl
+  }
+
+  const host = readFirstEnv([
+    'JST_PLANNING_DB_HOST',
+    'PLANNING_DB_HOST',
+    'JST_SKU_DB_HOST',
+  ])
+  const database = readFirstEnv([
+    'JST_PLANNING_DB_NAME',
+    'PLANNING_DB_NAME',
+    'JST_SKU_DB_NAME',
+  ])
+  const user = readFirstEnv([
+    'JST_PLANNING_DB_USER',
+    'PLANNING_DB_USER',
+    'JST_SKU_DB_USER',
+  ])
+  const password = readFirstEnv([
+    'JST_PLANNING_DB_PASSWORD',
+    'PLANNING_DB_PASSWORD',
+    'JST_SKU_DB_PASSWORD',
+  ])
+
+  if (!host || !database || !user || !password) {
+    throw new Error('JST planning database is not configured')
+  }
+
+  const port = Number(
+    readFirstEnv([
+      'JST_PLANNING_DB_PORT',
+      'PLANNING_DB_PORT',
+      'JST_SKU_DB_PORT',
+    ]) || '3306',
+  )
+  const charset =
+    readFirstEnv([
+      'JST_PLANNING_DB_CHARSET',
+      'PLANNING_DB_CHARSET',
+      'JST_SKU_DB_CHARSET',
+    ]) || 'utf8mb4'
+  const sslEnabled =
+    readFirstEnv([
+      'JST_PLANNING_DB_SSL',
+      'PLANNING_DB_SSL',
+      'JST_SKU_DB_SSL',
+    ]) === 'true'
+
+  return {
+    host,
+    port,
+    database,
+    user,
+    password,
+    charset,
+    ssl: sslEnabled ? {} : undefined,
+    supportBigNumbers: true,
+    dateStrings: true,
+  }
+}
+
+function normalizeString(value: unknown) {
+  return typeof value === 'string' ? value.trim() : String(value ?? '').trim()
+}
+
+function normalizeSupplierCode(value: unknown) {
+  return normalizeString(value).toUpperCase()
+}
+
+function uniqueNonEmpty(values: string[]) {
+  return Array.from(new Set(values.map((value) => value.trim()).filter(Boolean)))
+}
+
+async function fetchDirectoryOptions(): Promise<JstPlanningDirectoryOptions> {
+  const connectionConfig = createMysqlConnectionConfig()
+  const connection =
+    typeof connectionConfig === 'string'
+      ? await mysql.createConnection(connectionConfig)
+      : await mysql.createConnection(connectionConfig)
+
+  try {
+    const [supplierRows] = await connection.query<RowDataPacket[]>(
+      `SELECT TRIM(CAST(\`scmname\` AS CHAR)) AS name,
+              UPPER(TRIM(CAST(\`scmcode\` AS CHAR))) AS code
+         FROM \`${SUPPLIER_TABLE}\`
+        WHERE \`scmname\` IS NOT NULL
+          AND TRIM(CAST(\`scmname\` AS CHAR)) <> ''
+        ORDER BY name
+        LIMIT 5000`,
+    )
+    const supplierByName = new Map<string, JstPlanningSupplierOption>()
+
+    supplierRows.forEach((row) => {
+      const name = normalizeString(row.name)
+      if (!name || supplierByName.has(name)) return
+      supplierByName.set(name, {
+        name,
+        code: normalizeSupplierCode(row.code),
+      })
+    })
+
+    const [warehouseRows] = await connection.query<RowDataPacket[]>(
+      `SELECT TRIM(CAST(\`name\` AS CHAR)) AS name
+         FROM \`${WAREHOUSE_TABLE}\`
+        WHERE \`name\` IS NOT NULL
+          AND TRIM(CAST(\`name\` AS CHAR)) <> ''
+        ORDER BY name
+        LIMIT 2000`,
+    )
+
+    return {
+      suppliers: Array.from(supplierByName.values()),
+      warehouses: uniqueNonEmpty(
+        warehouseRows.map((row) => normalizeString(row.name)),
+      ),
+    }
+  } finally {
+    await connection.end()
+  }
+}
+
+export const jstPlanningDirectoryService = {
+  async listOptions(): Promise<JstPlanningDirectoryOptions> {
+    const now = Date.now()
+    if (cachedOptions && cachedOptions.expiresAt > now) {
+      return cachedOptions.value
+    }
+
+    const value = await fetchDirectoryOptions()
+    cachedOptions = {
+      expiresAt: now + CACHE_TTL_MS,
+      value,
+    }
+    return value
+  },
+}