Commit Graph

  • cbed4dc2a3 Merge branch 'test' caojia 2026-10-28 09:28:14 +08:00
  • acfdfd5cbf ✨ 客户列表增加账单入口和权限 caojia 2026-10-27 20:27:06 +08:00
  • d66b96b2ff Merge branch 'test' caojia 2026-10-27 18:25:18 +08:00
  • cdfc90556d 隐藏修改计费重 wuweihua 2026-10-27 17:51:40 +08:00
  • db787ec7f7 ✨ 客户账单弹窗增加汇总和导出 caojia 2026-10-27 17:21:12 +08:00
  • b4e696b27c ✨ 应收账单列表增加筛选导出 caojia 2026-10-27 17:04:22 +08:00
  • 4238c31d9d 增加反核销按钮 caojia 2026-10-27 16:47:08 +08:00
  • dfa90d6e33 Merge branch 'master' of D:\wuweihua\BMS with conflicts. wuweihua 2026-10-27 16:25:11 +08:00
  • 4a34075022 Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. wuweihua 2026-10-27 16:24:36 +08:00
  • b55f0010ed 新增订单状态字段并调整提货时间字段,更新相关导出和展示逻辑 wuweihua 2026-10-27 16:23:02 +08:00
  • 4067bfc277 ✨ 客户余额页增加只读账单弹窗 caojia 2026-10-27 16:19:44 +08:00
  • fe30345045 Revert "✨ 应收账单接入角色数据权限并同步在线缓存" caojia 2026-10-27 15:28:52 +08:00
  • 4d4065b9e9 更新计费失败状态,新增销售价和产品价未匹配的错误信息,调整相关代码逻辑以支持新的状态处理。 wuweihua 2026-10-27 15:24:16 +08:00
  • 0ba975656b 客户和供应商新增合同时间 liuminghui 2026-10-27 13:50:54 +08:00
  • 65d382d256 Merge remote-tracking branch 'origin/test' into test liuminghui 2026-10-27 13:36:11 +08:00
  • 7fcd3b6089 计费列表增加状态搜索 wuweihua 2026-10-27 13:28:14 +08:00
  • 7e53b41a3c 新增供应商类型配置 liuminghui 2026-10-27 11:40:22 +08:00
  • 4659c63ef9 ✨ 应收账单接入角色数据权限并同步在线缓存 caojia 2026-10-27 11:29:24 +08:00
  • 6a03300f2f Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. wuweihua 2026-10-27 10:31:58 +08:00
  • f3fa3e1396 修改前端同步报错 wuweihua 2026-10-27 10:30:15 +08:00
  • 7496f8cbc6 Merge branch 'test' liuminghui 2026-10-27 10:21:57 +08:00
  • be0b067516 乱码注释调整 liuminghui 2026-10-27 10:17:53 +08:00
  • 2f2305825a Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. wuweihua 2026-10-27 01:10:31 +08:00
  • f80af4a2f6 修改订单列表重新计费 wuweihua 2026-10-27 01:08:44 +08:00
  • b79cd6f995 Merge branch 'master' of D:\wuweihua\BMS with conflicts. wuweihua 2026-10-27 00:17:37 +08:00
  • 70a3c34c20 Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. wuweihua 2026-10-27 00:16:40 +08:00
  • 7924450b89 修改同步落库 wuweihua 2026-10-27 00:04:21 +08:00
  • 2bae431e74 优化落库功能 wuweihua 2026-10-26 23:23:22 +08:00
  • 2b5633190e Merge branch 'test' caojia 2026-10-26 18:01:23 +08:00
  • 8fba64e2d6 Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test wuweihua 2026-10-26 17:59:46 +08:00
  • 7e175808bf 去掉退费校验 wuweihua 2026-10-26 17:59:35 +08:00
  • 74762c8043 调整权限 caojia 2026-10-26 17:59:19 +08:00
  • 77dfb4291b Merge remote-tracking branch 'origin/test' wuweihua 2026-10-26 17:13:44 +08:00
  • d71b7f04fe Merge branch 'test' caojia 2026-10-26 17:09:01 +08:00
  • bdce5e3086 优化数据源导出 wuweihua 2026-10-26 16:59:01 +08:00
  • 2ed0e0c77d 🐛 修复用户管理组织机构筛选 deptId 滞后 caojia 2026-10-26 16:57:10 +08:00
  • f8ae347846 Merge branch 'test' caojia 2026-10-26 16:39:11 +08:00
  • b3374fa44c 更新文档 caojia 2026-10-26 16:21:10 +08:00
  • 76cc5b5781 增加导出功能 wuweihua 2026-10-26 16:20:46 +08:00
  • 7f4fc3df8c 优化比对 wuweihua 2026-10-26 16:03:12 +08:00
  • 94991a1ed3 Merge pull request '修改操作文档' (#1) from test into master wuweihua 2026-10-26 15:23:59 +08:00
  • 209d545d5b 修改操作文档 wuweihua 2026-10-26 15:21:52 +08:00
  • 90a0194a99 新增操作文档 wuweihua 2026-10-26 14:21:29 +08:00
  • ab6216922a 订单比对加上状态 wuweihua 2026-10-26 11:59:19 +08:00
  • 4bee108661 去掉三边之和规则 wuweihua 2026-10-23 17:49:52 +08:00
  • 2bb562372e 修改计费规则 wuweihua 2026-10-23 17:43:07 +08:00
  • 55b5ed8951 改动在 OracleOrderBillMapper.toBillRequest,同步计费 / 计费任务走上游行时都会生效。本地「重新计费」仍用订单表已存的计费重,不会再回上游取 wuweihua 2026-10-23 17:38:22 +08:00
  • 48d938c4f7 支持按提货时间重新计费 wuweihua 2026-10-23 17:36:03 +08:00
  • dac0c0f252 Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS luojiaquan 2026-10-23 15:57:15 +08:00
  • de34cad95d 无用字段注释 luojiaquan 2026-10-23 15:57:09 +08:00
  • d46d1596e8 处理同步退费逻辑 wuweihua 2026-10-23 14:00:53 +08:00
  • 84939a8875 订单增加状态搜索 wuweihua 2026-10-23 13:47:41 +08:00
  • fcebf9282c 优化添加附加费 wuweihua 2026-10-23 11:02:24 +08:00
  • fc94a15f76 ✨ 单号筛选改为多行输入并限制1000个 caojia 2026-10-23 10:06:59 +08:00
  • 4ec28de073 增加订单复选搜索 wuweihua 2026-10-22 17:40:57 +08:00
  • 23236ec141 导入提示报错 wuweihua 2026-10-22 15:57:08 +08:00
  • d010783c97 Merge branch 'master' of https://git.lionquexpress.com/wuweihua/BMS wuweihua 2026-10-22 14:46:57 +08:00
  • f07386f4aa 增加模版 wuweihua 2026-10-22 14:46:52 +08:00
  • 6fb0ba3edc 客户管理附件oss上传 luojiaquan 2026-10-22 11:50:32 +08:00
  • c064d925ca 增加上传附件到oss wuweihua 2026-10-22 10:45:50 +08:00
  • 92000956fc 增加导出功能 wuweihua 2026-10-21 18:06:21 +08:00
  • c04191c316 🐛 修复账单导出数值精度显示 caojia 2026-10-21 14:57:33 +08:00
  • b8e2a8e31a 增加套餐产品红线价修改内容日志 wuweihua 2026-10-21 15:08:13 +08:00
  • 1e8a449dda 优化套餐编辑逻辑 wuweihua 2026-10-21 14:51:44 +08:00
  • 26a3285571 🐛 修复账单导出运单号格式和列宽 caojia 2026-10-21 14:18:27 +08:00
  • 9e61f7f55c 调整模板比例为70% caojia 2026-10-21 13:50:03 +08:00
  • a4440d7932 修改订单数据源的产品检测 wuweihua 2026-10-21 11:42:08 +08:00
  • 35f1048190 删除productCountryId wuweihua 2026-10-21 11:36:25 +08:00
  • 8f1cf5c755 修改比对规则 wuweihua 2026-10-21 11:01:59 +08:00
  • 36837f94bf 失败记录日志 wuweihua 2026-10-21 10:45:04 +08:00
  • dd2efef456 修改死锁 wuweihua 2026-10-21 10:34:45 +08:00
  • d7f7ebd981 订单列表重新计费优化 wuweihua 2026-10-21 10:13:01 +08:00
  • be3856a59c 自动脚本计费 wuweihua 2026-10-21 09:44:54 +08:00
  • 501056bb17 🐛 修复账单截止日当天数据漏查 caojia 2026-10-21 09:23:59 +08:00
  • c30c88bbe8 修改已出账单,状态没落库 wuweihua 2026-10-21 09:13:50 +08:00
  • dba75c3a77 ✨ 汇总前新增明细纳入应收合计 caojia 2026-10-20 20:32:24 +08:00
  • e41c7b072f ✨ 应收账单导出金额公式动态化 caojia 2026-10-20 20:09:39 +08:00
  • 2d5a2c4bab 修改计费重去掉客户 wuweihua 2026-10-20 18:48:46 +08:00
  • 66d95a0da9 更改产品获取数据 wuweihua 2026-10-20 18:43:33 +08:00
  • 7655713319 修改生效时间 wuweihua 2026-10-20 18:05:18 +08:00
  • eca8855b8d 修改对外代码查询 wuweihua 2026-10-20 16:20:57 +08:00
  • acf4757144 🐛 修复账单预览翻页重置手动选择模式 caojia 2026-10-20 15:38:43 +08:00
  • 7063dc7218 ✨ 优化生成应收账单订单表格 caojia 2026-10-20 15:29:36 +08:00
  • 9166220579 ✨ 支持生成账单列表拖选复制单列文字 caojia 2026-10-20 15:25:15 +08:00
  • b772c95813 ✨ 支持按单号批量排除账单订单 caojia 2026-10-20 15:11:27 +08:00
  • 29e804dae2 修改前端同步逻辑 wuweihua 2026-10-20 14:03:37 +08:00
  • 45969a4d29 订单数据源增加订单对比功能 wuweihua 2026-10-20 13:55:55 +08:00
  • 8093cb52e7 订单数据源数据速度优化 luojiaquan 2026-10-20 10:14:38 +08:00
  • 58d7ec90b0 提高订单源的查询速度 wuweihua 2026-10-19 17:44:19 +08:00
  • 383ef55e00 ✨ 完善核销用户记录和毛利报表导出日志 caojia 2026-10-19 16:43:14 +08:00
  • a754e8dcc6 Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS luojiaquan 2026-10-19 16:03:36 +08:00
  • 1ae97cd622 客户余额按钮加权限控制 luojiaquan 2026-10-19 16:03:30 +08:00
  • 1986a901d9 ✨ 补充应收账单用户ID记录及迁移脚本 caojia 2026-10-19 15:51:47 +08:00
  • 5bb9000e8e 修改套餐报错 wuweihua 2026-10-19 15:34:04 +08:00
  • df1a2fd731 修改订单搜索 wuweihua 2026-10-19 15:19:06 +08:00
  • b945c9f37b Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS luojiaquan 2026-10-19 12:01:08 +08:00
  • 6b570f948c 修改客户管理权限控制,按user_id控制 luojiaquan 2026-10-19 12:00:56 +08:00
  • 374c8b8bbb 增加套餐绑定用户功能 wuweihua 2026-10-19 11:59:44 +08:00
  • 69852907f3 修改列表 wuweihua 2026-10-19 10:03:13 +08:00
  • 92fc2f1ad0 修改TMS用户同步只增量同步用户数据 luojiaquan 2026-10-19 09:59:01 +08:00