WuYongJie
|
aac475f982
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/xuxiake-mainline
|
2026-05-21 18:54:51 +08:00 |
|
WuYongJie
|
872f7cbc14
|
fix: refine intake 3d material and sku confirmation flow
|
2026-05-21 18:54:40 +08:00 |
|
WuYongJie
|
31562766a7
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/xuxiake-mainline
|
2026-05-21 16:18:33 +08:00 |
|
WuYongJie
|
ade68c56de
|
fix(asset-center): 由后端生成 CAD 导入规格编码
|
2026-05-21 16:18:18 +08:00 |
|
WuYongJie
|
4f7c7cdf45
|
fix(intake): 按节点校验开品保存权限
|
2026-05-21 13:24:10 +08:00 |
|
WuYongJie
|
603b114345
|
fix(intake): 调整开品字段口径与样评填写逻辑
|
2026-05-20 19:09:53 +08:00 |
|
WuYongJie
|
ac785bb495
|
feat: update intake brand rules and access scopes
|
2026-05-20 17:14:00 +08:00 |
|
WuYongJie
|
a1209cc7f8
|
fix(intake): 调整空间布局字段选项
|
2026-05-20 16:13:04 +08:00 |
|
WuYongJie
|
606dc9612c
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/xuxiake-mainline
|
2026-05-20 15:20:25 +08:00 |
|
WuYongJie
|
fbbf8d85ef
|
fix(intake): 允许企划编辑空间布局节点
|
2026-05-20 15:19:42 +08:00 |
|
WuYongJie
|
c5a6f044c7
|
feat: refine non-integrated intake workflow
|
2026-05-20 14:17:39 +08:00 |
|
WuYongJie
|
b7c794ac2f
|
Merge remote-tracking branch 'origin/main' into codex/xuxiake-mainline
|
2026-05-20 12:54:57 +08:00 |
|
WuYongJie
|
314c4d1ba0
|
feat(intake): 完善正式入库定厂与寄样流程
|
2026-05-20 12:54:49 +08:00 |
|
WuYongJie
|
55cba13828
|
fix(users): 全量花名册同步后清理查询缓存
|
2026-05-20 12:03:17 +08:00 |
|
WuYongJie
|
65fb8fec42
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/xuxiake-mainline
|
2026-05-20 11:56:29 +08:00 |
|
WuYongJie
|
a6c26a0581
|
fix(users): 接入家具系统花名册定时同步
|
2026-05-20 11:56:23 +08:00 |
|
WuYongJie
|
05b34bcec1
|
fix: refine non-integrated department permissions
|
2026-05-20 09:27:54 +08:00 |
|
WuYongJie
|
5daa93d3eb
|
merge: 同步 xuxiake 主线用户匹配修复
|
2026-05-19 20:22:55 +08:00 |
|
WuYongJie
|
12d92a1b4b
|
merge: 收口用户匹配与花名册同步修复
|
2026-05-19 20:20:54 +08:00 |
|
WuYongJie
|
66491cf49e
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/wuyongjie-assisted-assembly-next
|
2026-05-19 20:19:05 +08:00 |
|
WuYongJie
|
60fdf33bad
|
fix(users): 修复员工库匹配与生产入口口径
|
2026-05-19 20:18:13 +08:00 |
|
WuYongJie
|
e2be21d21b
|
fix: load jst directory options for intake
|
2026-05-19 19:34:35 +08:00 |
|
WuYongJie
|
954948dae1
|
fix: align intake brand copy workflow
|
2026-05-19 19:23:03 +08:00 |
|
WuYongJie
|
0a5c6b7a43
|
fix: treat stock sku batches as confirmed
|
2026-05-19 19:09:16 +08:00 |
|
WuYongJie
|
d8aadfa0e1
|
fix: refine non-integrated sku confirmation
|
2026-05-19 18:30:11 +08:00 |
|
WuYongJie
|
81500dcc07
|
fix: refine stock detail filters and planning layout
|
2026-05-19 14:08:04 +08:00 |
|
WuYongJie
|
aa31e4e230
|
fix: exclude accessory stock sku imports
|
2026-05-19 13:09:55 +08:00 |
|
WuYongJie
|
e9a6deb3a1
|
fix: align jst sku sync with stock spus
|
2026-05-19 12:15:02 +08:00 |
|
WuYongJie
|
273097f8b5
|
fix: sync stock spu filters and imported sku codes
|
2026-05-19 12:08:11 +08:00 |
|
WuYongJie
|
668391f983
|
feat: sync and filter jst sku stock products
|
2026-05-19 11:33:01 +08:00 |
|
WuYongJie
|
30e1d2f5b5
|
fix(intake): reset persisted workspace tab cache
|
2026-05-19 09:11:06 +08:00 |
|
WuYongJie
|
fd79dcae56
|
fix(intake): defer workspace tab restore until client mount
|
2026-05-19 08:58:07 +08:00 |
|
WuYongJie
|
92275301af
|
merge: codex xuxiake mainline build storage placeholders
|
2026-05-18 20:22:26 +08:00 |
|
WuYongJie
|
a18fdd8fbb
|
fix(deploy): 使用构建期存储占位配置
|
2026-05-18 20:21:05 +08:00 |
|
WuYongJie
|
1a11bb51e3
|
merge: codex xuxiake mainline storage build fix
|
2026-05-18 20:15:14 +08:00 |
|
WuYongJie
|
b9be83d84a
|
fix(deploy): 传入构建期公开存储地址
|
2026-05-18 20:14:33 +08:00 |
|
WuYongJie
|
c0bca713ce
|
merge: codex xuxiake mainline deploy source fix
|
2026-05-18 20:09:49 +08:00 |
|
WuYongJie
|
dbb3ea8fd7
|
merge: 同步远端 xuxiake 部署收口
|
2026-05-18 20:08:35 +08:00 |
|
WuYongJie
|
6bf85d79c6
|
fix(deploy): 使用官方 Alpine 包源构建镜像
|
2026-05-18 20:07:33 +08:00 |
|
WuYongJie
|
2b50f74b12
|
Merge remote-tracking branch 'origin/main' into codex/xuxiake-mainline
|
2026-05-18 20:01:24 +08:00 |
|
WuYongJie
|
09606adcb9
|
fix(intake): keep stock products in product development list
|
2026-05-18 19:59:57 +08:00 |
|
WuYongJie
|
666211714a
|
merge: codex xuxiake mainline puppeteer deploy fix
|
2026-05-18 19:59:33 +08:00 |
|
WuYongJie
|
aaae569af1
|
fix(deploy): 跳过 Puppeteer 构建期浏览器下载
|
2026-05-18 19:58:48 +08:00 |
|
WuYongJie
|
81209f73ce
|
merge: codex xuxiake mainline deploy fix
|
2026-05-18 19:56:15 +08:00 |
|
WuYongJie
|
48557987e0
|
fix(deploy): 修复生产镜像构建基线
|
2026-05-18 19:54:58 +08:00 |
|
WuYongJie
|
1f66aab483
|
merge: codex xuxiake mainline format fix
|
2026-05-18 19:42:36 +08:00 |
|
WuYongJie
|
0640dd8dec
|
fix(asset-center): 清理系列接口文件尾空行
|
2026-05-18 19:41:48 +08:00 |
|
WuYongJie
|
fa633e3ca0
|
merge: codex xuxiake mainline
|
2026-05-18 19:38:29 +08:00 |
|
WuYongJie
|
486bf9333e
|
merge: 接入系列编码与资料同步
# Conflicts:
# furniture-3d-system/src/app/intake/IntakeClient.tsx
# furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
|
2026-05-18 19:36:54 +08:00 |
|
WuYongJie
|
8eaa82db52
|
merge: codex xuxiake mainline
|
2026-05-18 18:58:00 +08:00 |
|