Commit Graph

222 Commits

Author SHA1 Message Date
wuweihua 2a9825c498 供应商管理数据同步, tms系统产品,服务渠道,产品渠道关系数据同步 2026-10-12 10:28:06 +08:00
wuweihua d08485d738 增加软删除 2026-10-12 09:52:24 +08:00
wuweihua 5aba8af49d 修改待生效也可以删除 2026-10-12 09:27:48 +08:00
caojia adc2160c91 ✨ 应收账单快照保存产品价和红线价 2026-10-10 16:44:56 +08:00
wuweihua 830f219e52 修改应付总额显示 2026-10-10 15:51:15 +08:00
wuweihua eeaea52c17 增加删除功能 2026-10-10 13:52:28 +08:00
wuweihua fab2ec7d9c 修改套餐导入功能 2026-10-10 11:16:03 +08:00
wuweihua 9d7218795a Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS 2026-10-10 09:40:54 +08:00
wuweihua 899589cf87 客户批量绑定价格套餐 2026-10-10 09:40:49 +08:00
wuweihua e73b85ed78 增加红线价计费 2026-10-09 17:45:49 +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 70e9c18182 Merge branch 'master' of https://git.lionquexpress.com/wuweihua/BMS 2026-10-09 17:20:05 +08:00
wuweihua 037d4b7cdf 客户超额消息通知 2026-10-09 17:06:40 +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 5b4cbaffd6 Implement batch fee management features in BillingController, including preview, submission, and task retrieval. Update related services and mappers to support batch processing. Add necessary error messages in properties file and enhance front-end API for batch operations. 2026-10-09 10:28:29 +08:00
wuweihua 95df65b4f6 登记收款选择账单直接核销,附件上传支持拖动上传 2026-10-09 10:09:50 +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
caojia fea34d1d10 修改账单模板 2026-10-09 09:21:37 +08:00
wuweihua df33df5813 Update ArBankAccountController.java 2026-10-08 11:52:34 +08:00
wuweihua 5353902341 1 2026-10-08 11:23:24 +08:00
luojiaquan 8f0ee7e441 测试 2026-10-08 11:17:26 +08:00
luojiaquan d20dccf485 客户余额额度初始化始终为0 2026-09-30 17:40:26 +08:00
luojiaquan cbacd9fbc1 Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS 2026-09-30 16:57:51 +08:00
luojiaquan 903d19cad1 日志记录修改 2026-09-30 16:57:44 +08:00
wuweihua b31055a94e Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS 2026-09-30 16:15:49 +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
luojiaquan 02c281fd07 Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS 2026-09-30 16:00:12 +08:00
luojiaquan 0145b24193 客户管理记录修改日志 2026-09-30 16:00:06 +08:00
caojia 4475bff243 🐛 修复应收账单单价和处理费快照 2026-09-30 14:47:18 +08:00
wuweihua 90cde8da4a 修改导入功能 2026-09-30 11:51:07 +08:00
wuweihua 998aac74c8 修改导入套餐 2026-09-30 11:30:34 +08:00
luojiaquan ea23fb0e55 Reapply "更新价格计算逻辑,添加套餐价格匹配和计费相关的国际化消息,优化数据库查询和删除操作"
This reverts commit ca37337386.
2026-09-30 10:40:24 +08:00
luojiaquan ca37337386 Revert "更新价格计算逻辑,添加套餐价格匹配和计费相关的国际化消息,优化数据库查询和删除操作"
This reverts commit 4f5959a2f9.
2026-09-30 10:17:56 +08:00
luojiaquan 4d8cb7c69c 销售权限控制修改 2026-09-30 09:18:23 +08:00
wuweihua 4f5959a2f9 更新价格计算逻辑,添加套餐价格匹配和计费相关的国际化消息,优化数据库查询和删除操作 2026-09-29 23:52:37 +08:00
wuweihua 52d0a13d83 修改产品套餐 2026-09-29 23:07:38 +08:00
wuweihua 38f371742a 修改产品导入 2026-09-29 20:50:01 +08:00
wuweihua 3f8f3a824d 修改导入功能 2026-09-29 19:27:55 +08:00
luojiaquan 61a7aaf096 同步用户数据 2026-09-29 16:08:27 +08:00
luojiaquan b363945e26 Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS 2026-09-29 15:04:25 +08:00
luojiaquan 2b0e5d6816 客户管理,供应商管理查询修改 2026-09-29 15:04:13 +08:00
wuweihua dfa8305294 针对的扣减额度的类型es,业务ID修改为优先取转单号,没有就取订单号 2026-09-29 14:34:29 +08:00
wuweihua 2d002e7291 增加修改客户重新同步功能 2026-09-29 11:58:01 +08:00
luojiaquan b9746e3801 定时任务同步供应商数据 2026-09-29 11:28:15 +08:00
wuweihua ff57be1116 优化导入逻辑 2026-09-29 10:32:59 +08:00
wuweihua 590a65475b 修改同步日志 2026-09-29 09:49:22 +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