Commit Graph

168 Commits

Author SHA1 Message Date
liuminghui efd92b5663 新增提单管理和提单计费页面 2026-11-11 16:36:40 +08:00
wuweihua 7869205afc 新增数据迁移任务到定时任务白名单;优化默认收货时间范围逻辑 2026-11-11 15:34:11 +08:00
wuweihua 7e1041391a 新增打单产品渠道查询与替换功能 2026-11-11 14:50:34 +08:00
caojia beba9e9caa 🐛 校验账单价格后确认提成比例 2026-11-11 13:45:34 +08:00
caojia a06962d1dd ⚡ 优化应收账单毛利查询 2026-11-11 11:27:54 +08:00
wuweihua 02763f092e 修改打单套餐功能 2026-11-11 10:12:11 +08:00
caojia b6718f9361 调整命名2 2026-11-11 09:54:09 +08:00
caojia 41cefd5fd5 调整命名 2026-11-11 00:18:12 +08:00
caojia 3e5ef25153 ✨ 完善应收账单毛利分析与提成展示 2026-11-10 17:37:17 +08:00
liuminghui fbc138f041 提单费用均摊处理 2026-11-10 17:24:52 +08:00
wuweihua f26e03efb1 Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test 2026-11-10 16:21:16 +08:00
wuweihua 1a0483c7fe 增加一个渠道绑定 2026-11-10 16:21:07 +08:00
liuminghui da9efc422e 提单费用调整 2026-11-10 15:21:03 +08:00
wuweihua e6a9fcf0a2 修改类型 2026-11-10 14:38:38 +08:00
wuweihua de5784cbac 修改打单计费逻辑 2026-11-09 23:38:07 +08:00
wuweihua 16afa0d590 增加一个打单功能套餐 2026-11-09 23:00:48 +08:00
wuweihua 2632e5aa78 渠道管理增加应收关联 2026-11-09 17:27:21 +08:00
liuminghui f31bb4c54d Merge remote-tracking branch 'origin/test' into test 2026-11-09 16:00:23 +08:00
liuminghui b8b943ef51 偏远地区邮编判断调整 2026-11-09 15:58:27 +08:00
caojia f2d27f3502 🔥 移除应收毛利分析冗余展示和筛选 2026-11-09 15:58:14 +08:00
liuminghui 9220696519 Merge branch 'test' into feauture-20261104
# Conflicts:
#	bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcOrderBillMapper.java
2026-11-09 15:37:55 +08:00
wuweihua 4148c447fc 修改删除逻辑 2026-11-09 13:39:14 +08:00
caojia cd25055159 ✨ 新增应收账单毛利分析与提成管理 2026-11-09 11:24:26 +08:00
liuminghui e4c16263ab Merge branch 'test' into feauture-20261104
# Conflicts:
#	bms-front/src/views/price/billing/components/BillDetail.vue
2026-11-06 17:30:48 +08:00
liuminghui 020aace3f9 新增提单费用和费用日志 2026-11-06 17:28:55 +08:00
liuminghui 6f342d424f 新增路线产品 2026-11-06 13:39:26 +08:00
wuweihua a2e986fa6a 回退代码去掉收货查询 2026-11-06 10:46:58 +08:00
wuweihua e415843b14 增加价格变更日志 2026-11-06 10:11:15 +08:00
liuminghui b4da248815 应付产品增加状态过滤 2026-11-06 09:27:49 +08:00
liuminghui 270b762443 Merge branch 'test' into feauture-20261104
# Conflicts:
#	bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java
2026-11-05 16:38:53 +08:00
liuminghui 36433863af 调整订单同步查询条件 2026-11-05 16:34:33 +08:00
wuweihua 04ce44647a 修改订单数源产品显示 2026-11-05 16:12:35 +08:00
liuminghui fde53681d1 新建应付配置的附加费开关配置 2026-11-05 16:05:01 +08:00
caojia 25801fe42f ✨ 按客户区域计算毛利并完善汇总展示 2026-11-05 15:43:06 +08:00
wuweihua 891fdea7d3 增加失败原因和优化进度条 2026-11-05 15:38:45 +08:00
caojia 1727386811 毛利分析的客户区域筛选。 2026-11-05 14:27:01 +08:00
wuweihua 308526ecee 增加专属报价功能 2026-11-05 12:57:13 +08:00
liuminghui 116b3b74e4 应付配置文件导入保存该文件 2026-11-05 10:31:02 +08:00
caojia 942d5932ae ✨ 同步客户区域字段并统一字典标识 2026-11-04 18:29:47 +08:00
caojia 51a89b18e1 应付账单初始化 2026-11-04 18:01:02 +08:00
caojia 328702a618 🔥 移除毛利分析价格缺失统计 2026-11-04 15:56:11 +08:00
caojia 6b111088c8 🐛 按当天截止时间筛选账单订单
(cherry picked from commit 1f0d757e29)
2026-11-04 13:43:31 +08:00
caojia 8d4e3363ae ✨ 新增应收账单日期类型筛选
(cherry picked from commit 762cad2c0d)
2026-11-04 13:43:30 +08:00
caojia 7399174bd6 ✨ 支持客户账单状态多选并修正有效金额汇总 2026-11-04 11:57:09 +08:00
caojia 8208a7393f ✨ 应收账单状态筛选支持多选并默认排除作废 2026-11-04 11:19:23 +08:00
wuweihua 98ae525403 增加提单功能 2026-11-03 17:50:35 +08:00
wuweihua c87f49a14b 增加提单功能 2026-11-03 17:30:12 +08:00
caojia 6b78e13e5c ✨ 限制应收账单仅拉取指定上游订单状态 2026-11-03 16:55:15 +08:00
caojia 42d12a3fa3 🔥 移除毛利分析数据范围过滤 2026-11-03 14:19:20 +08:00
wuweihua e93f0c0233 新增套餐基本信息编辑功能,包括更新套餐名称和备注,支持客户筛选和绑定客户显示。 2026-11-02 11:52:08 +08:00