Commit Graph

113 Commits

Author SHA1 Message Date
wuweihua c0c9c798b3 增加订单失败状态 2026-10-14 16:50:11 +08:00
wuweihua 6a50b0f122 增加可修改计费重功能 2026-10-14 15:25:26 +08:00
wuweihua 8c4db2f80f 修改菜单 2026-10-14 10:59:57 +08:00
caojia 3edc8ea009 🐛 修正应收账单收货重快照字段来源 2026-10-13 18:05:48 +08:00
wuweihua 825663be01 增加收货重 2026-10-13 17:47:22 +08:00
wuweihua d6a6ec4d53 修改计费重 2026-10-13 17:12:32 +08:00
wuweihua 52816ad618 增加代码检测,和映射 2026-10-13 13:39:15 +08:00
luojiaquan 3ae8d536cd 收款管理 2026-10-13 10:38:50 +08:00
wuweihua 4d27887d4a 修改同步计费 2026-10-13 10:21:28 +08:00
wuweihua 26bdd3ba87 增加查询上游的菜单 2026-10-13 09:29:26 +08:00
wuweihua a115926e9f 修改计费逻辑 2026-10-12 14:44:20 +08:00
caojia 68426dc615 更改 收货实重(kg) 字段取值 2026-10-12 11:26:59 +08:00
caojia 3ef6ea78a9 🐛 修正应收账单收货时间来源为订单扩展表 2026-10-12 11:19:42 +08:00
wuweihua b68cefd8d0 修改计费时间类型 2026-10-12 11:05:24 +08:00
wuweihua 2a9825c498 供应商管理数据同步, tms系统产品,服务渠道,产品渠道关系数据同步 2026-10-12 10:28:06 +08:00
wuweihua d08485d738 增加软删除 2026-10-12 09:52:24 +08:00
caojia adc2160c91 ✨ 应收账单快照保存产品价和红线价 2026-10-10 16:44:56 +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 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 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
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
caojia 4475bff243 🐛 修复应收账单单价和处理费快照 2026-09-30 14:47:18 +08:00
wuweihua 998aac74c8 修改导入套餐 2026-09-30 11:30:34 +08:00
wuweihua 52d0a13d83 修改产品套餐 2026-09-29 23:07:38 +08:00
luojiaquan b9746e3801 定时任务同步供应商数据 2026-09-29 11:28:15 +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
wuweihua cc802d1292 增加失败码功能 2026-09-28 11:07:09 +08:00
caojia 0408b6c35e 统一修改ruoyi->bms 2026-09-28 10:02:38 +08:00
luojiaquan 73e240a872 定时同步客户数据 2026-09-28 09:10:27 +08:00
luojiaquan ac5249f580 供应商保存报错修改 2026-09-24 14:55:23 +08:00
wuweihua f602060ab4 修改文件配置 2026-09-24 11:23:14 +08:00
luojiaquan cef55c517e 表名修改 2026-09-24 09:25:47 +08:00
wuweihua 75bf3223e2 增加退费功能 2026-09-23 16:53:58 +08:00
wuweihua c62433c09e 修改更新欠费状态功能 2026-09-23 15:53:12 +08:00
wuweihua 574ce772b2 增加异常订单功能 2026-09-23 09:25:24 +08:00
caojia 221d4721ee 新增、编辑、删除费用后,都会根据费用明细重新汇总订单状态:
- 全部未出账:UNBILLED
- 部分已出账、部分未出账:PARTIAL
- 全部已出账:BILLED
3. 应收账单生成
   - 预览、统计、分页生成支持 UNBILLED 和 PARTIAL;
   - PARTIAL 订单只读取未出账费用;
   - 生成成功后,只将本次实际生成的费用更新为 BILLED;
   - 不会重复带入历史已出账费用;
   - 账单金额只统计本次未出账费用。
4. 作废、取消、失败清理
   - 只恢复当前账单关联的费用;
   - 如果费用仍被其他有效账单使用,则继续保持 BILLED;
   - 根据费用状态重新汇总订单状态;
   - 大账单清理使用批量 SQL,不组装几十万条费用 ID。
2026-09-22 17:20:27 +08:00
wuweihua 226db7799b 费用明细可以增加费用 2026-09-22 15:30:25 +08:00
luojiaquan 91e9a0c9b7 产品id绑定改为code绑定 2026-09-22 11:20:51 +08:00
caojia cf01ad0299 订单客户状态查询接口 2026-09-22 10:29:13 +08:00
caojia 6e07d9a98b 账单bug修复,以及加入转单号功能 2026-09-21 17:59:09 +08:00