 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 |
|
|
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
|
51a89b18e1
|
应付账单初始化
|
2026-11-04 18:01:02 +08:00 |
|
|
wuweihua
|
98ae525403
|
增加提单功能
|
2026-11-03 17:50:35 +08:00 |
|
|
wuweihua
|
c87f49a14b
|
增加提单功能
|
2026-11-03 17:30:12 +08:00 |
|
|
wuweihua
|
3bb7267b0b
|
修改产品价和红线价功能
|
2026-10-28 22:44:13 +08:00 |
|
|
wuweihua
|
a5e9511857
|
去掉套餐用户绑定功能逻辑
|
2026-10-28 22:14:09 +08:00 |
|
|
wuweihua
|
1eb0e45513
|
增加建立新版本
|
2026-10-28 21:42:45 +08:00 |
|
|
wuweihua
|
8ed7b3146b
|
修改套餐规则
|
2026-10-28 18:10:10 +08:00 |
|
|
wuweihua
|
7f4fc3df8c
|
优化比对
|
2026-10-26 16:03:12 +08:00 |
|
|
wuweihua
|
92000956fc
|
增加导出功能
|
2026-10-21 18:06:21 +08:00 |
|
|
wuweihua
|
35f1048190
|
删除productCountryId
|
2026-10-21 11:36:25 +08:00 |
|
|
wuweihua
|
66d95a0da9
|
更改产品获取数据
|
2026-10-20 18:43:33 +08:00 |
|
|
caojia
|
383ef55e00
|
✨ 完善核销用户记录和毛利报表导出日志
|
2026-10-19 16:43:14 +08:00 |
|
|
wuweihua
|
374c8b8bbb
|
增加套餐绑定用户功能
|
2026-10-19 11:59:44 +08:00 |
|
|
wuweihua
|
69852907f3
|
修改列表
|
2026-10-19 10:03:13 +08:00 |
|
|
wuweihua
|
60d4614695
|
重构产品价和红线价功能
|
2026-10-18 14:16:27 +08:00 |
|
|
wuweihua
|
db6f5e882a
|
优化计费逻辑
|
2026-10-17 01:37:33 +08:00 |
|
|
wuweihua
|
52f714c760
|
回滚代码
|
2026-10-16 20:28:49 +08:00 |
|
|
wuweihua
|
9ff89e36ee
|
增加收货时间
|
2026-10-16 18:01:46 +08:00 |
|
|
wuweihua
|
6a07786e75
|
增加字段
|
2026-10-16 17:46:50 +08:00 |
|
|
wuweihua
|
db396458c5
|
增加订单主表
|
2026-10-16 17:27:11 +08:00 |
|
|
wuweihua
|
071e7f0c55
|
增加产品价和红线价重计费功能
|
2026-10-15 16:09:05 +08:00 |
|
|
caojia
|
c704021f2f
|
✨ 完善毛利分析筛选与导出日志
|
2026-10-15 14:37:18 +08:00 |
|
|
caojia
|
0087aa3712
|
✨ 新增毛利分析报表及提成设置
|
2026-10-14 16:57:44 +08:00 |
|
|
wuweihua
|
c0c9c798b3
|
增加订单失败状态
|
2026-10-14 16:50:11 +08:00 |
|
|
wuweihua
|
6a50b0f122
|
增加可修改计费重功能
|
2026-10-14 15:25:26 +08:00 |
|
|
wuweihua
|
825663be01
|
增加收货重
|
2026-10-13 17:47:22 +08:00 |
|
|
wuweihua
|
d6a6ec4d53
|
修改计费重
|
2026-10-13 17:12:32 +08:00 |
|
|
wuweihua
|
a115926e9f
|
修改计费逻辑
|
2026-10-12 14:44:20 +08:00 |
|
|
wuweihua
|
b68cefd8d0
|
修改计费时间类型
|
2026-10-12 11:05:24 +08:00 |
|
|
wuweihua
|
d08485d738
|
增加软删除
|
2026-10-12 09:52:24 +08:00 |
|
|
wuweihua
|
eeaea52c17
|
增加删除功能
|
2026-10-10 13:52:28 +08:00 |
|
|
wuweihua
|
f1f6ddd368
|
Enhance surcharge management by adding support for price type filtering in SurchargeController and related services. Introduce new methods for handling redline product codes in mappers and services. Update front-end API to accommodate price type parameters in surcharge queries. Modify database schema to include redline product and country tables for improved surcharge calculations.
|
2026-10-09 17:30:29 +08:00 |
|
|
wuweihua
|
380577f691
|
Refactor surcharge management by replacing PrcPriceSetVersionSurcharge with PrcSurchargeRel, introducing price type handling (PRODUCT, SALES, REDLINE) and updating related services, mappers, and front-end components. Enhance validation and error messaging for price type and detail ID requirements. Update database schema to support new relationships and constraints.
|
2026-10-09 17:20:10 +08:00 |
|
|
wuweihua
|
533d360cdc
|
Implement product Excel file import functionality, including new service methods for handling Excel attachments. Update the ProductController to list imported Excel files by product code. Enhance BmsProduct and related entities to store references to the imported Excel files. Update front-end components to support displaying and managing Excel file attachments for products.
|
2026-10-09 16:46:52 +08:00 |
|
|
wuweihua
|
853187ad58
|
Enhance product import validation by adding checks for duplicate country and weight band entries. Update related error messages in properties file. Introduce new method to delete auto fees while retaining manual entries during rebill operations. Update front-end components to manage build mode changes and ensure proper handling of product lists during price set creation.
|
2026-10-09 15:51:21 +08:00 |
|
|
wuweihua
|
c95a9861cc
|
Refactor billing options retrieval to include data permissions and add effective date handling for product imports
|
2026-10-09 09:27:28 +08:00 |
|
|
wuweihua
|
6e301ecee7
|
Enhance price set import functionality with preview options and update handling. Added new endpoints for previewing product library pulls and Excel imports, along with support for update-only imports. Updated internationalization messages for import success and error scenarios.
|
2026-09-30 16:15:44 +08:00 |
|
|
wuweihua
|
998aac74c8
|
修改导入套餐
|
2026-09-30 11:30:34 +08:00 |
|
|
wuweihua
|
52d0a13d83
|
修改产品套餐
|
2026-09-29 23:07:38 +08:00 |
|
|
wuweihua
|
d08758aa35
|
修改计费文档，加上客户代码
|
2026-09-29 09:20:59 +08:00 |
|
|
wuweihua
|
b8e1f8cd40
|
统一将 bms_region 替换为 region，更新相关注释和文档以反映这一变化。
|
2026-09-29 08:57:41 +08:00 |
|
|
wuweihua
|
0ad90f6183
|
修改产品功能
|
2026-09-28 21:43:39 +08:00 |
|
|
wuweihua
|
32ab61b51c
|
修改基础价格版本功能
|
2026-09-28 15:45:07 +08:00 |
|