WuYongJie/furniture-3d-system-Wu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94 Commits 210 Branches 1 Tag
Commit Graph

92 Commits

Author SHA1 Message Date
WuYongJie
87bb0e126d feat: refresh branding and material library workspace 2026-04-17 11:07:18 +08:00
WuYongJie
d7737909bb feat: sync remaining workspace branding updates 2026-04-17 10:25:31 +08:00
WuYongJie
c8d3d3d9e7 feat: restore material library and assembly workflows 2026-04-16 23:13:16 +08:00
WuYongJie
602e2fd33f fix: recover assembly context and clear typecheck baseline 2026-04-16 21:44:04 +08:00
WuYongJie
18d2a49d2e feat: converge assembly entrypoints and handover roles 2026-04-16 21:08:41 +08:00
WuYongJie
56a29b8be2 feat: polish home assembly and material workflows 2026-04-16 18:42:37 +08:00
WuYongJie
44677da317 feat: improve non-integrated intake workflow 2026-04-16 16:45:34 +08:00
WuYongJie
2a4382dcb2 feat: refresh admin and user management portals 2026-04-16 14:07:13 +08:00
WuYongJie
5731018bed feat: integrate selected xuxiake intake enhancements 2026-04-16 12:38:52 +08:00
WuYongJie
2adb1d8e98 feat: persist home workspace tab state 2026-04-15 21:45:18 +08:00
WuYongJie
69b1daf157 fix: close assisted assembly cad snap and prod deploy 2026-04-15 21:27:09 +08:00
WuYongJie
3158e87908 fix: tighten handover scope checks 2026-04-15 17:52:38 +08:00
WuYongJie
9f2ce7ee87 chore: add warehouse location binding migration 2026-04-15 16:55:01 +08:00
WuYongJie
d6ef2f3bf2 fix: stabilize xuxiake intake merge integration 2026-04-15 16:49:47 +08:00
Codex
ab0ed57312 feat: update intake and warehouse workspace 2026-04-15 16:40:10 +08:00
Codex
f1a9e853e0 feat: sync intake and warehouse workflow updates 2026-04-15 16:40:10 +08:00
Codex
e1407c8464 chore: checkpoint latest intake and warehouse changes 2026-04-15 16:40:10 +08:00
Codex
bcbe884be1 feat(warehouse): 配件SKU和成品SKU模块接入真实数据 
- page.tsx: 并行获取资产族变体(配件)和草稿组(成品)数据
- 配件SKU库位: 按资产类型(板材/组件/五金/包装)分组展示，支持筛选和搜索
- 成品SKU库位: 展示草稿组及其PreSku，支持搜索，显示状态标签
- 右侧AccordionSection展示真实统计数据
- 测试文件适配新props接口
 2026-04-15 16:40:10 +08:00
Codex
ce85aa8def chore: checkpoint intake and warehouse workspace state 2026-04-15 16:40:10 +08:00
Codex
995030a11d chore(intake): checkpoint right workbench toggle layout 2026-04-15 16:40:10 +08:00
WuYongJie
15d5e6fb89 feat: sync validated admin auth material and exporter updates 2026-04-15 16:36:00 +08:00
WuYongJie
7ae45d4f0b fix: add pending activation auth error code 2026-04-15 15:25:17 +08:00
WuYongJie
5a54bcedae fix: allow nullable thumbnails in context menus 2026-04-15 15:24:25 +08:00
WuYongJie
305a99d291 fix: normalize nullable material thumbnails in service layer 2026-04-15 15:23:01 +08:00
WuYongJie
7d73276995 fix: allow pending users in auth core types 2026-04-15 15:22:05 +08:00
WuYongJie
18e1403c2a fix: align admin material editor thumbnail typing 2026-04-15 15:21:01 +08:00
WuYongJie
1c72957333 fix: align material thumbnail types with nullable schema 2026-04-15 15:20:04 +08:00
WuYongJie
1e5237945b chore: align prisma schema with production user data 2026-04-15 15:18:19 +08:00
WuYongJie
66c4113bc9 fix: remove access management dependency on employee directory relation 2026-04-15 15:15:20 +08:00
WuYongJie
45c20500ae fix: import handover modal class utility 2026-04-15 15:14:10 +08:00
WuYongJie
238bd74c49 fix: support modal class overrides in access flows 2026-04-15 15:13:20 +08:00
WuYongJie
6d07abf9d4 fix: align access management modal user types 2026-04-15 15:12:13 +08:00
WuYongJie
96662689f3 feat: complete access management organization tree 2026-04-15 15:09:32 +08:00
WuYongJie
d12470419e merge: adopt xuxiake material library workflow 2026-04-13 17:26:23 +08:00
WuYongJie
73818e480b feat: finalize assisted assembly mainline workflow 2026-04-13 17:18:57 +08:00
Codex
7fdaaacb2d feat(资料库): 收口基材与花色新建逻辑 2026-04-13 16:09:38 +08:00
WuYongJie
b901e19ebd fix(material-library): align substrate migration and labels 2026-04-13 14:55:03 +08:00
Codex
a531b16b38 feat(基础资料库): 移除系统名称、优化花色筛选和表单布局 
- 全栈移除 SubstrateSystemNameOption（字典管理、表单、API、数据库）
- 花色改为单选 + 自动搜索下拉，排除五金油漆/漆面颜色/五金漆面色
- 基材名称自动生成格式：尺寸+环保等级+材质+花色+贴面
- 材质改为纯下拉选择，贴面始终显示
- 花色框体与 Select 组件宽度/高度统一
- 厚度规格字典只保留厚度数值+排序值
 2026-04-13 14:41:46 +08:00
Codex
cb6cb0cc57 feat(基础资料库): 实现 5 字段唯一约束收口 
createSubstrate 新增合并逻辑：

1. **完全重复** (相同 5 字段 + 相同花色) → 拒绝，报错「基材库已有相同规格的基材，不可重复创建」
2. **花色不同** (相同 5 字段 + 不同花色) → 合并新花色到已有基材，重建名称
3. **规格不同** (5 字段不同) → 新建基材，自动编码 BC-XXXX

5 字段 = categoryId + environmentGradeId + thicknessSpecId + surfaceOptionId + systemNameOptionId
实木 (无 surfaceOptionId) 按 null 处理，纳入 5 字段匹配

- TypeScript 编译: 0 errors
- 基础资料库测试: 48/48 passed
 2026-04-13 14:41:08 +08:00
WuYongJie
2846c7397e feat: finalize assisted assembly viewport integration 2026-04-13 14:32:24 +08:00
WuYongJie
ae9acb4091 feat: add asset thumbnail generation workflow 2026-04-11 15:13:26 +08:00
WuYongJie
5945858f69 feat: merge packaging material library rules and assembly flow 2026-04-11 12:07:00 +08:00
WuYongJie
7c6cc6fa2c merge: integrate packaging material library updates 2026-04-11 10:36:20 +08:00
Codex
9959f43dfb fix: resolve merge type errors — smart quotes, nullable surfaceOption, remove stale test 2026-04-10 21:03:06 +08:00
Codex
7e77da5e7c merge: sync main (3f6a67a) into codex/xuxiake-packaging 
冲突解决口径：
- 辅助装配已改为 manual assembly，auto combinations 接口保留但主链不使用
- 资产中心审核流、页面结构以 main 版本优先
- Substrate 基材真相：surfaceOptionId 可空、SubstrateFinish 保留、weightKg 进主模型、去掉5字段唯一约束
- createDraftGroupSchema 使用 main 版本（selectedFamilyIdsByType）
- 保留 BC-XXXX 自动编码、实木无贴面、花色联动、重复检测等基础资料库增强
 2026-04-10 20:45:00 +08:00
WuYongJie
3f6a67afde feat: streamline assisted assembly direct workspace flow 2026-04-10 20:16:55 +08:00
Codex
c3b73bdbdb feat(material-library): 基础资料库重构 — 基材录入+饰面花色完整改造 
- 基材编码自动生成 BC-0001/BC-0002 依次递增
- 基材名称自动生成：18MM E1 刨花板 北美原木纹色 双贴
- 完全相同规格（含花色）重复检测
- 实木特殊处理：无贴面，花色自动筛选实木花色分类
- 材质字段支持下拉选择+手动输入
- SubstrateFinish 多对多、surfaceOptionId 可空
- 软删除花色名称不阻塞重建
 2026-04-10 19:53:58 +08:00
WuYongJie
4b4173abde feat: simplify asset review workflow and assembly entry 2026-04-10 17:41:19 +08:00
WuYongJie
389d12e64b feat: switch single-board assembly to manual workflow 2026-04-10 11:07:26 +08:00
WuYongJie
5068d7736d fix: stabilize assisted assembly and asset center matching 2026-04-09 20:52:05 +08:00