|
|
005e8eec4a
|
merge: retain verified fixes on latest shared main
|
2026-09-09 14:01:32 +08:00 |
|
|
|
367cf10728
|
fix: align bill offset source and close release verification gaps
|
2026-09-09 14:01:00 +08:00 |
|
|
|
7cba2d4770
|
Merge commit '2127d6677c8709b18489d77ad673a536fd90c49a' into feature/WuYongJie-integrate-latest-delivery
|
2026-09-09 13:22:10 +08:00 |
|
|
|
60591c2731
|
Merge commit '3d14eb3b7e9e3e61f9be314f160585edca18f863' into feature/WuYongJie-integrate-latest-delivery
|
2026-09-09 13:22:09 +08:00 |
|
|
|
216c5fcb63
|
Merge commit 'd13cb9d' into feature/WuYongJie-integrate-latest-delivery
|
2026-09-09 13:22:08 +08:00 |
|
|
|
9e71f29df1
|
Merge commit '44e7a5c' into feature/WuYongJie-integrate-latest-delivery
|
2026-09-09 13:22:07 +08:00 |
|
|
|
674d8e6b38
|
Merge commit 'a830ed7bb7d434718e946ed0dfb468e3b3b97f3b' into feature/WuYongJie-integrate-latest-delivery
|
2026-09-09 13:22:06 +08:00 |
|
|
|
d13cb9d3e0
|
fix: preserve online daifa identifiers in exports
|
2026-09-09 13:18:04 +08:00 |
|
chenxi
|
a830ed7bb7
|
Merge remote-tracking branch 'origin/main' into feature/chenxi-table-layout-interactions
|
2026-09-09 13:10:03 +08:00 |
|
|
|
44e7a5c645
|
fix: keep surcharge column help unobtrusive
|
2026-09-09 12:43:58 +08:00 |
|
|
|
a4276a9465
|
feat: 增加线上代发价格筛选和导出
|
2026-09-09 12:34:19 +08:00 |
|
|
|
9e8ef780d2
|
Merge remote-tracking branch 'origin/main' into feature/zhoushengchen-courier-table-interaction
|
2026-09-09 12:24:49 +08:00 |
|
|
|
e4d48c59eb
|
feat: enhance courier surcharge table interactions
|
2026-09-09 12:24:35 +08:00 |
|
|
|
3d14eb3b7e
|
fix: use original bill amount for 500112 offset
|
2026-09-09 12:18:06 +08:00 |
|
chenxi
|
056f8321e5
|
feat: unify receiving bill table interactions
|
2026-09-09 12:17:38 +08:00 |
|
|
|
c3eb8e0fee
|
Merge remote-tracking branch 'origin/main' into feature-sumu-bill-offset-after-sales
|
2026-09-09 11:17:08 +08:00 |
|
chenxi
|
ee41eaac86
|
chore: publish table interaction task scope
|
2026-09-09 10:47:37 +08:00 |
|
|
|
398c80f5a8
|
账单冲减/售后明细：接入 500112 冲减收入取数（暂用退货红冲金额）
- OrderDataRepository 与 OrderDataMirrorRepository 的 afterSales() 现对 account_500112 取数：\n 暂以「退货红冲金额(reversal_order_amount，即负值商品金额的绝对值)」作为收入冲减口径。\n- 该字段此前在 expenseFields() 中仅被列示、从未取值，故本地恒为 null；\n 其余 account_* 科目字段仍为空，待科目归集（金蝶/外部科目源）整体接入。\n- 取数口径为临时占位，待财务确认最终规则后替换（集中在一处，易于调整）。\n- 账单冲减子页面本页 500112 合计已可正常汇总。
|
2026-09-08 17:33:18 +08:00 |
|
|
|
f2e8396007
|
账单冲减子页面改为复用订单售后费用明细同源数据
- BillOffsetPageData 注入 OrderDataPageData，page() 改为调用 afterSales()，使账单冲减子页面与订单售后费用明细页同源取数。
- 子页面按 账单冲减.xlsx 表头展示 9 列：内部订单号、线上订单号、店铺名称、店铺编码、商品编码、款式编码、店铺商品编码、店铺款式编码、500112冲减收入。
- 新增查询、重置与“导出当前页”按钮（沿用售后页前端 CSV 导出逻辑），并展示本页 500112 冲减收入合计。
- 500112 列本地镜像暂为 null，接入真实科目来源后自动填充，无需改模板。
|
2026-09-08 17:33:17 +08:00 |
|
|
|
2127d6677c
|
Merge remote-tracking branch 'origin/main' into feature/renshen-courier-reconciliation-details
|
2026-09-08 16:56:23 +08:00 |
|
|
|
64ff368170
|
Merge remote-tracking branch 'origin/main' into feature/renshen-courier-reconciliation-details
|
2026-09-08 16:43:24 +08:00 |
|
|
|
c67ac02b74
|
fix: 补齐运费对账供应商字段
|
2026-09-08 15:49:07 +08:00 |
|
|
|
0ffd89e9b5
|
feat: 接入快递运费对账明细镜像
|
2026-09-08 15:43:08 +08:00 |
|
