{[
"定厂",
@@ -141,14 +141,18 @@ export function ProductFactoryInfoTable({
|
- {isProductFactoryRowComplete(row)
- ? "已完成"
- : "当前资料未填完"}
+ {row.confirmed
+ ? "已确认"
+ : isProductFactoryRowComplete(row)
+ ? "资料已填完"
+ : "当前资料未填完"}
|
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactorySkuInfoTable.tsx b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactorySkuInfoTable.tsx
index 5c3371c4..7502a136 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactorySkuInfoTable.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactorySkuInfoTable.tsx
@@ -8,9 +8,9 @@ export function ProductFactorySkuInfoTable({
rows: NonIntegratedFactoryRow[];
}) {
return (
-
+
-
+
{[
"定厂",
@@ -40,14 +40,18 @@ export function ProductFactorySkuInfoTable({
|
- {isProductFactoryRowComplete(row)
- ? "已完成"
- : "当前资料未填完"}
+ {row.confirmed
+ ? "已确认"
+ : isProductFactoryRowComplete(row)
+ ? "资料已填完"
+ : "当前资料未填完"}
|
{row.model || "-"} |
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactoryWorkspace.tsx b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactoryWorkspace.tsx
index d21bab4f..4a185372 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactoryWorkspace.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactoryWorkspace.tsx
@@ -91,7 +91,7 @@ export function ProductFactoryWorkspace({
/>
-
+
{allRows.length === 0 ? (
当前还没有 SKU 信息，先维护 SKU 后再定厂。
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/productFactoryTargetSkuHelpers.ts b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/productFactoryTargetSkuHelpers.ts
index bfb2d1cc..43037ec2 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/productFactoryTargetSkuHelpers.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/productFactoryTargetSkuHelpers.ts
@@ -6,6 +6,7 @@ import {
MODEL_AUTOFILL_PRODUCT_FACTORY_KEYS,
MODEL_SHARED_PRODUCT_FACTORY_KEYS,
PACKAGE_SHARED_PRODUCT_FACTORY_KEYS,
+ SPU_SHARED_PRODUCT_FACTORY_KEYS,
type ProductFactoryEditableKey,
type ProductFactoryModelAutofillEntry,
} from "../basic-info/skuFieldConfig";
@@ -48,6 +49,10 @@ export function getProductFactoryTargetSkuIds(
const targetItem = items.find((item) => item.id === targetId);
if (!targetItem) return new Set([targetId]);
+ if (SPU_SHARED_PRODUCT_FACTORY_KEYS.has(key)) {
+ return new Set(items.map((item) => item.id));
+ }
+
if (MODEL_SHARED_PRODUCT_FACTORY_KEYS.has(key)) {
const targetModelKey = getSkuFactoryModelKey(targetItem);
if (!targetModelKey) return new Set([targetId]);
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/useProductFactoryRowController.ts b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/useProductFactoryRowController.ts
index 2bc298c1..b7bb17c0 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/useProductFactoryRowController.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/useProductFactoryRowController.ts
@@ -4,6 +4,7 @@ import type {
SetStateAction,
} from "react";
+import type { PersistEditedProductOverrides } from "../../nonIntegratedDetailTypes";
import type {
NonIntegratedDocumentWorkspaceApprovalMap,
NonIntegratedDocumentWorkspaceConfirmationMap,
@@ -16,10 +17,15 @@ import {
type ProductFactoryEditableKey,
type ProductFactoryModelAutofillEntry,
} from "../basic-info/skuFieldConfig";
-import { normalizeFactorySupplier, getProductFactoryStatusMessage } from "../basic-info/productFactoryHelpers";
+import {
+ getProductFactoryStatusMessage,
+ normalizeFactoryRowsForPayload,
+ normalizeFactorySupplier,
+} from "../basic-info/productFactoryHelpers";
import { buildSkuItemsAfterSetCountCommit } from "../basic-info/skuSetCountCommitHelpers";
import { getStyleKeyFromModel } from "../style-assets/styleFileHelpers";
import { PRODUCT_FACTORY_WORKSPACE_CATEGORY } from "../documents/documentWorkspaceConfig";
+import type { WorkflowNodeCategory } from "../documents/documentWorkspaceHelpers";
import {
confirmProductFactorySupplierRowsForSku,
reopenProductFactoryRows,
@@ -35,18 +41,30 @@ type ApplySkuSupplierName = (
value: string,
) => NonIntegratedSkuItem;
+type PersistEditedProduct = (params: {
+ successMessage: string;
+ errorFallbackMessage: string;
+ overrides?: PersistEditedProductOverrides;
+ suppressSuccessMessage?: boolean;
+}) => Promise ;
+
type UseProductFactoryRowControllerParams = {
applySkuSupplierName: ApplySkuSupplierName;
derivedSkuItems: NonIntegratedSkuItem[];
displayedProductFactoryHasPendingRows: boolean;
displayedProductFactoryHasSystemEnteredPricingRows: boolean;
+ displayedProductFactoryIsConfirmed: boolean;
displayedProductFactoryRows: NonIntegratedFactoryRow[];
displayedProductFactoryRowsComplete: boolean;
documentWorkspaceApprovedAt: NonIntegratedDocumentWorkspaceApprovalMap;
documentWorkspaceConfirmations: NonIntegratedDocumentWorkspaceConfirmationMap;
+ documentWorkspaceRevisionSignatureRef: MutableRefObject<
+ Record | null
+ >;
isCurrentUserAdmin: boolean;
isReadOnly: boolean;
isSkuItemFactoryConfirmed: (item: NonIntegratedSkuItem) => boolean;
+ persistEditedProduct: PersistEditedProduct;
productFactoryModelAutofillRef: MutableRefObject<
Map
>;
@@ -73,13 +91,16 @@ export function useProductFactoryRowController({
derivedSkuItems,
displayedProductFactoryHasPendingRows,
displayedProductFactoryHasSystemEnteredPricingRows,
+ displayedProductFactoryIsConfirmed,
displayedProductFactoryRows,
displayedProductFactoryRowsComplete,
documentWorkspaceApprovedAt,
documentWorkspaceConfirmations,
+ documentWorkspaceRevisionSignatureRef,
isCurrentUserAdmin,
isReadOnly,
isSkuItemFactoryConfirmed,
+ persistEditedProduct,
productFactoryModelAutofillRef,
productFactoryReopenField,
productFactoryRows,
@@ -156,32 +177,32 @@ export function useProductFactoryRowController({
if (key === "installMethod") {
setSkuItems((current) => {
- const targetItem = workflowSkuItems.find((item) => item.id === skuId);
- if (!targetItem) return current;
+ const targetSkuIds = getProductFactoryTargetSkuIds(
+ workflowSkuItems,
+ skuId,
+ key,
+ );
+ const targetStyleKeys = new Set(
+ workflowSkuItems
+ .filter((item) => targetSkuIds.has(item.id))
+ .map((item) => getStyleKeyFromModel(item.model))
+ .filter(Boolean),
+ );
- const targetStyleKey = getStyleKeyFromModel(targetItem.model);
- if (targetStyleKey) {
- const targetSkuIds = new Set(
- workflowSkuItems
- .filter((item) => getStyleKeyFromModel(item.model) === targetStyleKey)
- .map((item) => item.id),
- );
-
- setStyleDetails((currentDetails) =>
- updateStyleDetailEntry(currentDetails, targetStyleKey, {
- installMethod: value,
- }),
- );
-
- return current.map((item) =>
- targetSkuIds.has(item.id)
- ? { ...item, installMethod: value }
- : item,
- );
+ if (targetStyleKeys.size > 0) {
+ setStyleDetails((currentDetails) => {
+ let nextDetails = currentDetails;
+ targetStyleKeys.forEach((styleKey) => {
+ nextDetails = updateStyleDetailEntry(nextDetails, styleKey, {
+ installMethod: value,
+ });
+ });
+ return nextDetails;
+ });
}
return current.map((item) =>
- item.id === skuId ? { ...item, installMethod: value } : item,
+ targetSkuIds.has(item.id) ? { ...item, installMethod: value } : item,
);
});
}
@@ -235,13 +256,65 @@ export function useProductFactoryRowController({
setSaveMessageType("success");
}
- function handleProductFactoryStatusClick() {
+ async function handleProductFactoryStatusClick() {
const statusMessage = getProductFactoryStatusMessage({
isRowsComplete: displayedProductFactoryRowsComplete,
rows: displayedProductFactoryRows,
});
if (!statusMessage) return;
+ if (
+ !isReadOnly &&
+ displayedProductFactoryRowsComplete &&
+ !displayedProductFactoryIsConfirmed
+ ) {
+ const targetSkuIds = new Set(
+ displayedProductFactoryRows.map((row) => row.skuId),
+ );
+ const normalizedRows = normalizeFactoryRowsForPayload(
+ productFactoryRows,
+ supplierCodeByName,
+ );
+ const nextRows = normalizedRows.map((row) =>
+ targetSkuIds.has(row.skuId) ? { ...row, confirmed: true } : row,
+ );
+ const allRowsConfirmed =
+ nextRows.length > 0 && nextRows.every((row) => row.confirmed);
+ const approvedAt = new Date().toISOString();
+ const nextConfirmations = {
+ ...documentWorkspaceConfirmations,
+ [PRODUCT_FACTORY_WORKSPACE_CATEGORY]: allRowsConfirmed,
+ };
+ const nextApprovedAt = { ...documentWorkspaceApprovedAt };
+ if (allRowsConfirmed) {
+ nextApprovedAt[PRODUCT_FACTORY_WORKSPACE_CATEGORY] = approvedAt;
+ } else {
+ delete nextApprovedAt[PRODUCT_FACTORY_WORKSPACE_CATEGORY];
+ }
+
+ setFactoryRows(nextRows);
+ setDocumentWorkspaceConfirmations(nextConfirmations);
+ setDocumentWorkspaceApprovedAt(nextApprovedAt);
+ if (documentWorkspaceRevisionSignatureRef.current) {
+ documentWorkspaceRevisionSignatureRef.current = {
+ ...documentWorkspaceRevisionSignatureRef.current,
+ [PRODUCT_FACTORY_WORKSPACE_CATEGORY]: JSON.stringify(nextRows),
+ };
+ }
+ await persistEditedProduct({
+ successMessage: allRowsConfirmed
+ ? "产品定厂已确认"
+ : "当前批次产品定厂已确认",
+ errorFallbackMessage: "产品定厂确认保存失败",
+ overrides: {
+ factoryRows: nextRows,
+ documentWorkspaceConfirmations: nextConfirmations,
+ documentWorkspaceApprovedAt: nextApprovedAt,
+ },
+ });
+ return;
+ }
+
setSaveMessage(statusMessage.message);
setSaveMessageType(statusMessage.type);
}
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-workflow/useProductWorkflowRowController.ts b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-workflow/useProductWorkflowRowController.ts
index 760071d5..44f90cb7 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-workflow/useProductWorkflowRowController.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-workflow/useProductWorkflowRowController.ts
@@ -20,7 +20,10 @@ import type {
NonIntegratedSkuItem,
} from "../../nonIntegratedStorage";
import type { FinishedSampleShipmentEditableKey } from "../basic-info/skuFieldConfig";
-import { PRODUCT_PRICING_WORKSPACE_CATEGORY } from "../documents/documentWorkspaceConfig";
+import {
+ PRODUCT_PRICING_WORKSPACE_CATEGORY,
+ SAMPLE_MEASUREMENT_WORKSPACE_CATEGORY,
+} from "../documents/documentWorkspaceConfig";
import type { WorkflowNodeCategory } from "../documents/documentWorkspaceHelpers";
import {
updateFirstQualityRowsForSku,
@@ -77,7 +80,7 @@ type UseProductWorkflowRowControllerParams = {
documentWorkspaceRevisionSignatureRef: MutableRefObject<
Record | null
>;
- isProductFactorySkuComplete: (skuId: string) => boolean;
+ isProductFactorySkuConfirmed: (skuId: string) => boolean;
isProductLimitNodeLocked: boolean;
isProductPricingNodeLocked: boolean;
isReadOnly: boolean;
@@ -89,6 +92,8 @@ type UseProductWorkflowRowControllerParams = {
planningLayoutRowsRef: MutableRefObject;
pricingRows: NonIntegratedPricingRow[];
productId?: string;
+ productSampleMeasurementRows: NonIntegratedSampleMeasurementRow[];
+ sampleMeasurementRows: NonIntegratedSampleMeasurementRow[];
scheduleAutoSave: (overrides?: PersistEditedProductOverrides) => void;
setDocumentWorkspaceApprovedAt: Dispatch<
SetStateAction
@@ -128,7 +133,7 @@ export function useProductWorkflowRowController({
documentWorkspaceApprovedAt,
documentWorkspaceConfirmations,
documentWorkspaceRevisionSignatureRef,
- isProductFactorySkuComplete,
+ isProductFactorySkuConfirmed,
isProductLimitNodeLocked,
isProductPricingNodeLocked,
isReadOnly,
@@ -140,6 +145,8 @@ export function useProductWorkflowRowController({
planningLayoutRowsRef,
pricingRows,
productId,
+ productSampleMeasurementRows,
+ sampleMeasurementRows,
scheduleAutoSave,
setDocumentWorkspaceApprovedAt,
setDocumentWorkspaceConfirmations,
@@ -233,16 +240,25 @@ export function useProductWorkflowRowController({
});
const nextProductPricingCanBeConfirmed =
canConfirmProductPricingRows(nextPricingRows);
+ const nextSampleMeasurementCanBeConfirmedByPricing =
+ nextProductPricingCanBeConfirmed &&
+ productSampleMeasurementRows.length > 0;
const nextApprovedAt = nextProductPricingCanBeConfirmed
? {
...documentWorkspaceApprovedAt,
[PRODUCT_PRICING_WORKSPACE_CATEGORY]: pushedAt,
+ ...(nextSampleMeasurementCanBeConfirmedByPricing
+ ? { [SAMPLE_MEASUREMENT_WORKSPACE_CATEGORY]: pushedAt }
+ : {}),
}
: documentWorkspaceApprovedAt;
const nextConfirmations = nextProductPricingCanBeConfirmed
? {
...documentWorkspaceConfirmations,
[PRODUCT_PRICING_WORKSPACE_CATEGORY]: true,
+ ...(nextSampleMeasurementCanBeConfirmedByPricing
+ ? { [SAMPLE_MEASUREMENT_WORKSPACE_CATEGORY]: true }
+ : {}),
}
: documentWorkspaceConfirmations;
const pushSuccessMessage =
@@ -257,6 +273,12 @@ export function useProductWorkflowRowController({
...documentWorkspaceRevisionSignatureRef.current,
[PRODUCT_PRICING_WORKSPACE_CATEGORY]:
JSON.stringify(nextPricingRows),
+ ...(nextSampleMeasurementCanBeConfirmedByPricing
+ ? {
+ [SAMPLE_MEASUREMENT_WORKSPACE_CATEGORY]:
+ JSON.stringify(sampleMeasurementRows),
+ }
+ : {}),
};
}
}
@@ -456,7 +478,7 @@ export function useProductWorkflowRowController({
) {
if (
isReadOnly ||
- !isProductFactorySkuComplete(skuId) ||
+ !isProductFactorySkuConfirmed(skuId) ||
isSampleMeasurementSkuLocked(skuId)
)
return;
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/sample-workflow/SampleMeasurementHeaderActions.tsx b/furniture-3d-system/src/app/intake/non-integrated/workspaces/sample-workflow/SampleMeasurementHeaderActions.tsx
index 039f526e..689eddf0 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/sample-workflow/SampleMeasurementHeaderActions.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/sample-workflow/SampleMeasurementHeaderActions.tsx
@@ -4,6 +4,7 @@ type SampleMeasurementHeaderActionsProps = {
actionGroupClassName: string;
rowCount: number;
isProductFactoryConfirmed: boolean;
+ hasPendingRows: boolean;
isSampleMeasurementConfirmed: boolean;
onStatusClick: () => void;
};
@@ -12,6 +13,7 @@ export function SampleMeasurementHeaderActions({
actionGroupClassName,
rowCount,
isProductFactoryConfirmed,
+ hasPendingRows,
isSampleMeasurementConfirmed,
onStatusClick,
}: SampleMeasurementHeaderActionsProps) {
@@ -19,6 +21,7 @@ export function SampleMeasurementHeaderActions({
);
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/sample-workflow/sampleWorkflowHelpers.ts b/furniture-3d-system/src/app/intake/non-integrated/workspaces/sample-workflow/sampleWorkflowHelpers.ts
index 64e384a3..9a635cda 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/sample-workflow/sampleWorkflowHelpers.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/sample-workflow/sampleWorkflowHelpers.ts
@@ -153,7 +153,7 @@ export function getSampleMeasurementStatusMessage({
}
return {
- message: "样包测量已完成",
+ message: "资料已填完核对无误请确认。",
type: "success" as const,
};
}
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/sample-workflow/useSampleWorkflowStatusController.ts b/furniture-3d-system/src/app/intake/non-integrated/workspaces/sample-workflow/useSampleWorkflowStatusController.ts
index f77eb1de..4a2cb5b1 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/sample-workflow/useSampleWorkflowStatusController.ts
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/sample-workflow/useSampleWorkflowStatusController.ts
@@ -1,37 +1,77 @@
import type {
Dispatch,
+ MutableRefObject,
SetStateAction,
} from "react";
+import type { PersistEditedProductOverrides } from "../../nonIntegratedDetailTypes";
+import type {
+ NonIntegratedDocumentWorkspaceApprovalMap,
+ NonIntegratedDocumentWorkspaceConfirmationMap,
+} from "../../nonIntegratedStorage";
+import { SAMPLE_MEASUREMENT_WORKSPACE_CATEGORY } from "../documents/documentWorkspaceConfig";
+import type { WorkflowNodeCategory } from "../documents/documentWorkspaceHelpers";
import {
getFinishedSampleShipmentStatusMessage,
getSampleMeasurementStatusMessage,
+ normalizeSampleMeasurementRowsForPayload,
type ProductFinishedSampleShipmentDisplayRow,
type ProductSampleMeasurementDisplayRow,
} from "./sampleWorkflowHelpers";
type SaveMessageType = "success" | "error";
+type PersistEditedProduct = (params: {
+ successMessage: string;
+ errorFallbackMessage: string;
+ overrides?: PersistEditedProductOverrides;
+ suppressSuccessMessage?: boolean;
+}) => Promise;
+
type UseSampleWorkflowStatusControllerParams = {
+ documentWorkspaceApprovedAt: NonIntegratedDocumentWorkspaceApprovalMap;
+ documentWorkspaceConfirmations: NonIntegratedDocumentWorkspaceConfirmationMap;
displayedFinishedSampleShipmentRows: ProductFinishedSampleShipmentDisplayRow[];
displayedFinishedSampleShipmentRowsComplete: boolean;
displayedProductFactoryIsConfirmed: boolean;
displayedProductSampleMeasurementRows: ProductSampleMeasurementDisplayRow[];
+ displayedSampleMeasurementIsConfirmed: boolean;
displayedSampleMeasurementRowsComplete: boolean;
+ documentWorkspaceRevisionSignatureRef: MutableRefObject<
+ Record | null
+ >;
+ isReadOnly: boolean;
+ persistEditedProduct: PersistEditedProduct;
+ productSampleMeasurementRows: ProductSampleMeasurementDisplayRow[];
+ setDocumentWorkspaceApprovedAt: Dispatch<
+ SetStateAction
+ >;
+ setDocumentWorkspaceConfirmations: Dispatch<
+ SetStateAction
+ >;
setSaveMessage: Dispatch>;
setSaveMessageType: Dispatch>;
};
export function useSampleWorkflowStatusController({
+ documentWorkspaceApprovedAt,
+ documentWorkspaceConfirmations,
displayedFinishedSampleShipmentRows,
displayedFinishedSampleShipmentRowsComplete,
displayedProductFactoryIsConfirmed,
displayedProductSampleMeasurementRows,
+ displayedSampleMeasurementIsConfirmed,
displayedSampleMeasurementRowsComplete,
+ documentWorkspaceRevisionSignatureRef,
+ isReadOnly,
+ persistEditedProduct,
+ productSampleMeasurementRows,
+ setDocumentWorkspaceApprovedAt,
+ setDocumentWorkspaceConfirmations,
setSaveMessage,
setSaveMessageType,
}: UseSampleWorkflowStatusControllerParams) {
- function handleSampleMeasurementStatusClick() {
+ async function handleSampleMeasurementStatusClick() {
const statusMessage = getSampleMeasurementStatusMessage({
isFactoryConfirmed: displayedProductFactoryIsConfirmed,
isRowsComplete: displayedSampleMeasurementRowsComplete,
@@ -39,6 +79,47 @@ export function useSampleWorkflowStatusController({
});
if (!statusMessage) return;
+ if (
+ !isReadOnly &&
+ displayedProductFactoryIsConfirmed &&
+ displayedSampleMeasurementRowsComplete &&
+ !displayedSampleMeasurementIsConfirmed
+ ) {
+ const approvedAt = new Date().toISOString();
+ const nextConfirmations = {
+ ...documentWorkspaceConfirmations,
+ [SAMPLE_MEASUREMENT_WORKSPACE_CATEGORY]: true,
+ };
+ const nextApprovedAt = {
+ ...documentWorkspaceApprovedAt,
+ [SAMPLE_MEASUREMENT_WORKSPACE_CATEGORY]: approvedAt,
+ };
+ const nextSampleMeasurementRows = normalizeSampleMeasurementRowsForPayload(
+ productSampleMeasurementRows,
+ );
+
+ setDocumentWorkspaceConfirmations(nextConfirmations);
+ setDocumentWorkspaceApprovedAt(nextApprovedAt);
+ if (documentWorkspaceRevisionSignatureRef.current) {
+ documentWorkspaceRevisionSignatureRef.current = {
+ ...documentWorkspaceRevisionSignatureRef.current,
+ [SAMPLE_MEASUREMENT_WORKSPACE_CATEGORY]: JSON.stringify(
+ nextSampleMeasurementRows,
+ ),
+ };
+ }
+ await persistEditedProduct({
+ successMessage: "样包测量已确认",
+ errorFallbackMessage: "样包测量确认保存失败",
+ overrides: {
+ sampleMeasurementRows: nextSampleMeasurementRows,
+ documentWorkspaceConfirmations: nextConfirmations,
+ documentWorkspaceApprovedAt: nextApprovedAt,
+ },
+ });
+ return;
+ }
+
setSaveMessage(statusMessage.message);
setSaveMessageType(statusMessage.type);
}
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/shared/DocumentWorkspaceHeaderActionsSlot.tsx b/furniture-3d-system/src/app/intake/non-integrated/workspaces/shared/DocumentWorkspaceHeaderActionsSlot.tsx
index 7ee99435..f9e1e4ac 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/shared/DocumentWorkspaceHeaderActionsSlot.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/shared/DocumentWorkspaceHeaderActionsSlot.tsx
@@ -54,6 +54,7 @@ export function DocumentWorkspaceHeaderActionsSlot({
displayedProductPricingRowsComplete,
displayedProductPricingRowsReadyForPush,
displayedProductSampleMeasurementRowCount,
+ displayedSampleMeasurementHasPendingRows,
displayedSampleMeasurementIsConfirmed,
documentWorkspaceConfirmationAction,
documentWorkspaceUploadInputRef,
@@ -157,6 +158,7 @@ export function DocumentWorkspaceHeaderActionsSlot({
displayedProductPricingRowsComplete: boolean;
displayedProductPricingRowsReadyForPush: boolean;
displayedProductSampleMeasurementRowCount: number;
+ displayedSampleMeasurementHasPendingRows: boolean;
displayedSampleMeasurementIsConfirmed: boolean;
documentWorkspaceConfirmationAction: ReactNode;
documentWorkspaceUploadInputRef: RefObject;
@@ -262,6 +264,7 @@ export function DocumentWorkspaceHeaderActionsSlot({
isReadOnly={isReadOnly}
rowCount={displayedProductFactoryRowCount}
hasPendingRows={displayedProductFactoryHasPendingRows}
+ isConfirmed={displayedProductFactoryIsConfirmed}
hasSystemEnteredPricingRows={
displayedProductFactoryHasSystemEnteredPricingRows
}
@@ -282,6 +285,7 @@ export function DocumentWorkspaceHeaderActionsSlot({
actionGroupClassName={actionGroupClassName}
rowCount={displayedProductSampleMeasurementRowCount}
isProductFactoryConfirmed={displayedProductFactoryIsConfirmed}
+ hasPendingRows={displayedSampleMeasurementHasPendingRows}
isSampleMeasurementConfirmed={displayedSampleMeasurementIsConfirmed}
onStatusClick={onSampleMeasurementStatusClick}
/>
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/shared/DocumentWorkspaceSidebar.tsx b/furniture-3d-system/src/app/intake/non-integrated/workspaces/shared/DocumentWorkspaceSidebar.tsx
index e953b106..ce93db11 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/shared/DocumentWorkspaceSidebar.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/shared/DocumentWorkspaceSidebar.tsx
@@ -10,8 +10,10 @@ import {
import { DocumentWorkspaceSidebarStatusIcon } from "../../components/DocumentWorkspaceControls";
import type {
NonIntegratedFactoryRow,
+ NonIntegratedSampleMeasurementRow,
NonIntegratedUploadFile,
} from "../../nonIntegratedStorage";
+import { SAMPLE_MEASUREMENT_WORKSPACE_CATEGORY } from "../documents/documentWorkspaceConfig";
type DocumentWorkspaceView = "detail" | "document";
@@ -27,9 +29,10 @@ export function DocumentWorkspaceSidebar({
basicInfoNeedsConfirmation,
documentWorkspaceCountByCategory,
documentWorkspaceView,
- isProductFactoryRowComplete,
isWorkflowNodeConfirmed,
productFactoryRows,
+ sampleMeasurementRows,
+ isSampleMeasurementConfirmed,
visibleGroupedUploadFiles,
onOpenBasicInfo,
onOpenDocumentWorkspace,
@@ -42,12 +45,13 @@ export function DocumentWorkspaceSidebar({
Record
>;
documentWorkspaceView: DocumentWorkspaceView;
- isProductFactoryRowComplete: (row: NonIntegratedFactoryRow) => boolean;
isWorkflowNodeConfirmed: (
category: DocumentWorkspaceCategory,
hasContent: boolean,
) => boolean;
productFactoryRows: NonIntegratedFactoryRow[];
+ sampleMeasurementRows: NonIntegratedSampleMeasurementRow[];
+ isSampleMeasurementConfirmed: boolean;
visibleGroupedUploadFiles: GroupedWorkspaceFiles[];
onOpenBasicInfo: () => void;
onOpenDocumentWorkspace: (category: DocumentWorkspaceCategory) => void;
@@ -74,13 +78,14 @@ export function DocumentWorkspaceSidebar({
const categoryHasContent =
category === PRODUCT_FACTORY_WORKSPACE_CATEGORY
? productFactoryRows.length > 0
+ : category === SAMPLE_MEASUREMENT_WORKSPACE_CATEGORY
+ ? sampleMeasurementRows.length > 0
: hasFiles;
const categoryNeedsConfirmation =
category === PRODUCT_FACTORY_WORKSPACE_CATEGORY
- ? !(
- productFactoryRows.length > 0 &&
- productFactoryRows.every(isProductFactoryRowComplete)
- )
+ ? !productFactoryRows.every((row) => row.confirmed)
+ : category === SAMPLE_MEASUREMENT_WORKSPACE_CATEGORY
+ ? !isSampleMeasurementConfirmed
: needsConfirmation;
const shouldInsertBasicInfoTrigger = index === basicInfoInsertIndex;
const basicInfoIsActive = documentWorkspaceView === "detail";
diff --git a/furniture-3d-system/src/app/intake/page.tsx b/furniture-3d-system/src/app/intake/page.tsx
index 4db844d6..2d0494ac 100644
--- a/furniture-3d-system/src/app/intake/page.tsx
+++ b/furniture-3d-system/src/app/intake/page.tsx
@@ -231,7 +231,8 @@ export default async function IntakePage({
materialLibraryFinishes,
materialLibraryCategories,
materialLibraryDictionaries,
- initialNonIntegratedProductPage,
+ initialProductNonIntegratedProductPage,
+ initialStockNonIntegratedProductPage,
initialSeriesNonIntegratedProductPage,
nodePermissionSettings,
initialOpenProduct,
@@ -247,10 +248,17 @@ export default async function IntakePage({
page: 1,
pageSize: 50,
productDevelopmentKind: 'product',
+ productKind: 'new',
}),
intakeNonIntegratedProductService.listPage(authUser, {
page: 1,
- pageSize: 500,
+ pageSize: 50,
+ productDevelopmentKind: 'product',
+ productKind: 'stock',
+ }),
+ intakeNonIntegratedProductService.listPage(authUser, {
+ page: 1,
+ pageSize: 50,
productDevelopmentKind: 'series',
}),
intakeNodePermissionSettingsService.getSettings(),
@@ -263,11 +271,17 @@ export default async function IntakePage({
])
const initialNonIntegratedProducts = appendInitialOpenProduct(
mergeInitialNonIntegratedProducts(
- initialNonIntegratedProductPage.products,
+ initialProductNonIntegratedProductPage.products,
+ initialStockNonIntegratedProductPage.products,
initialSeriesNonIntegratedProductPage.products,
),
initialOpenProduct,
)
+ const initialNonIntegratedPageInfo = {
+ product: initialProductNonIntegratedProductPage.pageInfo,
+ stock: initialStockNonIntegratedProductPage.pageInfo,
+ series: initialSeriesNonIntegratedProductPage.pageInfo,
+ }
const initialOpenProductWorkspace = initialOpenProduct
? {
product: initialOpenProduct,
@@ -292,43 +306,50 @@ export default async function IntakePage({
? selectedDetail
: null
- const eligibleDraftGroupDetails = await Promise.all(
- eligibleDraftGroups.map((group) => draftGroupService.getById(group.id)),
+ const eligibleDraftGroupById = new Map(
+ eligibleDraftGroups.map((group) => [group.id, group]),
)
+ const eligiblePreSkus = await draftGroupService.listPreSkusByDraftGroupIds(
+ eligibleDraftGroups.map((group) => group.id),
+ )
+ const eligiblePreSkuSequenceByDraftGroup = new Map()
- const eligibleSkuList = eligibleDraftGroupDetails.flatMap((detail) =>
- detail.preSkus.map((preSku, index) => {
- const skuFields = readPreSkuSkuFields(preSku)
- return {
- id: preSku.id,
- draftGroupId: detail.draftGroup.id,
- spuCode:
- readPreSkuTextField(preSku, 'spuCode') ||
- readPreSkuTextField(preSku, 'spu') ||
- detail.draftGroup.code ||
- `SPU-${String(index + 1).padStart(3, '0')}`,
- code:
- skuFields.skuCode ||
- preSku.customName ||
- preSku.defaultName,
- name: preSku.customName || preSku.defaultName,
- seriesName:
- readPreSkuTextField(preSku, 'seriesName') ||
- detail.draftGroup.assetSeriesName ||
- detail.draftGroup.name,
- draftGroupName: detail.draftGroup.name,
- status: mapWorkbenchStatus(preSku.status),
- componentCodes: preSku.componentCodes ?? [],
- componentDetails: readPreSkuComponentDetails(preSku),
- packagingPlan: preSku.packagingPlan,
- holePoints: buildSkuHolePointsFromVariantSelection(preSku),
- skuFields,
- model3dPreviewNodes: preSku.previewNodes.length
- ? preSku.previewNodes
- : preSku.assemblyWorkspace?.nodes ?? [],
- }
- }),
- )
+ const eligibleSkuList = eligiblePreSkus.flatMap((preSku) => {
+ const draftGroup = eligibleDraftGroupById.get(preSku.draftGroupId)
+ if (!draftGroup) return []
+
+ const index = eligiblePreSkuSequenceByDraftGroup.get(draftGroup.id) ?? 0
+ eligiblePreSkuSequenceByDraftGroup.set(draftGroup.id, index + 1)
+ const skuFields = readPreSkuSkuFields(preSku)
+ return {
+ id: preSku.id,
+ draftGroupId: draftGroup.id,
+ spuCode:
+ readPreSkuTextField(preSku, 'spuCode') ||
+ readPreSkuTextField(preSku, 'spu') ||
+ draftGroup.code ||
+ `SPU-${String(index + 1).padStart(3, '0')}`,
+ code:
+ skuFields.skuCode ||
+ preSku.customName ||
+ preSku.defaultName,
+ name: preSku.customName || preSku.defaultName,
+ seriesName:
+ readPreSkuTextField(preSku, 'seriesName') ||
+ draftGroup.assetSeriesName ||
+ draftGroup.name,
+ draftGroupName: draftGroup.name,
+ status: mapWorkbenchStatus(preSku.status),
+ componentCodes: preSku.componentCodes ?? [],
+ componentDetails: readPreSkuComponentDetails(preSku),
+ packagingPlan: preSku.packagingPlan,
+ holePoints: buildSkuHolePointsFromVariantSelection(preSku),
+ skuFields,
+ model3dPreviewNodes: preSku.previewNodes.length
+ ? preSku.previewNodes
+ : preSku.assemblyWorkspace?.nodes ?? [],
+ }
+ })
const sourceWorkspace =
eligibleSelectedDetail?.preSkus.find((preSku) => preSku.assemblyWorkspace)
@@ -363,6 +384,7 @@ export default async function IntakePage({
materialLibraryCategories={materialLibraryCategories}
materialLibraryDictionaries={materialLibraryDictionaries}
initialNonIntegratedProducts={initialNonIntegratedProducts}
+ initialNonIntegratedPageInfo={initialNonIntegratedPageInfo}
initialNodePermissionOverrides={nodePermissionSettings.overrides}
initialActiveSection={initialActiveSection}
initialActiveRawMaterialLibrary={initialActiveRawMaterialLibrary}
@@ -390,6 +412,7 @@ export default async function IntakePage({
materialLibraryCategories={materialLibraryCategories}
materialLibraryDictionaries={materialLibraryDictionaries}
initialNonIntegratedProducts={initialNonIntegratedProducts}
+ initialNonIntegratedPageInfo={initialNonIntegratedPageInfo}
initialNodePermissionOverrides={nodePermissionSettings.overrides}
initialActiveSection={initialActiveSection}
initialActiveRawMaterialLibrary={initialActiveRawMaterialLibrary}
diff --git a/furniture-3d-system/src/app/intake/product-development/NonIntegratedPendingDetail.tsx b/furniture-3d-system/src/app/intake/product-development/NonIntegratedPendingDetail.tsx
index a49cb548..91aba545 100644
--- a/furniture-3d-system/src/app/intake/product-development/NonIntegratedPendingDetail.tsx
+++ b/furniture-3d-system/src/app/intake/product-development/NonIntegratedPendingDetail.tsx
@@ -4,7 +4,6 @@ import { useRouter } from "next/navigation";
import { type ReactNode, useEffect, useMemo, useRef, useState } from "react";
import { Copy, Pencil, Plus, RotateCcw, Trash2 } from "lucide-react";
import Button from "@/components/ui/Button";
-import { Badge } from "@/components/ui/Badge";
import {
CopyProductDialog,
ImagePreviewDialog,
@@ -33,6 +32,7 @@ import {
import type { ProductDevelopmentKind, WorkspaceProductMode } from "@/app/intake/intakeWorkspaceTypes";
import {
buildNonIntegratedListStateStorageKey,
+ createDefaultNonIntegratedListQuery,
getUniqueSortedStrings,
normalizeNonIntegratedListQuery,
normalizePersistedPage,
@@ -102,8 +102,39 @@ 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";
+function isDefaultInitialListRequest(params: {
+ activeQuickScope: NonIntegratedQuickScope;
+ appliedQuery: NonIntegratedListQuery;
+ currentPage: number;
+ effectiveProductKind: NonIntegratedProductKindFilter;
+ initialPageInfo?: NonIntegratedProductPageInfo | null;
+ initialProductKind: NonIntegratedProductKindFilter;
+}) {
+ const {
+ activeQuickScope,
+ appliedQuery,
+ currentPage,
+ effectiveProductKind,
+ initialPageInfo,
+ initialProductKind,
+ } = params;
+
+ if (!initialPageInfo) return false;
+ if (activeQuickScope !== "all") return false;
+ if (currentPage !== initialPageInfo.page) return false;
+ if (initialPageInfo.pageSize !== PENDING_PAGE_SIZE) return false;
+ if (effectiveProductKind !== initialProductKind) return false;
+
+ const defaultQuery = createDefaultNonIntegratedListQuery(initialProductKind);
+ return Object.entries(defaultQuery).every(
+ ([key, value]) =>
+ appliedQuery[key as keyof NonIntegratedListQuery] === value,
+ );
+}
+
export function NonIntegratedPendingDetail({
initialProducts,
+ initialPageInfo,
canDeleteProducts,
currentUser,
productDevelopmentKind = "product",
@@ -117,6 +148,7 @@ export function NonIntegratedPendingDetail({
onOpenSecondaryNewNonIntegratedProductWorkspace,
}: {
initialProducts: NonIntegratedProductRecord[];
+ initialPageInfo?: NonIntegratedProductPageInfo | null;
canDeleteProducts: boolean;
currentUser: NonIntegratedListPermissionUser;
productDevelopmentKind?: ProductDevelopmentKind;
@@ -151,7 +183,7 @@ export function NonIntegratedPendingDetail({
String(normalizePersistedPage(initialPersistedListState?.currentPage)),
);
const [pageInfo, setPageInfo] =
- useState(null);
+ useState(initialPageInfo ?? null);
const [isListLoading, setIsListLoading] = useState(false);
const [listErrorMessage, setListErrorMessage] = useState("");
const [previewProduct, setPreviewProduct] = useState<{
@@ -187,6 +219,7 @@ export function NonIntegratedPendingDetail({
useState(false);
const listStateStorageKeyRef = useRef(listStateStorageKey);
const skipNextListStatePersistRef = useRef(false);
+ const initialListRequestHandledRef = useRef(false);
const shouldUseSharedNonIntegratedApi = process.env.NODE_ENV !== "test";
const effectiveProductKind = fixedProductKind ?? appliedQuery.productKind;
const hasCreateAction = Boolean(
@@ -310,6 +343,22 @@ export function NonIntegratedPendingDetail({
useEffect(() => {
if (!shouldUseSharedNonIntegratedApi) return;
+ if (
+ !initialListRequestHandledRef.current &&
+ isDefaultInitialListRequest({
+ activeQuickScope,
+ appliedQuery,
+ currentPage,
+ effectiveProductKind,
+ initialPageInfo,
+ initialProductKind,
+ })
+ ) {
+ initialListRequestHandledRef.current = true;
+ return;
+ }
+
+ initialListRequestHandledRef.current = true;
let cancelled = false;
setIsListLoading(true);
setListErrorMessage("");
@@ -351,6 +400,8 @@ export function NonIntegratedPendingDetail({
appliedQuery,
currentPage,
effectiveProductKind,
+ initialPageInfo,
+ initialProductKind,
productDevelopmentKind,
shouldUseSharedNonIntegratedApi,
]);
@@ -847,8 +898,8 @@ export function NonIntegratedPendingDetail({
(isSeriesDevelopmentList ? 1 : 0);
return (
-
-
+
+
{quickScopes.map((scope) => (
@@ -871,14 +922,14 @@ export function NonIntegratedPendingDetail({
))}
{filterFields.map((filter) => (
-
-
-
+
+
+
{
+ await onDeleteProduct()
+ }}
title="删除产品"
description={
deletingProduct
@@ -431,7 +433,9 @@ export default function HomeMobileView({
{
+ await onDeleteSKU()
+ }}
title="删除 SKU"
description={
deletingSku
diff --git a/furniture-3d-system/src/app/warehouse-quality/WarehouseQualityClient.tsx b/furniture-3d-system/src/app/warehouse-quality/WarehouseQualityClient.tsx
index 929928d2..9d93cb68 100644
--- a/furniture-3d-system/src/app/warehouse-quality/WarehouseQualityClient.tsx
+++ b/furniture-3d-system/src/app/warehouse-quality/WarehouseQualityClient.tsx
@@ -46,6 +46,7 @@ type SpuQualityGroup = {
}
const CONCLUSION_OPTIONS = ['待检', '合格', '让步接收', '返工', '不合格'] as const
+const INITIAL_SPU_GROUP_RENDER_LIMIT = 80
function createEmptyForm(inspectorName: string): QualityFormState {
return {
@@ -256,6 +257,7 @@ export default function WarehouseQualityClient({
const [isSaving, setIsSaving] = useState(false)
const [isRefreshing, setIsRefreshing] = useState(false)
const [message, setMessage] = useState('')
+ const [showAllGroups, setShowAllGroups] = useState(false)
const filteredArchives = useMemo(() => {
const keyword = search.trim().toLowerCase()
@@ -278,11 +280,32 @@ export default function WarehouseQualityClient({
selectedGroup?.skuArchives[0] ??
null
+ const visibleSpuGroups = useMemo(() => {
+ if (showAllGroups || spuGroups.length <= INITIAL_SPU_GROUP_RENDER_LIMIT) {
+ return spuGroups
+ }
+
+ const initialGroups = spuGroups.slice(0, INITIAL_SPU_GROUP_RENDER_LIMIT)
+ if (
+ selectedGroup &&
+ !initialGroups.some((group) => group.key === selectedGroup.key)
+ ) {
+ return [...initialGroups, selectedGroup]
+ }
+
+ return initialGroups
+ }, [selectedGroup, showAllGroups, spuGroups])
+ const hiddenSpuGroupCount = Math.max(0, spuGroups.length - visibleSpuGroups.length)
+
const records = useMemo(
() => sortRecordsForDisplay(selectedArchive?.records ?? []),
[selectedArchive],
)
+ useEffect(() => {
+ setShowAllGroups(false)
+ }, [search])
+
useEffect(() => {
if (!selectedGroup && spuGroups[0]) {
setSelectedGroupKey(spuGroups[0].key)
@@ -420,7 +443,7 @@ export default function WarehouseQualityClient({
) : (
- {spuGroups.map((group) => {
+ {visibleSpuGroups.map((group) => {
const isActive = group.key === selectedGroup?.key
return (
)}
diff --git a/furniture-3d-system/src/app/warehouse-quality/loading.tsx b/furniture-3d-system/src/app/warehouse-quality/loading.tsx
new file mode 100644
index 00000000..928c3b25
--- /dev/null
+++ b/furniture-3d-system/src/app/warehouse-quality/loading.tsx
@@ -0,0 +1,44 @@
+const GROUPS = Array.from({ length: 9 }, (_, index) => index)
+const ROWS = Array.from({ length: 6 }, (_, index) => index)
+
+export default function WarehouseQualityLoading() {
+ return (
+
+
+
+
+
+
+
+ {ROWS.map((row) => (
+
+ ))}
+
+
+ |