merge: xuxiake mainline into main for prod deploy #2

Merged
WuYongJie merged 21 commits from codex/xuxiake-mainline into main 2026-04-22 09:52:21 +08:00
Collaborator

???????? main ????????

???:

  • npm run type-check
  • npm run build
  • npx jest src/app/intake/IntakeClient.test.tsx --runInBand
  • npx jest src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx --runInBand
  • npx jest src/app/intake/non-integrated/nonIntegratedStorage.test.ts --runInBand
  • npx jest src/app/api/warehouse/access-control.test.ts --runInBand
???????? main ???????? ???: - npm run type-check - npm run build - npx jest src/app/intake/IntakeClient.test.tsx --runInBand - npx jest src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx --runInBand - npx jest src/app/intake/non-integrated/nonIntegratedStorage.test.ts --runInBand - npx jest src/app/api/warehouse/access-control.test.ts --runInBand
xuxiake added 20 commits 2026-04-22 09:41:31 +08:00
- page.tsx: 并行获取资产族变体(配件)和草稿组(成品)数据
- 配件SKU库位: 按资产类型(板材/组件/五金/包装)分组展示,支持筛选和搜索
- 成品SKU库位: 展示草稿组及其PreSku,支持搜索,显示状态标签
- 右侧AccordionSection展示真实统计数据
- 测试文件适配新props接口
# Conflicts:
#	furniture-3d-system/next.config.js
#	furniture-3d-system/src/app/HomeClient.workspace.tsx
#	furniture-3d-system/src/app/__tests__/assisted-assembly-page.test.tsx
#	furniture-3d-system/src/app/admin/page.tsx
#	furniture-3d-system/src/app/api/categories/route.test.ts
#	furniture-3d-system/src/app/api/intake/non-integrated/presentation-preview/route.ts
#	furniture-3d-system/src/app/api/intake/non-integrated/upload/route.ts
#	furniture-3d-system/src/app/api/users/[id]/handover/route.test.ts
#	furniture-3d-system/src/app/api/users/[id]/route.test.ts
#	furniture-3d-system/src/app/api/users/organization-tree/route.ts
#	furniture-3d-system/src/app/asset-center/material-library/MaterialLibraryClient.tsx
#	furniture-3d-system/src/app/assisted-assembly/page.tsx
#	furniture-3d-system/src/app/intake/IntakeClient.test.tsx
#	furniture-3d-system/src/app/intake/IntakeClient.tsx
#	furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
#	furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
#	furniture-3d-system/src/app/intake/non-integrated/[id]/page.tsx
#	furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.test.ts
#	furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts
#	furniture-3d-system/src/app/intake/page.tsx
#	furniture-3d-system/src/app/products/[id]/skus/[skuId]/assembly/page.tsx
#	furniture-3d-system/src/app/users/page.tsx
#	furniture-3d-system/src/app/warehouse/WarehouseClient.tsx
#	furniture-3d-system/src/components/layout/SidebarUserCenter.tsx
#	furniture-3d-system/src/components/layout/__tests__/AppSideNav.test.tsx
#	furniture-3d-system/src/components/platform/AssemblyWorkbenchV2.tsx
#	furniture-3d-system/src/components/platform/ViewportStageShell.tsx
#	furniture-3d-system/src/components/platform/__tests__/AssemblyWorkbenchV2.test.tsx
#	furniture-3d-system/src/components/users/CreateUserModal.tsx
#	furniture-3d-system/src/components/users/DepartmentAccessTree.tsx
#	furniture-3d-system/src/components/users/EditUserModal.tsx
#	furniture-3d-system/src/components/users/UserListItem.tsx
#	furniture-3d-system/src/components/users/__tests__/DepartmentAccessTree.test.tsx
#	furniture-3d-system/src/lib/3d/engine.ts
#	furniture-3d-system/src/lib/model-preview-zip.test.ts
#	furniture-3d-system/src/lib/model-preview-zip.ts
#	furniture-3d-system/src/lib/non-integrated-sku-export.ts
#	furniture-3d-system/src/lib/open-product/__tests__/assembly-workspace.test.ts
#	furniture-3d-system/src/lib/open-product/assembly-workspace.ts
#	furniture-3d-system/src/server/repositories/auth.repository.ts
#	furniture-3d-system/src/server/services/__tests__/material.service.test.ts
#	furniture-3d-system/src/server/services/__tests__/user-handover.service.test.ts
#	furniture-3d-system/src/server/services/__tests__/user-management.organization-tree.test.ts
#	furniture-3d-system/src/server/services/__tests__/user-management.service.test.ts
#	furniture-3d-system/src/server/services/dingtalk-auth.service.ts
#	furniture-3d-system/src/server/services/user-handover.service.ts
#	furniture-3d-system/src/server/services/user-management.service.ts
#	furniture-3d-system/src/server/services/user.service.ts
xuxiake added 1 commit 2026-04-22 09:52:08 +08:00
WuYongJie merged commit 1ad68f23bf into main 2026-04-22 09:52:21 +08:00
Sign in to join this conversation.
No Reviewers
No Label
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: WuYongJie/furniture-3d-system-Wu#2
No description provided.