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

2697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
居居
ee4a1bf489 Merge branch 'codex/xuxiake-sabc-sync-20260929' into codex/xuxiake-mainline 2026-10-15 17:08:46 +08:00
居居
b4c22c23de feat(supply-chain): 产品中心/采购中心不再依赖运营负责人 
- 有设计师即计入产品中心、有采购即计入采购中心，即使该行没有运营负责人
- 运营中心仍只统计有运营负责人的行；「山东项目组」设计师/采购继续排除
- 快照增加口径版本号：读到旧口径快照时先按实时口径出数，并在后台自动重建该月快照（无需手动点保存配置）
 2026-10-15 17:08:41 +08:00
居居
6880208b36 Merge branch 'codex/xuxiake-sabc-sync-20260929' into codex/xuxiake-mainline 2026-10-15 17:01:52 +08:00
居居
a7b495e9c2 feat(supply-chain): 各部门数据分类支持按事业部导出，事业部按一/二/三/四部排序 
- 运营中心卡片「导出」改为先勾选事业部（默认全选；页面已筛事业部时默认只选它），只导出勾选范围
- 导出接口本已支持 department 过滤，前端补上多选入口（后端无需改动）
- 事业部/品类部名称排序改为按序号解析：事业一部→二部→三部→四部，品类九部→十部→十一部，不再按拼音乱序
- 新增部门名称排序工具与单测
 2026-10-15 17:01:38 +08:00
WuYongJie
bcfd191657 fix(diy): add generated image deletion 2026-10-15 16:26:10 +08:00
WuYongJie
a9635163bc Merge shared mainline for Relay native image generation 
Preserve the five existing production owner fixes and apply the reviewed AI task migration. Resolve DIY add/add conflicts only after checking that the feature baseline and production versions were identical. Merged AI tests and type-check passed; the retained production write guards were also checked in production mode.
 2026-10-15 15:10:10 +08:00
WuYongJie
928a7b37a9 feat(ai): use durable Relay native image tasks 
Persist image submissions with fixed idempotency keys, leased execution, provider
identity, reference snapshots and staged results. Integrate DIY, assisted assembly
and non-integrated white-background sessions without holding generation in a
browser request. Recover ambiguous submissions through owner-scoped reads and
stop a new eight-view batch when restoring an earlier request.

Add the NativeImageGenerationJob migration and a dedicated worker to both release
entry points. Protect job inputs/results from storage GC. Existing production
configuration and business data are not changed by this commit.

Validation: 256 focused Jest tests, isolated PostgreSQL migration/lease/transaction
checks (8), deployment guard tests (9), type-check, production build and desktop/
mobile browser component scenarios. Live native 2K reference-image request worked;
reusing its idempotency key returned the same task. Build uses local placeholders
for otherwise absent Drawing System configuration. Three unrelated material tests
also fail with the original mainline test file; they remain outside this change.

Architecture/visual/root-cause review: passed with warnings. Independent review
completed for the integration and shared input/storage paths; worker additionally
reviewed by the primary agent. Production merge/deployment requires authorization.
 2026-10-15 14:55:46 +08:00
WuYongJie
8e14aa5fb1 feat(diy): add shared assets, uploaded styles and AI rendering 2026-10-15 11:36:32 +08:00
WuYongJie
dc2c86275e feat(diy): add shared assets, uploaded styles and AI rendering 2026-10-15 11:35:34 +08:00
WuYongJie
e0c324ce06 feat(supply-chain): 全量档案清除筛选移入筛选行并优化筛选交互（设置抽屉/回车确认） 
- 「清除 N」从工具栏移到筛选行尾部（设置图标旁），收起细条保留清除入口
 2026-10-15 11:11:47 +08:00
WuYongJie
67541f9208 feat(supply-chain): 全量档案清除筛选移入筛选行并优化筛选交互（设置抽屉/回车确认） 
- 「清除 N」从工具栏移到筛选行尾部（设置图标旁），收起细条保留清除入口
 2026-10-15 11:10:50 +08:00
WuYongJie
e2a237f43b fix(product-archive): 结算价公式修正为成本价÷0.9（模块化） 
- 模块化分支由 ×0.9 改为 ÷0.9：聚水潭里模块化成本价按 9 折记，
  结算价需除以 0.9 还原（如成本 34.00 → 结算 37.78）
- 非模块化仍为成本价原样展示；先取整到分再除、四舍五入保留两位
- 同步更新测试期望值（76.20→84.67、123.45→137.17、85→94.44、34.00→37.78）
 2026-10-15 09:18:26 +08:00
WuYongJie
d1496b0c11 fix(product-archive): 结算价公式修正为成本价÷0.9（模块化） 
- 模块化分支由 ×0.9 改为 ÷0.9：聚水潭里模块化成本价按 9 折记，
  结算价需除以 0.9 还原（如成本 34.00 → 结算 37.78）
- 非模块化仍为成本价原样展示；先取整到分再除、四舍五入保留两位
- 同步更新测试期望值（76.20→84.67、123.45→137.17、85→94.44、34.00→37.78）
 2026-10-15 09:17:57 +08:00
WuYongJie
46ca3bf786 feat(product-archive): 全量档案第二个成本价列改为结算价（模块化 ×0.9） 
- 列与变更记录标签：成本价（新品）→ 结算价 / 结算价（新品），表头与导出同步生效
- 结算价在查询映射层实时计算：非模块化沿用成本价原样，模块化按 0.9 折
  （先取整到分再打折、四舍五入保留两位）；模块化以商品标签含「模块化」判断，不落库
- 修复列设置合并时 localStorage 旧 label 覆盖默认列名的问题：内置列名
  一律以当前默认定义为准，改名对已保存列设置的用户才能生效
 2026-10-15 08:48:16 +08:00
WuYongJie
67834358d2 fix(product-archive): allow trusted HTTPS image host on port 3333 2026-10-14 18:18:50 +08:00
WuYongJie
b6a326d996 fix(product-archive): allow trusted HTTPS image host on port 3333 2026-10-14 18:14:47 +08:00
WuYongJie
ec6067facc feat(supply-chain): 产品全量档案新增独立图文使用说明页（更多菜单新标签页打开） 
- 新增 /product-archive-guide 独立路由：模块树目录（产品全量档案 → 1.1~1.10），无系统壳，登录+productArchive 查看权限
 2026-10-14 17:45:18 +08:00
WuYongJie
e57f95c489 feat(supply-chain): 产品全量档案新增独立图文使用说明页（更多菜单新标签页打开） 
- 新增 /product-archive-guide 独立路由：模块树目录（产品全量档案 → 1.1~1.10），无系统壳，登录+productArchive 查看权限
 2026-10-14 17:43:53 +08:00
WuYongJie
9ef800001f feat(product-archive): 全量档案第二个成本价列改为结算价（模块化 ×0.9） 
- 列与变更记录标签：成本价（新品）→ 结算价 / 结算价（新品），表头与导出同步生效
- 结算价在查询映射层实时计算：非模块化沿用成本价原样，模块化按 0.9 折
  （先取整到分再打折、四舍五入保留两位）；模块化以商品标签含「模块化」判断，不落库
- 修复列设置合并时 localStorage 旧 label 覆盖默认列名的问题：内置列名
  一律以当前默认定义为准，改名对已保存列设置的用户才能生效
 2026-10-14 17:09:30 +08:00
WuYongJie
89fbe9231b feat(supply-chain): 全量档案运营负责人切换 js_sku_info_manage.sku_manager 数据源 2026-10-14 14:28:05 +08:00
WuYongJie
289926294d Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/local-3001-integration 2026-10-14 14:27:19 +08:00
WuYongJie
9492eba22d feat(supply-chain): 全量档案运营负责人切换 js_sku_info_manage.sku_manager 数据源 2026-10-14 14:27:02 +08:00
居居
bfe3073aa1 feat(supply-chain): 人员信息总负责人支持多中心总监并列显示（如 子龙/妙玉） 2026-10-14 13:03:08 +08:00
WuYongJie
49ec0be34f feat(supply-chain): 日销任务改为每日 08:00 单次执行，未到数即告警并支持手动补跑 2026-10-14 12:28:45 +08:00
WuYongJie
1e0a8decc1 feat(supply-chain): 日销任务改为每日 08:00 单次执行，未到数即告警并支持手动补跑 2026-10-14 12:28:40 +08:00
WuYongJie
2c4128e065 feat(supply-chain): 日销任务改为每日 08:00 单次执行，未到数即告警并支持手动补跑 2026-10-14 12:28:24 +08:00
WuYongJie
d5443e9f77 fix(product-archive): display complete column headers and preserve readable widths 2026-10-14 11:56:12 +08:00
WuYongJie
bcb0636625 fix(product-archive): display complete column headers and preserve readable widths 2026-10-14 11:55:26 +08:00
WuYongJie
822df76e19 fix(product-archive): display complete column headers and preserve readable widths 2026-10-14 11:55:00 +08:00
WuYongJie
fc50035d65 feat(owners): include growth center employees in business owner options 2026-10-14 11:35:12 +08:00
WuYongJie
b0d531e1af feat(owners): include growth center employees in business owner options 2026-10-14 11:33:58 +08:00
WuYongJie
bf2f114762 feat(owners): include growth center employees in business owner options 2026-10-14 11:33:22 +08:00
WuYongJie
a917949a5e fix(supply-chain): 基础同步回退视图不存在的 item_type 列引用并修复失败告警原因为空 2026-10-14 10:39:04 +08:00
WuYongJie
cf11c4251e fix(supply-chain): 基础同步回退视图不存在的 item_type 列引用并修复失败告警原因为空 2026-10-14 10:38:37 +08:00
WuYongJie
7f1358aa68 fix(supply-chain): 基础同步回退视图不存在的 item_type 列引用并修复失败告警原因为空 2026-10-14 10:38:22 +08:00
WuYongJie
83f0fbee86 feat(supply-chain): 产品全量档案负责人治理与聚水潭式表头改造 2026-10-14 10:08:08 +08:00
WuYongJie
f84abed356 Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/local-3001-integration 
# Conflicts:
#	furniture-3d-system/src/server/repositories/__tests__/product-archive-owner-workflow.repository.test.ts
#	furniture-3d-system/src/server/repositories/product-archive-owner-workflow.repository.ts
 2026-10-14 10:04:53 +08:00
WuYongJie
42d2447481 feat(supply-chain): 产品全量档案负责人治理与聚水潭式表头改造 2026-10-14 10:04:06 +08:00
WuYongJie
fb1c74ae67 fix(diy): retry transient storage failures during catalog import 2026-10-14 09:20:36 +08:00
WuYongJie
20eaf3589c fix(diy): retry transient storage failures during catalog import 2026-10-14 09:20:00 +08:00
WuYongJie
ce66215764 fix(storage): handle Qiniu CommonJS SDK default export for DIY import 2026-10-14 08:59:22 +08:00
WuYongJie
d76d024d62 fix(storage): handle Qiniu CommonJS SDK default export for DIY import 2026-10-14 08:58:44 +08:00
WuYongJie
56548a731e Merge production main into shared baseline for SABC release 
Preserve SABC storage-type and batch-search changes, logistics column resizing, and production-main employee-hours and route export compatibility. Verified 54 focused tests and type-check; no pending production migrations.
 2026-10-13 16:24:15 +08:00
居居
252624708d Merge branch 'codex/xuxiake-sabc-sync-20260929' into codex/xuxiake-mainline 2026-10-13 10:15:47 +08:00
居居
7ae628f9f1 feat(supply-chain): SABC 明细新增「入库/代发」列，货号/商品编码/款式编码支持空格批量查询 
- 明细与导出新增「入库/代发」，取值来源产品全量档案 storageType（入仓/代发）
- 已生成月份仍读快照；旧快照缺该字段时按 barcode 从档案补齐，无需重新核算
- 货号/商品编码/款式编码额外支持空格/制表符分隔（可直接粘贴 Excel 多行或多列），服务端最多取 200 个
- 入库/代发取值兼容字典值（INBOUND/DROPSHIP）与中文直填（入仓/入库/代发），产品全量档案列表同步显示
 2026-10-13 10:15:34 +08:00
WuYongJie
f8b8959347 feat(diy): persist shared catalog and assets in database and object storage 2026-10-13 09:56:39 +08:00
WuYongJie
409e35e232 feat(diy): persist shared catalog and assets in database and object storage 2026-10-13 09:55:55 +08:00
WuYongJie
462fee6a46 feat(diy): persist shared catalog and assets in database and object storage 2026-10-13 09:48:09 +08:00
WuYongJie
ee033a1e08 feat(diy): add cabinet workbench with saved versions and BOM exports 2026-10-12 18:16:14 +08:00
WuYongJie
12de551328 feat(diy): add cabinet workbench with saved versions and BOM exports 2026-10-12 18:14:15 +08:00