2240 Commits

Author SHA1 Message Date
居居
7b3a7acb12 feat(supply-chain): 是否考核动销按产品类型判定(OEM 考核,其余不考核) 2026-09-29 13:40:36 +08:00
居居
95f5915c6a fix(supply-chain): 同款编码只展示单个编码,自映射规则不重复计算 2026-09-29 13:34:47 +08:00
居居
ff1ea6ce24 feat(supply-chain): 同款商品编码按替换款管理合并业绩与费比 2026-09-29 13:21:45 +08:00
居居
4c518b054e feat(supply-chain): SABC 不考核原因改用档案产品类型,并纳入每日回填 2026-09-29 11:19:17 +08:00
居居
9ae9423742 feat(supply-chain): 每日同步新增正式库类目档位配置步骤 2026-09-29 10:20:18 +08:00
居居
b976f075ff Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/xuxiake-sabc-sync-20260929
# Conflicts:
#	furniture-3d-system/prisma/schema.prisma
#	furniture-3d-system/src/server/repositories/supply-chain-product-archive-category-scale-row.repository.ts
#	furniture-3d-system/src/server/repositories/supply-chain-product-archive-sales-period.repository.ts
2026-09-29 10:14:29 +08:00
居居
648b1eee8d feat(supply-chain): 商品SABC打标(同步开发线前的本地快照) 2026-09-29 10:10:16 +08:00
WuYongJie
749c28452c Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/local-3001-integration 2026-09-29 09:44:02 +08:00
WuYongJie
0e85656279 feat(supply-chain): 产品全量档案新增「售后金额」列(after_sale_amount 按日/月/年周期聚合) 2026-09-28 18:12:31 +08:00
WuYongJie
fe99b46eef feat(supply-chain): 产品全量档案新增「售后金额」列(after_sale_amount 按日/月/年周期聚合) 2026-09-28 18:11:43 +08:00
WuYongJie
7384163a2c feat(supply-chain): refresh product type in daily archive sync
在每日产品档案同步链路中追加「产品类型」刷新步骤(定厂优先、JST vc_name 兜底),复用既有 timer 与库身份校验,无需单独回填或新增定时任务。
2026-09-28 17:00:17 +08:00
WuYongJie
c473825b3d feat(supply-chain): refresh product type in daily archive sync
在每日产品档案同步链路中追加「产品类型」刷新步骤(定厂优先、JST vc_name 兜底),复用既有 timer 与库身份校验,无需单独回填或新增定时任务。
2026-09-28 17:00:08 +08:00
WuYongJie
199be5d7cb feat(supply-chain): add product type column to product archive
产品全量档案在「商品状态」后新增「产品类型」:定厂「产品生产类型」(IntakeNonIntegratedProduct.payload.factoryRows[].productionType) 优先,rpt.jst_sku.vc_name 兜底,按条码对应,都没有留空;值原样写入。附迁移、筛选与回填脚本。
2026-09-28 16:30:55 +08:00
WuYongJie
51c6c9f20b feat(supply-chain): add product type column to product archive
产品全量档案在「商品状态」后新增「产品类型」:定厂「产品生产类型」(IntakeNonIntegratedProduct.payload.factoryRows[].productionType) 优先,rpt.jst_sku.vc_name 兜底,按条码对应,都没有留空;值原样写入。附迁移、筛选与回填脚本。
2026-09-28 16:30:14 +08:00
WuYongJie
3f36d2b51e feat(product-archive): 新增「销售金额」表头字段(取每日快照 sales_amount)
- 列表「数据信息」分组新增「销售金额」,位置固定在「真实业绩」前一列
- 取值来自每日快照表 SupplyChainProductArchiveSalesPerformanceDaily.sales_amount,
  与发货金额/退货金额/真实业绩走同一链路,随页面 日/月/年 周期聚合
- 表头漏斗支持按销售金额筛选(可搜索多选标准弹层),列设置/详情弹窗/资料导出随列配置自动生效,
  字段总数 89 → 90
- 新增一次性 localStorage 列序迁移,把上线前保存过的列设置里的新列挪回「真实业绩」前
- 不改数据库结构、不改每日同步脚本;旧的全周期汇总表不加列、不回填
2026-09-28 16:02:22 +08:00
codex
2c4949f1cc feat(store-account): 新增账号按人员信息带出负责人层级,修复自动填充残留并明文显示密码 2026-09-28 14:58:13 +08:00
codex
c89e4248f0 feat(store-account): 新增账号按人员信息带出负责人层级,修复自动填充残留并明文显示密码 2026-09-28 14:57:53 +08:00
WuYongJie
97d618a25d feat(supply-chain): sync product archive designer from js_sku_info_manage
按 barcode=sku_id 从 rpt.js_sku_info_manage 回填产品全量档案 designer:空值补来源值,冲突行按用户口径取辛环;写入 fieldSourceMap=JST_SKU_INFO_MANAGE 并保留来源记录。附正式站 systemd timer 安装脚本(每天 09:00 Asia/Shanghai)。
2026-09-28 14:45:11 +08:00
WuYongJie
5f4170919d feat(supply-chain): sync product archive designer from js_sku_info_manage
按 barcode=sku_id 从 rpt.js_sku_info_manage 回填产品全量档案 designer:空值补来源值,冲突行按用户口径取辛环;写入 fieldSourceMap=JST_SKU_INFO_MANAGE 并保留来源记录。附正式站 systemd timer 安装脚本(每天 09:00 Asia/Shanghai)。
2026-09-28 14:44:54 +08:00
WuYongJie
da3a49f03f fix(supplier-recommended): use upstream image search defaults 2026-09-28 14:19:21 +08:00
apple
a2dab2cd49 feat(employee-hours): add resizable columns and category import 2026-09-28 14:15:33 +08:00
WuYongJie
a4e577e376 fix(supplier-recommended): use upstream image search defaults 2026-09-28 14:09:50 +08:00
WuYongJie
4fb7802eb4 fix(intake): 分销部纳入运营负责人候选名单并默认归运营
1. intake-owner-options.service.ts: operation 口径在路径含运营中心之外,增加 江苏简尚品牌管理有限公司>分销部,SPU负责人与运营负责人共用该名单,运营中心原口径不变。

2. business-role-inference.ts: 分销部从 EXCLUDED_ROOTS 移出,改为默认归 OPERATIONS,避免每日花名册同步把分销部在职员工打回普通用户。
2026-09-28 12:35:21 +08:00
WuYongJie
d1aa93e17f fix(intake): 分销部纳入运营负责人候选名单并默认归运营
1. intake-owner-options.service.ts: operation 口径在路径含运营中心之外,增加 江苏简尚品牌管理有限公司>分销部,SPU负责人与运营负责人共用该名单,运营中心原口径不变。

2. business-role-inference.ts: 分销部从 EXCLUDED_ROOTS 移出,改为默认归 OPERATIONS,避免每日花名册同步把分销部在职员工打回普通用户。
2026-09-28 12:35:10 +08:00
apple
daa0abbf03 feat(employee-hours): make business selector resizable 2026-09-28 09:00:22 +08:00
WuYongJie
48fcd34608 Revert "fix(deploy): support interactive password authentication"
This reverts commit d2f965611c15838a5b3e3e1f32cf1a5dbe7091bb.
2026-09-27 17:18:29 +08:00
WuYongJie
9d7023df4a fix(employee-hours): normalize attachment URLs before save 2026-09-27 17:11:37 +08:00
WuYongJie
d2f965611c fix(deploy): support interactive password authentication 2026-09-27 17:10:21 +08:00
WuYongJie
a87a8b50b3 fix(employee-hours): normalize attachment URLs before save 2026-09-27 17:09:52 +08:00
WuYongJie
f9c32930da feat(barcode-print): 顾家模板改名「顾家(6x4)」并修复默认选中乱码匹配
- 下拉选项「顾家」改为「顾家(6x4)」(模板本身为 60mm×40mm 纸张)
2026-09-27 16:09:42 +08:00
WuYongJie
2ba2a37232 feat(store-account): add authorization status and header filters 2026-09-27 16:08:43 +08:00
WuYongJie
52ab8578e5 feat(barcode-print): 顾家模板改名「顾家(6x4)」并修复默认选中乱码匹配
- 下拉选项「顾家」改为「顾家(6x4)」(模板本身为 60mm×40mm 纸张)
2026-09-27 15:32:06 +08:00
WuYongJie
ccf8b6480f feat(layout): 侧栏分组归类与首页、操作日志体验统一
1) 首页快捷网址子项去图标改4px圆点(产品开发/供应链双侧栏共用生效)
2) 工作台选择卡片只留图标与名称,去掉描述小字
3) 产品开发侧栏按 新品流程/AI生图/模块化/仓库管理 分组(默认展开可折叠,一级带图标统一14px,二级圆点13px,BOM核算归新品流程),手机端下拉同步
4) /intake/operation-logs 去左侧栏,固定返回链接改为返回上一步按钮(无历史兜底/intake)
2026-09-27 15:20:03 +08:00
apple
b96dfe9780 feat(employee-hours): complete statistics and ranking workflow 2026-09-27 14:30:00 +08:00
WuYongJie
010cd87601 feat(store-account): add batch delete 2026-09-27 13:42:59 +08:00
WuYongJie
5013d709e4 feat(store-account): add batch delete 2026-09-27 13:41:04 +08:00
WuYongJie
02843032d2 fix(intake): persist AB package grouping and set counts 2026-09-27 13:13:28 +08:00
WuYongJie
90eebbc74d fix(intake): persist AB package grouping and set counts 2026-09-27 13:10:02 +08:00
WuYongJie
e6545b6eae style(warehouse-config): 表头靠左,筛选图标后置对齐产品全量档案 2026-09-27 12:32:48 +08:00
WuYongJie
0cb88569d8 style(warehouse-config): 表头靠左,筛选图标后置对齐产品全量档案 2026-09-27 12:32:45 +08:00
WuYongJie
3bd5384699 refactor(employee-hours): 工时独立业务配置表,与工作记录解耦
- 新增 EmployeeHoursBusinessOption/EmployeeHoursScoreRule 独立配置表与迁移
2026-09-27 11:36:16 +08:00
WuYongJie
5af8c6c539 refactor(employee-hours): 工时独立业务配置表,与工作记录解耦
- 新增 EmployeeHoursBusinessOption/EmployeeHoursScoreRule 独立配置表与迁移
2026-09-27 11:36:01 +08:00
WuYongJie
6f63f3936e Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/local-3001-integration 2026-09-27 10:59:34 +08:00
WuYongJie
997efc1084 feat(warehouse-config): 导入导出+聚水潭字典候选+采购负责人回填+表头筛选改造
- 导入导出:模板下载/NDJSON流式导入(名称upsert+逐行报错)/ExcelJS导出,均跟随筛选
2026-09-27 10:40:01 +08:00
WuYongJie
36493b75f8 feat(warehouse-config): 导入导出+聚水潭字典候选+采购负责人回填+表头筛选改造
- 导入导出:模板下载/NDJSON流式导入(名称upsert+逐行报错)/ExcelJS导出,均跟随筛选
2026-09-27 10:39:45 +08:00
WuYongJie
1422c2f5fa fix(intake): skip unconfigured jushuitan virtual inventory 2026-09-27 10:21:02 +08:00
WuYongJie
427448f48e fix(intake): skip unconfigured jushuitan virtual inventory 2026-09-27 10:19:53 +08:00
apple
2e3a36b25d feat(supply-chain): add employee hours statistics 2026-09-24 19:49:35 +08:00
WuYongJie
0b7cb58418 style(category-config): 重置按钮去图标纯文字 2026-09-24 18:04:45 +08:00
WuYongJie
ab817eddfa feat(category-config): 筛选栏增加重置按钮(清空搜索/分类/规模标签并回第一页) 2026-09-24 18:02:59 +08:00