Commit Graph

200 Commits

Author SHA1 Message Date
liuminghui 880b4751c5 Merge remote-tracking branch 'origin/test' into test 2026-11-13 11:57:40 +08:00
liuminghui 3a104d2d8c 应付配置的附加费配置完善 2026-11-13 11:57:19 +08:00
wuweihua a024b45940 重构打单套餐相关逻辑,更新服务接口,优化保存和查询功能 2026-11-13 11:27:58 +08:00
liuminghui 6675808dfc 应付配置增加附加费配置,应付账单新增核销、对账、凭证、审核功能 2026-11-12 18:20:32 +08:00
caojia 1ba431540d ✨ 支持应收账单异步作废 2026-11-12 17:33:21 +08:00
wuweihua cf336f7a67 新增按国家去重区块标题接口,优化计费列表请求方式 2026-11-12 13:45:09 +08:00
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 a06962d1dd ⚡ 优化应收账单毛利查询 2026-11-11 11:27:54 +08:00
wuweihua 02763f092e 修改打单套餐功能 2026-11-11 10:12:11 +08:00
wuweihua a58de9bb7e 修改计费逻辑仅 billing_fail_status = 0 才写 prc_income_bill 2026-11-11 09:49:59 +08:00
wuweihua fca999c384 修改比较逻辑 2026-11-10 18:10:10 +08:00
wuweihua cf6b90008d 修改规则 2026-11-10 17:30:11 +08:00
liuminghui fbc138f041 提单费用均摊处理 2026-11-10 17:24:52 +08:00
wuweihua 3c49175cea 增加规则配置 2026-11-10 17:15:38 +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
caojia cd25055159 ✨ 新增应收账单毛利分析与提成管理 2026-11-09 11:24:26 +08:00
wuweihua 489f99dc7b 合并套餐 2026-11-09 11:09:51 +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 7807534e5d 去掉监控的价格日志 2026-11-06 10:28:55 +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 fde53681d1 新建应付配置的附加费开关配置 2026-11-05 16:05: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 5cccbf510f ✨ 新增管理员代登录功能 2026-11-04 15:20:05 +08:00
wuweihua 98ae525403 增加提单功能 2026-11-03 17:50:35 +08:00
wuweihua c87f49a14b 增加提单功能 2026-11-03 17:30:12 +08:00
liuminghui 1b1b934d87 供应商路由调整 2026-11-02 10:41:20 +08:00
liuminghui d185995dc7 客户管理新增区域类型属性 2026-10-30 18:00:20 +08:00
liuminghui b091d47f64 新增渠道管理 2026-10-29 16:30:15 +08:00
liuminghui fc21b08318 区域管理国旗替换 2026-10-29 11:30:26 +08:00
wuweihua 3bb7267b0b 修改产品价和红线价功能 2026-10-28 22:44:13 +08:00
wuweihua 1d47d5781b Merge branch 'test' of http://git.lionquexpress.com/wuweihua/BMS into test 2026-10-28 22:22:48 +08:00
caojia 5f082d905d ✨ 完善客户业务员关联和同步 2026-10-28 22:19:47 +08:00
wuweihua a5e9511857 去掉套餐用户绑定功能逻辑 2026-10-28 22:14:09 +08:00
wuweihua 786feec859 Merge branch 'test' of http://git.lionquexpress.com/wuweihua/BMS into test 2026-10-28 21:42:55 +08:00
wuweihua 1eb0e45513 增加建立新版本 2026-10-28 21:42:45 +08:00