400 Commits

Author SHA1 Message Date
WuYongJie
8b89724062 fix(data-foundation): 对齐非集成 SKU 规范化迁移预检 2026-06-02 22:03:35 +08:00
WuYongJie
b77fcb3351 merge: sync xuxiake data constraint fix for prod deploy 2026-06-02 21:55:22 +08:00
WuYongJie
6fee15d4aa fix(data-foundation): 放行非集成 SKU 冲突质量状态约束 2026-06-02 21:54:11 +08:00
WuYongJie
56252d92f3 merge: sync xuxiake data foundation fix for prod deploy 2026-06-02 21:45:26 +08:00
WuYongJie
420b159f7e fix(data-foundation): 兼容非集成 SKU 历史编码冲突 2026-06-02 21:44:37 +08:00
WuYongJie
1b26801f12 merge: sync xuxiake mainline for prod deploy 2026-06-02 21:13:39 +08:00
WuYongJie
5025f4c5c1 merge: 接入七牛对象存储 2026-06-02 20:57:16 +08:00
WuYongJie
6d17f7684d feat(storage): 接入七牛私有对象存储与稳定读取代理 2026-06-02 18:33:25 +08:00
WuYongJie
1c74c2b630 merge: bring data foundation updates into xuxiake mainline 2026-06-02 16:16:13 +08:00
WuYongJie
545b1165c4 chore(data-foundation): close master data readiness gaps 2026-06-02 16:05:45 +08:00
WuYongJie
ebeb7624d6 chore(data-foundation): clarify structure repair evidence 2026-06-02 14:06:47 +08:00
WuYongJie
64341cab77 chore(data-foundation): require fresh audit checklist evidence 2026-06-02 13:48:03 +08:00
WuYongJie
0031533f97 chore(data-foundation): prevent auth cache permission truth 2026-06-02 13:40:55 +08:00
WuYongJie
f0664e77ca chore(data-foundation): clarify json truth boundaries 2026-06-02 13:27:12 +08:00
WuYongJie
0b22729225 chore(data-foundation): tighten client storage evidence gate 2026-06-02 13:17:30 +08:00
WuYongJie
6bc8e3348e feat(data-foundation): add master data governance scaffolding 2026-06-02 11:50:50 +08:00
WuYongJie
f0d3f5daae chore(data-foundation): sync xuxiake mainline and stabilize master data 2026-06-02 10:57:38 +08:00
WuYongJie
35fed448cf Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/xuxiake-assisted-assembly-ai-render
# Conflicts:
#	furniture-3d-system/src/app/draft-groups/DraftGroupsClient.tsx
2026-06-02 10:34:08 +08:00
WuYongJie
f563bc9989 Add warehouse quality and product data updates 2026-06-01 13:53:47 +08:00
WuYongJie
a09fbc3057 style(asset-center): lint 格式化与类型收口 2026-05-29 20:27:18 +08:00
WuYongJie
fe80bc77ba @
refactor(asset-center): 提取预览右键菜单子菜单为独立组件

- PreviewSubmenus.tsx(252 行):基材选择子菜单 + UV 渲染参数子菜单
- AssetCenterClient.tsx 3268→3085 行
@
2026-05-29 19:02:41 +08:00
WuYongJie
9333ed5f17 Merge remote-tracking branch 'origin/main' into codex/xuxiake-mainline 2026-05-29 18:35:17 +08:00
WuYongJie
3908aa0d80 Refine product data naming and draft group preview 2026-05-29 18:33:54 +08:00
WuYongJie
2e618d334b Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into merge-jst-main 2026-05-29 18:17:35 +08:00
WuYongJie
6e7cb87312 fix: remove intake tab block 2026-05-29 18:16:50 +08:00
WuYongJie
f7164140e1 Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into merge-jst-main 2026-05-29 18:10:09 +08:00
WuYongJie
34ea57c707 fix: repair jushuitan pricing row fields 2026-05-29 18:09:25 +08:00
WuYongJie
53d97a08d4 Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into merge-jst-main 2026-05-29 17:55:33 +08:00
WuYongJie
3e07813900 feat: add jushuitan push flow 2026-05-29 17:53:49 +08:00
WuYongJie
85d9eb7acc @
refactor(asset-center): 提取资产族列表为独立组件

- FamilyListPanel.tsx(332 行):资产族+规格款列表渲染
- AssetCenterClient.tsx 3506→3268 行
@
2026-05-29 17:23:59 +08:00
WuYongJie
6e743e991b @
refactor(asset-center): 提取 CAD 导入弹窗为独立组件

- CadImportModal.tsx(306 行):CAD 导入弹窗独立组件
- AssetCenterClient.tsx 3733→3506 行
@
2026-05-29 16:49:05 +08:00
WuYongJie
de33fc385c @
refactor(asset-center): 拆分 AssetCenterClient 大文件(4775→3733 行)

提取 7 个独立模块:
- asset-center-types.ts(210 行):类型定义、常量、CSS 类名
- asset-center-utils.ts(615 行):纯工具函数(UV 编辑、键盘快捷键、预览节点变换、状态标签、相似性、CAD 导入、系列筛选)
- VariantEditModal.tsx(235 行):规格款编辑弹窗
- FamilyEditModal.tsx(261 行):资产族编辑弹窗
- ReviewRejectModal.tsx(55 行):驳回弹窗
- RoleEditorModal.tsx(47 行):连接角色编辑弹窗

主组件减少 1042 行,功能完全不变。
@
2026-05-29 16:09:23 +08:00
WuYongJie
a5d728c7b9 @
feat(draft-groups): 草稿组页面优化与预估成本修复

- 保存品类按钮移到品类同一行,加宽按钮
- 删除草稿组加 try/catch 错误处理
- 预估成本:costPrice 为 null 时回退到 estimatedCostPrice
  - OpenProductAssetVariant 类型加 estimatedCostPrice
  - toOpenProductVariants 映射加 estimatedCostPrice
  - buildSlotSnapshot/buildHardwareSnapshot 用 costPrice ?? estimatedCostPrice
  - BOM 聚合用 costPrice ?? estimatedCostPrice
- 颜色统一为白曜石设计令牌(--obs-shell-color/heading-color/muted/surface-bg/border)
- 状态标签颜色改用固定色值,降低饱和度
- 板材/组件/五金件列表每行可点击,弹出只读 Modal 展示完整信息
- 组件详情弹窗增加规格款 ID、资产族 ID、基材 ID、饰面 ID、连接位、3D 模型 URL
@
2026-05-29 15:29:23 +08:00
WuYongJie
e07c12a34f Update accessory library and intake permissions 2026-05-29 13:50:58 +08:00
WuYongJie
9217b8db16 Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/xuxiake-assisted-assembly-ai-render 2026-05-29 12:20:58 +08:00
WuYongJie
a6946d3750 feat(assisted-assembly): 标签预览图改为静态资源并优化弹出交互 2026-05-29 12:18:40 +08:00
WuYongJie
f57d6030a3 feat(draft-groups): 重构草稿组工作台与资料补齐 2026-05-29 12:17:27 +08:00
WuYongJie
285bb3c180 feat(admin): 接入AI服务商配置与提示词优化 2026-05-29 12:14:26 +08:00
WuYongJie
83f3cb498c Merge remote-tracking branch 'origin/main' into codex/xuxiake-mainline 2026-05-28 17:57:51 +08:00
WuYongJie
11afc62a0c Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/xuxiake-mainline 2026-05-28 17:57:39 +08:00
WuYongJie
1c65ba4dcc Update intake permissions and workflow states 2026-05-28 17:56:30 +08:00
WuYongJie
1cbabf46fa merge: promote xuxiake mainline to main 2026-05-28 13:53:02 +08:00
WuYongJie
cab450f263 merge: assisted assembly ai render and employee provisioning 2026-05-28 13:48:58 +08:00
WuYongJie
bd02176bdf feat(assisted-assembly): 接入AI生图配置与历史记录 2026-05-28 13:42:31 +08:00
WuYongJie
035cf170b7 fix(auth): 按花名册规则自动划归账号 2026-05-28 13:41:56 +08:00
WuYongJie
5c837ee8e4 Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/xuxiake-assisted-assembly-ai-render
# Conflicts:
#	furniture-3d-system/src/lib/business-role-inference.test.ts
2026-05-28 12:03:58 +08:00
WuYongJie
f6eba0418f fix(users): 排除非内部部门自动业务划归 2026-05-28 12:01:49 +08:00
WuYongJie
46c0098ae3 fix(intake): allow planning layout save noops 2026-05-28 11:12:09 +08:00
WuYongJie
6d6e4b299d fix(intake): allow stock planning layout save noops 2026-05-28 11:02:33 +08:00
WuYongJie
d8c08bd625 fix(intake): guard stock product workspace saves 2026-05-28 10:44:10 +08:00