438 Commits

Author SHA1 Message Date
caojia f00f8c619a ✨ 毛利分析合并订单明细及产品筛选 2026-11-16 20:24:27 +08:00
liuminghui f9038c62ac 费用重算优化、日志记录、费用调整为逻辑删除 2026-11-16 16:52:33 +08:00
liuminghui 49f24a6b1b 应付模块菜单调整,新增应付费用编辑等 2026-11-16 15:50:51 +08:00
caojia 5b8d4de262 ✨ 毛利分析支持不选择客户查询 2026-11-16 14:59:00 +08:00
wuweihua 215effe036 新增产品和附加费删除标记,优化版本编辑逻辑 2026-11-16 14:54:19 +08:00
caojia 4503424cf0 ♻️ 调整应收账单来源 ID 为 bigint 2026-11-16 14:21:36 +08:00
wuweihua 3cf7fa30bd 重命名应付关联列,删除旧UUID列并重建索引 2026-11-16 13:44:09 +08:00
wuweihua e34e4f117c 更新UUID到新同步Mapper,删除旧UUID列并优化相关SQL逻辑 2026-11-16 12:44:10 +08:00
wuweihua 03043104bc 修改账单ID类型为Long,更新相关服务和Mapper逻辑 2026-11-16 12:40:05 +08:00
wuweihua a5cd752005 移除计费结果中的应付费用查询 2026-11-16 11:01:20 +08:00
wuweihua 5d44cc4edf 修改账单ID类型为Long,优化相关服务和Mapper逻辑 2026-11-16 10:30:46 +08:00
wuweihua 1b43bcca4c Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test 2026-11-15 16:38:52 +08:00
caojia a38e2c7f57 🐛 修复应收账单毛利分析分页失效 2026-11-15 16:29:58 +08:00
wuweihua 63ded27fd5 新增游标抓取逻辑,优化UUID到新同步服务的查询和Redis配置 2026-11-15 12:26:12 +08:00
wuweihua 206e4e786b 新增ar_bill_detail_fee表的income_fee_id字段,更新UUID到新同步逻辑 2026-11-15 09:39:57 +08:00
wuweihua 0179a35942 更新UUID到新费用行和阴影同步Mapper的注释,新增关联表回写逻辑 2026-11-15 09:01:19 +08:00
wuweihua 4de755ca60 移除UUID阴影同步中的应付相关表与同步逻辑
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-15 00:15:58 +08:00
wuweihua 358e5a46b9 新增UUID到新同步服务的失败处理逻辑和批次结果返回 2026-11-14 19:52:38 +08:00
wuweihua ee36c8c902 新增UUID到新同步运行器的Redis配置持久化功能 2026-11-14 19:27:49 +08:00
wuweihua 7e699fb80e 调整UUID到新配置的线程数范围和注释说明 2026-11-14 19:00:26 +08:00
wuweihua 80d639d887 更新支付账单服务逻辑,调整源ID赋值方式;修改SQL映射中的源ID字段为费用ID;新增UUID到BIGINT迁移配置 2026-11-14 18:53:03 +08:00
wuweihua 87ae3e6674 回退 UUID 转 bigint 相关改动(已迁至 feature/uuid-to-bigint)
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-14 08:08:49 +08:00
wuweihua 359c3c18e4 修改费用ID类型为Long,更新相关逻辑和SQL映射 2026-11-14 01:22:12 +08:00
wuweihua 4f2f2db20f 更新UUID到BIGINT的迁移脚本,优化备份和回滚说明 2026-11-14 00:40:16 +08:00
wuweihua 0094e4aaff Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test
# Conflicts:
#	bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPayBillFee.java
#	bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillFeeMapper.xml
2026-11-14 00:32:55 +08:00
wuweihua 8b7c346ec4 修改计费订单ID类型为Long,优化相关逻辑 2026-11-14 00:23:47 +08:00
liuminghui bde1d7d86e 应付计费邮编改造 2026-11-13 18:26:21 +08:00
wuweihua 87eab12d51 优化附加费计算规则,调整相关逻辑和注释 2026-11-13 15:25:10 +08:00
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
caojia 0d0613e810 ⚡ 移除应收账单确认时的明细校验 2026-11-12 17:08:56 +08:00
caojia 47b95b6bfd 💄 调整应收合计查询按钮显示 2026-11-12 17:08:56 +08:00
wuweihua e7fd7f9059 优化计费规则注释,新增三边规则处理逻辑 2026-11-12 17:00:04 +08:00
wuweihua 1ffaf424b1 Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test 2026-11-12 16:53:45 +08:00
wuweihua 8ca5af1ff0 新增打单产品明细保存接口,优化附加费管理逻辑 2026-11-12 16:53:40 +08:00
caojia 621128530a ⚡ 优化应收合计查询并补充导出汇总 2026-11-12 15:58:25 +08:00
caojia fb9a4e1b29 ⚡ 优化应收账单预览排序 2026-11-12 15:00:58 +08:00
caojia 89aadf97db ✨ 扩展应收账单销售经理部门数据范围 2026-11-12 15:00:58 +08:00
wuweihua 90147ed4e3 新增附加费计费标识,优化附加费管理逻辑 2026-11-12 14:43:42 +08:00
wuweihua cf336f7a67 新增按国家去重区块标题接口,优化计费列表请求方式 2026-11-12 13:45:09 +08:00
wuweihua d2c75e0c51 修改计费逻辑 2026-11-12 11:07:13 +08:00
wuweihua 17ee9731e8 更新应用配置,新增工具迁移链接排除项 2026-11-12 09:56:37 +08:00
caojia 146d3469b6 ✨ 支持应收账单导出通过 OSS 签名链接下载 2026-11-12 09:27:10 +08:00
caojia 27715b3e13 ✨ 将应收账单预览导出改为异步处理 2026-11-11 17:56:14 +08:00
wuweihua b5299e4490 移除价卡导入按钮和相关组件 2026-11-11 17:48:02 +08:00
wuweihua 82164cb00c 修改计费重按钮为注释,更新重新计费按钮样式 2026-11-11 17:12:20 +08:00
caojia 34fa8e23c1 🐛 毛利分析增加查询条件校验 2026-11-11 17:00:49 +08:00
liuminghui efd92b5663 新增提单管理和提单计费页面 2026-11-11 16:36:40 +08:00
wuweihua 7869205afc 新增数据迁移任务到定时任务白名单;优化默认收货时间范围逻辑 2026-11-11 15:34:11 +08:00
wuweihua f82d9c667f Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test 2026-11-11 14:50:58 +08:00
wuweihua 7e1041391a 新增打单产品渠道查询与替换功能 2026-11-11 14:50:34 +08:00
caojia 99cdfd86d3 ✨ 展示TMS同步新增用户明细 2026-11-11 14:44:41 +08:00
caojia 41a80f9794 ✨ 设置应收账单默认日期范围 2026-11-11 14:31:08 +08:00
caojia 8cb2d03062 🐛 修复应收账单二维码位置 2026-11-11 14:23:25 +08:00
wuweihua 4ceb0bc830 Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test 2026-11-11 13:52:35 +08:00
wuweihua f7384c88f6 优化代码注释为简体中文 2026-11-11 13:52:28 +08:00
caojia beba9e9caa 🐛 校验账单价格后确认提成比例 2026-11-11 13:45:34 +08:00
wuweihua b7d0674fda 优化代码注释为简体中文 2026-11-11 13:35:53 +08:00
wuweihua 0545de88b4 新增订单计费失败原因的价格周期字段,并优化前端展示,支持查看价格周期详情。 2026-11-11 13:12:32 +08:00
wuweihua 2430e344a0 Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test 2026-11-11 11:30:22 +08:00
wuweihua 5db27e00ba 修改计费失败原因 2026-11-11 11:30:17 +08:00
caojia a06962d1dd ⚡ 优化应收账单毛利查询 2026-11-11 11:27:54 +08:00
wuweihua 5f679b5a6e 修改订单列表重新计费 2026-11-11 10:49:45 +08:00
wuweihua 02763f092e 修改打单套餐功能 2026-11-11 10:12:11 +08:00
caojia b6718f9361 调整命名2 2026-11-11 09:54:09 +08:00
wuweihua a58de9bb7e 修改计费逻辑仅 billing_fail_status = 0 才写 prc_income_bill 2026-11-11 09:49:59 +08:00
wuweihua a211f06663 修改定时任务时间 2026-11-11 09:29:47 +08:00
caojia 41cefd5fd5 调整命名 2026-11-11 00:18:12 +08:00
wuweihua fca999c384 修改比较逻辑 2026-11-10 18:10:10 +08:00
caojia 2e5ab2bfc1 ✅ 跳过依赖本机价卡文件的测试 2026-11-10 18:04:19 +08:00
caojia 3e5ef25153 ✨ 完善应收账单毛利分析与提成展示 2026-11-10 17:37:17 +08:00
caojia 9004a1b921 🔥 删除毛利汇总说明文字 2026-11-10 17:37:17 +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
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 ace1eb06c0 去除计费列表的多余按钮 2026-11-09 16:15:55 +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 8633019788 增加计费日志显示 2026-11-09 14:12:21 +08:00
wuweihua 4148c447fc 修改删除逻辑 2026-11-09 13:39:14 +08:00
caojia 61099b2514 调整模板 2026-11-09 11:24:27 +08:00
caojia 9e3f8314f1 🐛 修正账单预览导出重量精度 2026-11-09 11:24:26 +08:00
caojia 7abb7fdb06 🐛 修正账单预览重量精度显示 2026-11-09 11:24:26 +08:00
caojia cd25055159 ✨ 新增应收账单毛利分析与提成管理 2026-11-09 11:24:26 +08:00
wuweihua 489f99dc7b 合并套餐 2026-11-09 11:09:51 +08:00
wuweihua af3fb0aa2f 修改去空格 2026-11-06 19:27:31 +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
wuweihua 709c315971 增加计费列表收货时间查询 2026-11-06 16:13:03 +08:00
liuminghui 6f342d424f 新增路线产品 2026-11-06 13:39:26 +08:00
wuweihua a2e986fa6a 回退代码去掉收货查询 2026-11-06 10:46:58 +08:00
wuweihua 7807534e5d 去掉监控的价格日志 2026-11-06 10:28:55 +08:00
wuweihua e415843b14 增加价格变更日志 2026-11-06 10:11:15 +08:00
liuminghui b4da248815 应付产品增加状态过滤 2026-11-06 09:27:49 +08:00
wuweihua 1090d838a6 增加版本号显示 2026-11-05 18:42:27 +08:00
wuweihua 6ced4f237f 增加查看计费历史记录 2026-11-05 18:33:14 +08:00
wuweihua 87c75922aa 增加查看价格套餐历史版本的变更 2026-11-05 18:28:57 +08:00
wuweihua 44df6b1a1b 优化计费速度 2026-11-05 16:58:30 +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
wuweihua 93c081775d 优化订单数源的进度条 2026-11-05 15:58:20 +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 218001e6ae 修改编辑bug 2026-11-05 13:15:51 +08:00
wuweihua 308526ecee 增加专属报价功能 2026-11-05 12:57:13 +08:00
liuminghui 116b3b74e4 应付配置文件导入保存该文件 2026-11-05 10:31:02 +08:00
wuweihua 557d43a0b8 增加进度条 2026-11-04 19:38:13 +08:00
caojia 942d5932ae ✨ 同步客户区域字段并统一字典标识 2026-11-04 18:29:47 +08:00
caojia 51a89b18e1 应付账单初始化 2026-11-04 18:01:02 +08:00
caojia 846a41c6df 🐛 保留毛利报表暂停功能校验 2026-11-04 16:04:38 +08:00
caojia 04be15deab 🐛 修复毛利报表查询参数编译错误 2026-11-04 16:02:56 +08:00
caojia 328702a618 🔥 移除毛利分析价格缺失统计 2026-11-04 15:56:11 +08:00
caojia 910a73ed28 💄 调整毛利分析筛选项位置 2026-11-04 15:47:22 +08:00
caojia 5cccbf510f ✨ 新增管理员代登录功能 2026-11-04 15:20:05 +08:00
caojia 93da04fe5e ✨ 应收账单导出时间按筛选类型切换 2026-11-04 14:26:01 +08:00
wuweihua 1ebc86ddcf 隐藏修改计费重
(cherry picked from commit cdfc90556d)
2026-11-04 13:43:40 +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
caojia 826d95d3c1 ✨ 新增应收账单生成预览结果导出 2026-11-04 10:23:33 +08:00
wuweihua 071a1d7f55 优化列表查询 2026-11-04 10:16:26 +08:00
caojia c6509fca51 ✨ 合并毛利分析客户筛选并调整订单号输入高度 2026-11-04 10:09:10 +08:00
wuweihua f0012ac563 计费重覆盖 2026-11-03 18:13:52 +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 86255c45f6 🔧 将前端默认请求超时调整为20秒 2026-11-03 16:46:43 +08:00
caojia 844b501686 💄 调整侧栏 Logo 显示宽度 2026-11-03 15:58:00 +08:00
caojia 229f1f9bad 💄 调整毛利分析筛选项顺序 2026-11-03 14:31:06 +08:00
caojia 42d12a3fa3 🔥 移除毛利分析数据范围过滤 2026-11-03 14:19:20 +08:00
caojia 3481cfd634 更换logo 2026-11-02 16:45:42 +08:00
wuweihua 7d3854bb4f 增加导入模版逻辑判断 2026-11-02 16:41:47 +08:00
wuweihua e93f0c0233 新增套餐基本信息编辑功能,包括更新套餐名称和备注,支持客户筛选和绑定客户显示。 2026-11-02 11:52:08 +08:00
liuminghui 1b1b934d87 供应商路由调整 2026-11-02 10:41:20 +08:00
wuweihua 1ba5822a86 修改报错 2026-11-02 10:05:57 +08:00
wuweihua 17e80b3a18 增加最计费重的计费逻辑 2026-11-02 09:13:33 +08:00
wuweihua 9d4dbdcbe6 增加产品价编辑 2026-11-02 09:00:38 +08:00
liuminghui d185995dc7 客户管理新增区域类型属性 2026-10-30 18:00:20 +08:00
wuweihua bc33e11437 增加对外代码搜索 2026-10-30 17:45:37 +08:00
wuweihua 8ed97fed4a 增加批量绑定 2026-10-30 11:07:51 +08:00
wuweihua 6b10a41b9d 拉取上游数据记录es里面 2026-10-29 18:17:47 +08:00
caojia 02c49e3efe ✨ 新增应收账单按角色和客户归属的行级数据权限 2026-10-29 16:42:28 +08:00
liuminghui b091d47f64 新增渠道管理 2026-10-29 16:30:15 +08:00
wuweihua c3456ca92a 新增按版本获取价格设置明细的接口,优化产品下拉选项查询,更新相关服务和前端调用逻辑。 2026-10-29 16:13:18 +08:00
liuminghui 59eb4b23cc 客户管理套餐去除生效和失效日期 2026-10-29 11:37:31 +08:00
liuminghui fc21b08318 区域管理国旗替换 2026-10-29 11:30:26 +08:00
caojia b72f3a7014 导包 2026-10-29 11:13:36 +08:00
caojia eafc8af89a ✨ 新增未关联业务员客户列表 2026-10-29 11:08:46 +08:00
liuminghui d02d3dd881 订单列表和计费列表调整使用客户下拉全查接口 2026-10-29 10:33:41 +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 56340d0ea0 优化套餐新建版本的逻辑 2026-10-28 22:09:30 +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
caojia 1688cddac7 注释不必要的东西 2026-10-28 20:47:42 +08:00
caojia d7f49cef58 💄 优化账单核销文案和弹窗展示 2026-10-28 20:30:28 +08:00
caojia df7220d333 “收款入账”和“账单核销”分开处理 2026-10-28 20:13:34 +08:00
wuweihua 00a690abe9 Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test 2026-10-28 18:10:14 +08:00
wuweihua 8ed7b3146b 修改套餐规则 2026-10-28 18:10:10 +08:00
liuminghui 1e4711326c 去除供应商类型多余代码 2026-10-28 17:14:42 +08:00
wuweihua 2bd417b84e Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test 2026-10-28 15:25:23 +08:00
wuweihua 3652546ea4 修改计费逻辑名称 2026-10-28 15:24:59 +08:00
liuminghui 1a0dc9c982 数据接口查询去除权限注解 2026-10-28 15:24:03 +08:00
caojia 173e22a58e ✨ 拆分应收账单导出与下载权限 2026-10-28 14:58:09 +08:00
caojia acfdfd5cbf ✨ 客户列表增加账单入口和权限 2026-10-27 20:29:08 +08:00
caojia db787ec7f7 ✨ 客户账单弹窗增加汇总和导出 2026-10-27 17:21:12 +08:00
caojia b4e696b27c ✨ 应收账单列表增加筛选导出 2026-10-27 17:04:22 +08:00
caojia 4238c31d9d 增加反核销按钮 2026-10-27 16:47:22 +08:00
wuweihua b55f0010ed 新增订单状态字段并调整提货时间字段,更新相关导出和展示逻辑 2026-10-27 16:23:02 +08:00
caojia 4067bfc277 ✨ 客户余额页增加只读账单弹窗 2026-10-27 16:19:44 +08:00
caojia fe30345045 Revert "✨ 应收账单接入角色数据权限并同步在线缓存"
This reverts commit 4659c63ef9.
2026-10-27 15:32:26 +08:00
wuweihua 4d4065b9e9 更新计费失败状态,新增销售价和产品价未匹配的错误信息,调整相关代码逻辑以支持新的状态处理。 2026-10-27 15:24:16 +08:00
liuminghui 0ba975656b 客户和供应商新增合同时间 2026-10-27 13:50:54 +08:00
liuminghui 65d382d256 Merge remote-tracking branch 'origin/test' into test 2026-10-27 13:36:11 +08:00
wuweihua 7fcd3b6089 计费列表增加状态搜索 2026-10-27 13:28:14 +08:00
liuminghui 7e53b41a3c 新增供应商类型配置 2026-10-27 11:40:22 +08:00
caojia 4659c63ef9 ✨ 应收账单接入角色数据权限并同步在线缓存 2026-10-27 11:32:26 +08:00
wuweihua f3fa3e1396 修改前端同步报错 2026-10-27 10:30:15 +08:00
liuminghui be0b067516 乱码注释调整 2026-10-27 10:17:53 +08:00
wuweihua f80af4a2f6 修改订单列表重新计费 2026-10-27 01:08:44 +08:00
wuweihua 7924450b89 修改同步落库 2026-10-27 00:04:21 +08:00
wuweihua 2bae431e74 优化落库功能 2026-10-26 23:23:22 +08:00
wuweihua 8fba64e2d6 Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test 2026-10-26 17:59:46 +08:00
wuweihua 7e175808bf 去掉退费校验 2026-10-26 17:59:35 +08:00
caojia 74762c8043 调整权限 2026-10-26 17:59:34 +08:00
wuweihua bdce5e3086 优化数据源导出 2026-10-26 16:59:01 +08:00
caojia 2ed0e0c77d 🐛 修复用户管理组织机构筛选 deptId 滞后 2026-10-26 16:57:10 +08:00
caojia b3374fa44c 更新文档 2026-10-26 16:22:14 +08:00
wuweihua 76cc5b5781 增加导出功能 2026-10-26 16:20:46 +08:00
wuweihua 7f4fc3df8c 优化比对 2026-10-26 16:03:12 +08:00
wuweihua 209d545d5b 修改操作文档 2026-10-26 15:21:52 +08:00
wuweihua 90a0194a99 新增操作文档 2026-10-26 14:21:29 +08:00
wuweihua ab6216922a 订单比对加上状态 2026-10-26 11:59:19 +08:00
wuweihua 4bee108661 去掉三边之和规则 2026-10-23 17:49:52 +08:00
wuweihua 2bb562372e 修改计费规则 2026-10-23 17:43:07 +08:00
wuweihua 55b5ed8951 改动在 OracleOrderBillMapper.toBillRequest,同步计费 / 计费任务走上游行时都会生效。本地「重新计费」仍用订单表已存的计费重,不会再回上游取 2026-10-23 17:38:22 +08:00
wuweihua 48d938c4f7 支持按提货时间重新计费 2026-10-23 17:36:03 +08:00
luojiaquan dac0c0f252 Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS 2026-10-23 15:57:15 +08:00
luojiaquan de34cad95d 无用字段注释 2026-10-23 15:57:09 +08:00
wuweihua d46d1596e8 处理同步退费逻辑 2026-10-23 14:00:53 +08:00
wuweihua 84939a8875 订单增加状态搜索 2026-10-23 13:47:41 +08:00
wuweihua fcebf9282c 优化添加附加费 2026-10-23 11:02:24 +08:00
caojia fc94a15f76 ✨ 单号筛选改为多行输入并限制1000个 2026-10-23 10:06:59 +08:00
wuweihua 4ec28de073 增加订单复选搜索 2026-10-22 17:40:57 +08:00
wuweihua 23236ec141 导入提示报错 2026-10-22 15:57:08 +08:00
wuweihua d010783c97 Merge branch 'master' of https://git.lionquexpress.com/wuweihua/BMS 2026-10-22 14:46:57 +08:00
wuweihua f07386f4aa 增加模版 2026-10-22 14:46:52 +08:00
luojiaquan 6fb0ba3edc 客户管理附件oss上传 2026-10-22 11:50:32 +08:00
wuweihua c064d925ca 增加上传附件到oss 2026-10-22 10:45:50 +08:00
wuweihua 92000956fc 增加导出功能 2026-10-21 18:06:21 +08:00
caojia c04191c316 🐛 修复账单导出数值精度显示 2026-10-21 15:10:34 +08:00
wuweihua b8e2a8e31a 增加套餐产品红线价修改内容日志 2026-10-21 15:08:13 +08:00
wuweihua 1e8a449dda 优化套餐编辑逻辑 2026-10-21 14:51:44 +08:00
caojia 26a3285571 🐛 修复账单导出运单号格式和列宽 2026-10-21 14:18:27 +08:00
caojia 9e61f7f55c 调整模板比例为70% 2026-10-21 13:50:03 +08:00
wuweihua a4440d7932 修改订单数据源的产品检测 2026-10-21 11:42:08 +08:00
wuweihua 35f1048190 删除productCountryId 2026-10-21 11:36:25 +08:00
wuweihua 8f1cf5c755 修改比对规则 2026-10-21 11:01:59 +08:00
wuweihua 36837f94bf 失败记录日志 2026-10-21 10:45:04 +08:00
wuweihua dd2efef456 修改死锁 2026-10-21 10:34:45 +08:00
wuweihua d7f7ebd981 订单列表重新计费优化 2026-10-21 10:13:01 +08:00
wuweihua be3856a59c 自动脚本计费 2026-10-21 09:44:54 +08:00
caojia 501056bb17 🐛 修复账单截止日当天数据漏查 2026-10-21 09:23:59 +08:00
wuweihua c30c88bbe8 修改已出账单,状态没落库 2026-10-21 09:13:50 +08:00
caojia dba75c3a77 ✨ 汇总前新增明细纳入应收合计 2026-10-20 20:32:24 +08:00
caojia e41c7b072f ✨ 应收账单导出金额公式动态化 2026-10-20 20:09:39 +08:00
wuweihua 2d5a2c4bab 修改计费重去掉客户 2026-10-20 18:48:46 +08:00
wuweihua 66d95a0da9 更改产品获取数据 2026-10-20 18:43:33 +08:00
wuweihua 7655713319 修改生效时间 2026-10-20 18:05:18 +08:00
wuweihua eca8855b8d 修改对外代码查询 2026-10-20 16:20:57 +08:00
caojia acf4757144 🐛 修复账单预览翻页重置手动选择模式 2026-10-20 15:38:43 +08:00
caojia 7063dc7218 ✨ 优化生成应收账单订单表格 2026-10-20 15:29:36 +08:00
caojia 9166220579 ✨ 支持生成账单列表拖选复制单列文字 2026-10-20 15:25:15 +08:00
caojia b772c95813 ✨ 支持按单号批量排除账单订单 2026-10-20 15:11:27 +08:00
wuweihua 29e804dae2 修改前端同步逻辑 2026-10-20 14:03:37 +08:00
wuweihua 45969a4d29 订单数据源增加订单对比功能 2026-10-20 13:55:55 +08:00
luojiaquan 8093cb52e7 订单数据源数据速度优化 2026-10-20 10:14:38 +08:00
wuweihua 58d7ec90b0 提高订单源的查询速度 2026-10-19 17:44:19 +08:00
caojia 383ef55e00 ✨ 完善核销用户记录和毛利报表导出日志 2026-10-19 16:43:14 +08:00
luojiaquan a754e8dcc6 Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS 2026-10-19 16:03:36 +08:00
luojiaquan 1ae97cd622 客户余额按钮加权限控制 2026-10-19 16:03:30 +08:00
caojia 1986a901d9 ✨ 补充应收账单用户ID记录及迁移脚本 2026-10-19 15:52:57 +08:00
wuweihua 5bb9000e8e 修改套餐报错 2026-10-19 15:34:04 +08:00
wuweihua df1a2fd731 修改订单搜索 2026-10-19 15:19:06 +08:00
luojiaquan b945c9f37b Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS 2026-10-19 12:01:08 +08:00
luojiaquan 6b570f948c 修改客户管理权限控制,按user_id控制 2026-10-19 12:00:56 +08:00
wuweihua 374c8b8bbb 增加套餐绑定用户功能 2026-10-19 11:59:44 +08:00
wuweihua 69852907f3 修改列表 2026-10-19 10:03:13 +08:00
luojiaquan 92fc2f1ad0 修改TMS用户同步只增量同步用户数据 2026-10-19 09:59:01 +08:00
caojia a48b40c649 🚚 重命名应收账单明细导出记录表 2026-10-18 22:41:31 +08:00
caojia 3cf85af180 💄 调整应收账单导出列宽与公式显示 2026-10-18 22:13:40 +08:00
wuweihua a19d97d111 修改优化 2026-10-18 15:32:48 +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 a15a96f881 Merge branch 'master' of https://git.lionquexpress.com/wuweihua/BMS 2026-10-16 17:46:43 +08:00
caojia 1d22bd91fd 💄 调整应收账单导出表格布局 2026-10-16 17:43:00 +08:00
wuweihua db396458c5 增加订单主表 2026-10-16 17:27:11 +08:00
wuweihua e227c6a80f Merge branch 'master' of https://git.lionquexpress.com/wuweihua/BMS 2026-10-16 17:27:09 +08:00
caojia eb67ccc3cb ✨ 毛利分析报表导出接入 OSS 存储 2026-10-16 17:09:34 +08:00
caojia 9e391888f5 ✨ 账号密码补全 2026-10-16 16:48:46 +08:00
caojia b0719d2ae9 ✨ 接入账单 OSS 存储并区分生产测试目录 2026-10-16 16:44:51 +08:00
wuweihua 15e005fd20 修改规则 2026-10-16 16:28:12 +08:00
wuweihua 9824e05919 增加规则判断 2026-10-16 14:05:50 +08:00
wuweihua b54cb1b018 增加规则配置 2026-10-16 13:40:03 +08:00
wuweihua b3f79ffc4c Merge branch 'master' of https://git.lionquexpress.com/wuweihua/BMS 2026-10-16 11:27:48 +08:00
wuweihua 2431a5caac 增加筛选 2026-10-16 11:27:44 +08:00
caojia 760e3807f3 ✨ 应收账单预览支持大批量单号查询 2026-10-16 11:05:02 +08:00
luojiaquan 132688b9cf 同步计费优化 2026-10-16 10:59:59 +08:00
wuweihua 2689138b6a 修改套餐价格 2026-10-16 10:43:45 +08:00
luojiaquan 622d2a4c40 Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS 2026-10-16 09:22:19 +08:00
luojiaquan 02481b102c 优化订单列表,多单号查询,支持几万单号查询 2026-10-16 09:22:13 +08:00
caojia ca010a4242 🔧 调整JWT令牌有效期为24小时 2026-10-15 21:15:01 +08:00
caojia f92da4782d 💄 调整应收账单导出按钮文案 2026-10-15 20:51:18 +08:00
caojia 0a7f639138 sql 2026-10-15 18:49:16 +08:00
caojia 5126a5c163 🐛 修复应收账单序号格式并移除登录默认账号密码 2026-10-15 18:45:09 +08:00
caojia a22039defc 🐛 修复订单列表多单号查询URL过长 2026-10-15 18:00:44 +08:00
luojiaquan 085d01dc15 价格套餐缓存修改 2026-10-15 17:13:00 +08:00
wuweihua 7db0796c2f 套餐详情增加查看附件功能 2026-10-15 16:37:57 +08:00
wuweihua 071e7f0c55 增加产品价和红线价重计费功能 2026-10-15 16:09:05 +08:00
wuweihua 41ce05a08a 增加导入附件的查看记录 2026-10-15 15:02:23 +08:00
caojia c704021f2f ✨ 完善毛利分析筛选与导出日志 2026-10-15 14:37:18 +08:00
luojiaquan be2a359698 同步用户数据有问题,先禁用 2026-10-15 13:55:26 +08:00
caojia e4438d6f01 ✨ 应收账单保存计费失败状态并导出说明及黄色标注 2026-10-14 17:50:03 +08:00
wuweihua 996d854492 修改错误日志 2026-10-14 17:02:01 +08:00
caojia 0087aa3712 ✨ 新增毛利分析报表及提成设置 2026-10-14 16:57:44 +08:00
wuweihua c0c9c798b3 增加订单失败状态 2026-10-14 16:50:11 +08:00
wuweihua c1c5c6579c 提速修改计费重 2026-10-14 15:32:34 +08:00
wuweihua 6a50b0f122 增加可修改计费重功能 2026-10-14 15:25:26 +08:00
luojiaquan 2d7bd678f3 订单列表优化 2026-10-14 14:20:13 +08:00
wuweihua 8c4db2f80f 修改菜单 2026-10-14 10:59:57 +08:00
caojia 3edc8ea009 🐛 修正应收账单收货重快照字段来源 2026-10-13 18:05:48 +08:00
wuweihua 83941be542 计费重直接取DIMENSIONAL_WEIGHT_FACTOR 2026-10-13 17:50:39 +08:00
wuweihua 825663be01 增加收货重 2026-10-13 17:47:22 +08:00
luojiaquan 490f5dd213 Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS 2026-10-13 17:24:58 +08:00
luojiaquan 56588fad08 滚轮取消bug修改 2026-10-13 17:24:53 +08:00
wuweihua 80cfe07ebc 修改优先 2026-10-13 17:20:28 +08:00
luojiaquan 3598a0d669 右键复制 2026-10-13 17:16:27 +08:00
wuweihua d6a6ec4d53 修改计费重 2026-10-13 17:12:32 +08:00
wuweihua 5c48717da2 增加查看哪些产品没有 2026-10-13 15:48:02 +08:00
caojia 92485129f8 ✨ 调整应收账单导出文件名规则 2026-10-13 15:35:10 +08:00
caojia b99b847886 💄 调整应收账单导出按钮文案 2026-10-13 15:15:40 +08:00
caojia f1d7dd05ca 订单数据源 支持客户代码搜索 2026-10-13 15:11:42 +08:00
caojia d950aea5d4 文案修改,改成运费固定 2026-10-13 14:55:32 +08:00
wuweihua 52816ad618 增加代码检测,和映射 2026-10-13 13:39:15 +08:00
wuweihua b40033f424 Merge branch 'master' of https://git.lionquexpress.com/wuweihua/BMS 2026-10-13 11:22:11 +08:00
luojiaquan 3ae8d536cd 收款管理 2026-10-13 10:38:50 +08:00
wuweihua 94b94828ba 修改同步速率 2026-10-13 10:33:03 +08:00
wuweihua 4d27887d4a 修改同步计费 2026-10-13 10:21:28 +08:00
wuweihua 26bdd3ba87 增加查询上游的菜单 2026-10-13 09:29:26 +08:00
wuweihua 3456a0bf7f 增加计费时间的搜索 2026-10-12 16:41:39 +08:00
wuweihua a115926e9f 修改计费逻辑 2026-10-12 14:44:20 +08:00
luojiaquan 4d41b0fe12 1 2026-10-12 14:25:42 +08:00
wuweihua 267c412cdc 1 2026-10-12 14:11:57 +08:00
wuweihua 4ea16e0b60 1 2026-10-12 14:10:23 +08:00
wuweihua d3e41713bf Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS 2026-10-12 14:04:12 +08:00
wuweihua 9448e4a213 加定时任务白名单 2026-10-12 14:04:05 +08:00
caojia 68426dc615 更改 收货实重(kg) 字段取值 2026-10-12 11:26:59 +08:00
caojia 980ab1d251 🐛 修复应收账单收货时间范围导出类型异常 2026-10-12 11:19:43 +08:00
caojia 35cbeb8adc 🐛 固定应收账单导出费用类型为运费 2026-10-12 11:19:43 +08:00
caojia 3ef6ea78a9 🐛 修正应收账单收货时间来源为订单扩展表 2026-10-12 11:19:42 +08:00
wuweihua b68cefd8d0 修改计费时间类型 2026-10-12 11:05:24 +08:00
wuweihua 9dcf1b201c 页面显示优化 2026-10-12 10:44:22 +08:00
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 c7da1a004b 🐛 修复表格拖选文字 Ctrl+C 偶发失效 2026-10-10 18:04:09 +08:00
caojia adc2160c91 ✨ 应收账单快照保存产品价和红线价 2026-10-10 16:44:56 +08:00
caojia 105a37f258 ✨ 支持双击选中表格单元格文字 2026-10-10 15:54:53 +08:00
wuweihua 830f219e52 修改应付总额显示 2026-10-10 15:51:15 +08:00
caojia b071d76c96 ✨ 全局支持表格单列文字拖选复制 2026-10-10 14:22:58 +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
caojia 94e7a18e0b ✨ 支持账单客户名称和编码远程搜索 2026-10-09 10:33:41 +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 111678a07c 登记收款附件上传该拖动 2026-10-08 16:43:50 +08:00
wuweihua 0268aef7ca 隐藏消息通知 2026-10-08 16:25:58 +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
wuweihua 95b5f621e0 删除文件 2026-10-08 09:53:20 +08:00
wuweihua 83e9bd4394 测试提交 2026-10-08 09:31:57 +08:00
wuweihua d93d9f9dba 修改时间显示 2026-09-30 17:42:38 +08:00
luojiaquan d20dccf485 客户余额额度初始化始终为0 2026-09-30 17:40:26 +08:00
luojiaquan d26b90f7e5 Update index.vue 2026-09-30 17:07:42 +08:00
luojiaquan c3875cb9aa 样式修改 2026-09-30 17:04:41 +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
wuweihua 0ad90f6183 修改产品功能 2026-09-28 21:43:39 +08:00
wuweihua b247bc2fd2 导入批量修改价格明细 2026-09-28 18:01:26 +08:00
wuweihua c278ed76f7 修改价格限制 2026-09-28 16:38:19 +08:00
wuweihua 623df69d4b 修改产品功能 2026-09-28 16:26:55 +08:00
wuweihua 32ab61b51c 修改基础价格版本功能 2026-09-28 15:45:07 +08:00
luojiaquan 1083c2876f 临时失效时间必填 2026-09-28 15:18:22 +08:00
caojia d3493f2bc5 部署脚本 2026-09-28 14:12:25 +08:00
caojia be95794a1c 日志输出补充 2026-09-28 14:12:14 +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 341afc4111 Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS 2026-09-28 09:10:37 +08:00
luojiaquan 73e240a872 定时同步客户数据 2026-09-28 09:10:27 +08:00
wuweihua a127035273 Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS 2026-09-24 18:02:53 +08:00
wuweihua 9292199ca1 修改计费逻辑 2026-09-24 18:02:45 +08:00
caojia b35b03bb05 更新接口文档 2026-09-24 17:41:04 +08:00
caojia 533984c77c 生产环境:上传下载文件路径调整 2026-09-24 17:29:15 +08:00
caojia e1e1760ab9 修改接口文档 2026-09-24 17:10:06 +08:00
wuweihua 1174dede01 打包功能 2026-09-24 16:46:20 +08:00
caojia 1657d58590 调整profiles 2026-09-24 16:45:00 +08:00
caojia d2e4aef122 调整prod配置的文件 2026-09-24 16:23:48 +08:00
caojia bbbadfa246 修复生产:
任务认领现在通过 REQUIRES_NEW 独立提交,确保任务进入线程池前,状态 RUNNING 已对工作线程可见。[实现位置 (line 492)](D:/code/BMS/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/impl/ArBillServiceImpl.java:492) Spring 官方也说明,AFTER_COMMIT 回调中访问数据库时,事务资源仍可能绑定;需要独立事务确保操作提交。Spring 事务说明
工作线程启动时若发现任务已是 CANCEL_REQUESTED,现在会走安全清理,不再直接返回、留下悬挂状态
2026-09-24 16:23:01 +08:00
wuweihua 7e54dbff95 提交配置文件 2026-09-24 15:38:50 +08:00
caojia a9aa77f5ea 修改es配置 2026-09-24 15:17:15 +08:00
luojiaquan ac5249f580 供应商保存报错修改 2026-09-24 14:55:23 +08:00
wuweihua 83864ca40e 删除部署目录 2026-09-24 13:39:19 +08:00
wuweihua f602060ab4 修改文件配置 2026-09-24 11:23:14 +08:00
luojiaquan 252e177495 Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS 2026-09-24 09:26:00 +08:00
luojiaquan cef55c517e 表名修改 2026-09-24 09:25:47 +08:00
wuweihua b2ba4c023e Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS 2026-09-23 17:56:49 +08:00
wuweihua 168ad13396 修改导入功能 2026-09-23 17:56:45 +08:00
caojia 28296fc24f 文案调整 2026-09-23 17:49:35 +08:00
caojia 4c9b20fb5a 文案调整 2026-09-23 17:46:53 +08:00
wuweihua f834dd785b Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS 2026-09-23 16:54:01 +08:00
wuweihua 75bf3223e2 增加退费功能 2026-09-23 16:53:58 +08:00
1501 changed files with 152403 additions and 20066 deletions