caojia
32cea1c348
Merge branch 'test'
2026-11-17 16:20:11 +08:00
caojia
2aec7fdd5c
✨ 毛利分析筛选支持编码名称搜索
2026-11-17 16:16:14 +08:00
caojia
5c8e905a37
✨ 毛利分析订单导出合并为单个工作表
2026-11-17 15:48:57 +08:00
caojia
ad2d8c8b50
Merge branch 'test'
2026-11-17 15:26:23 +08:00
caojia
8fb042f171
✨ 应收账单导出预留明细空行
2026-11-17 15:25:29 +08:00
caojia
4ad799719a
Merge branch 'test'
2026-11-17 15:01:33 +08:00
caojia
d8f6ceda59
✨ 毛利分析订单支持异步导出
2026-11-17 14:55:54 +08:00
caojia
e104c5a3e9
修改文案
2026-11-17 14:42:53 +08:00
caojia
fcaf0dc9be
⚡ 毛利分析分页复用汇总订单数并禁用重复统计
2026-11-17 14:34:31 +08:00
caojia
c86cad30ec
Merge branch 'test'
2026-11-17 11:28:28 +08:00
caojia
33e8a5890a
✨ 应收账单计费重优先取 charge_weight,空值回退 weight
2026-11-17 11:27:19 +08:00
wuweihua
8ede0bb5ec
移除原计费重显示
2026-11-17 11:27:18 +08:00
caojia
366ddff0b3
去掉导出日志功能
2026-11-17 11:27:17 +08:00
caojia
e2d123de85
去掉导出日志功能
2026-11-17 11:27:16 +08:00
caojia
e22f4bc9d7
⚡ 优化毛利分析订单查询
2026-11-17 11:27:15 +08:00
wuweihua
7500728c1d
优化计费任务列表状态过滤逻辑,更新计费重和客户确认重字段名称
2026-11-17 11:27:14 +08:00
caojia
9483bb4899
✨ 应收账单计费重优先取 charge_weight,空值回退 weight
2026-11-17 11:24:39 +08:00
wuweihua
69d9971a79
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test
2026-11-17 10:52:16 +08:00
wuweihua
f6012f96e3
移除原计费重显示
2026-11-17 10:52:12 +08:00
caojia
111176e767
去掉导出日志功能
2026-11-17 10:37:35 +08:00
caojia
cce123890e
去掉导出日志功能
2026-11-17 10:37:24 +08:00
wuweihua
b76b26b2b1
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test
2026-11-17 10:26:24 +08:00
caojia
6e01167f41
⚡ 优化毛利分析订单查询
2026-11-17 10:23:03 +08:00
wuweihua
e0b8eec98d
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test
2026-11-17 10:16:42 +08:00
liuminghui
54ac6428e7
应付费用重算优化以及样式调整
2026-11-17 10:16:00 +08:00
wuweihua
ee5c79ba29
优化计费任务列表状态过滤逻辑,更新计费重和客户确认重字段名称
2026-11-17 10:13:09 +08:00
caojia
ea62697b98
✨ 毛利分析合并订单明细及产品筛选
2026-11-16 20:29:56 +08:00
caojia
f00f8c619a
✨ 毛利分析合并订单明细及产品筛选
2026-11-16 20:24:27 +08:00
liuminghui
f9038c62ac
费用重算优化、日志记录、费用调整为逻辑删除
2026-11-16 16:52:33 +08:00
liuminghui
49f24a6b1b
应付模块菜单调整,新增应付费用编辑等
2026-11-16 15:50:51 +08:00
caojia
9273fcec56
Merge branch 'test'
2026-11-16 15:00:09 +08:00
caojia
5b8d4de262
✨ 毛利分析支持不选择客户查询
2026-11-16 14:59:00 +08:00
wuweihua
215effe036
新增产品和附加费删除标记,优化版本编辑逻辑
2026-11-16 14:54:19 +08:00
caojia
4503424cf0
♻️ 调整应收账单来源 ID 为 bigint
2026-11-16 14:21:36 +08:00
wuweihua
3cf7fa30bd
重命名应付关联列,删除旧UUID列并重建索引
2026-11-16 13:44:09 +08:00
wuweihua
e34e4f117c
更新UUID到新同步Mapper,删除旧UUID列并优化相关SQL逻辑
2026-11-16 12:44:10 +08:00
wuweihua
03043104bc
修改账单ID类型为Long,更新相关服务和Mapper逻辑
2026-11-16 12:40:05 +08:00
wuweihua
a5cd752005
移除计费结果中的应付费用查询
2026-11-16 11:01:20 +08:00
wuweihua
5d44cc4edf
修改账单ID类型为Long,优化相关服务和Mapper逻辑
2026-11-16 10:30:46 +08:00
wuweihua
0400f55838
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2026-11-15 20:47:28 +08:00
wuweihua
1b43bcca4c
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test
2026-11-15 16:38:52 +08:00
caojia
a38e2c7f57
🐛 修复应收账单毛利分析分页失效
2026-11-15 16:29:58 +08:00
wuweihua
63ded27fd5
新增游标抓取逻辑,优化UUID到新同步服务的查询和Redis配置
2026-11-15 12:26:12 +08:00
wuweihua
2f25a99396
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2026-11-15 09:41:04 +08:00
wuweihua
206e4e786b
新增ar_bill_detail_fee表的income_fee_id字段,更新UUID到新同步逻辑
2026-11-15 09:39:57 +08:00
wuweihua
48b7fbc7cf
Merge branch 'master' of D:\wuweihua\BMS with conflicts.
2026-11-15 09:03:49 +08:00
wuweihua
15a72e3503
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2026-11-15 09:02:44 +08:00
wuweihua
0179a35942
更新UUID到新费用行和阴影同步Mapper的注释,新增关联表回写逻辑
2026-11-15 09:01:19 +08:00
wuweihua
99651b6758
Merge branch 'master' of D:\wuweihua\BMS with conflicts.
2026-11-15 00:23:04 +08:00
wuweihua
2342d34194
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2026-11-15 00:22:34 +08:00