cdfc90556d
隐藏修改计费重
2026-10-27 17:51:40 +08:00
dfa90d6e33
Merge branch 'master' of D:\wuweihua\BMS with conflicts.
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.
2026-10-27 16:24:36 +08:00
b55f0010ed
新增订单状态字段并调整提货时间字段，更新相关导出和展示逻辑
2026-10-27 16:23:02 +08:00
4067bfc277
✨ 客户余额页增加只读账单弹窗
2026-10-27 16:19:44 +08:00
fe30345045
Revert " ✨ 应收账单接入角色数据权限并同步在线缓存"
...
This reverts commit 4659c63ef9
2026-10-27 15:32:26 +08:00
4d4065b9e9
更新计费失败状态，新增销售价和产品价未匹配的错误信息，调整相关代码逻辑以支持新的状态处理。
2026-10-27 15:24:16 +08:00
0ba975656b
客户和供应商新增合同时间
2026-10-27 13:50:54 +08:00
65d382d256
Merge remote-tracking branch 'origin/test' into test
2026-10-27 13:36:11 +08:00
7fcd3b6089
计费列表增加状态搜索
2026-10-27 13:28:14 +08:00
7e53b41a3c
新增供应商类型配置
2026-10-27 11:40:22 +08:00
4659c63ef9
✨ 应收账单接入角色数据权限并同步在线缓存
2026-10-27 11:32:26 +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.
2026-10-27 10:31:58 +08:00
f3fa3e1396
修改前端同步报错
2026-10-27 10:30:15 +08:00
7496f8cbc6
Merge branch 'test'
2026-10-27 10:21:57 +08:00
be0b067516
乱码注释调整
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.
2026-10-27 01:10:31 +08:00
f80af4a2f6
修改订单列表重新计费
2026-10-27 01:08:44 +08:00
b79cd6f995
Merge branch 'master' of D:\wuweihua\BMS with conflicts.
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.
2026-10-27 00:16:40 +08:00
7924450b89
修改同步落库
2026-10-27 00:04:21 +08:00
2bae431e74
优化落库功能
2026-10-26 23:23:22 +08:00
2b5633190e
Merge branch 'test'
2026-10-26 18:01:23 +08:00
8fba64e2d6
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test
2026-10-26 17:59:46 +08:00
7e175808bf
去掉退费校验
2026-10-26 17:59:35 +08:00
74762c8043
调整权限
2026-10-26 17:59:34 +08:00
77dfb4291b
Merge remote-tracking branch 'origin/test'
2026-10-26 17:13:44 +08:00
d71b7f04fe
Merge branch 'test'
2026-10-26 17:09:01 +08:00
bdce5e3086
优化数据源导出
2026-10-26 16:59:01 +08:00
2ed0e0c77d
🐛 修复用户管理组织机构筛选 deptId 滞后
2026-10-26 16:57:10 +08:00
f8ae347846
Merge branch 'test'
2026-10-26 16:39:11 +08:00
b3374fa44c
更新文档
2026-10-26 16:22:14 +08:00
76cc5b5781
增加导出功能
2026-10-26 16:20:46 +08:00
7f4fc3df8c
优化比对
2026-10-26 16:03:12 +08:00
wuweihua
94991a1ed3
Merge pull request '修改操作文档' ( #1 ) from test into master
...
Reviewed-on: #1
2026-10-26 15:23:59 +08:00
209d545d5b
修改操作文档
2026-10-26 15:21:52 +08:00
90a0194a99
新增操作文档
2026-10-26 14:21:29 +08:00
ab6216922a
订单比对加上状态
2026-10-26 11:59:19 +08:00
4bee108661
去掉三边之和规则
2026-10-23 17:49:52 +08:00
2bb562372e
修改计费规则
2026-10-23 17:43:07 +08:00
55b5ed8951
改动在 OracleOrderBillMapper.toBillRequest，同步计费 / 计费任务走上游行时都会生效。本地「重新计费」仍用订单表已存的计费重，不会再回上游取
2026-10-23 17:38:22 +08:00
48d938c4f7
支持按提货时间重新计费
2026-10-23 17:36:03 +08:00
dac0c0f252
Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS
2026-10-23 15:57:15 +08:00
de34cad95d
无用字段注释
2026-10-23 15:57:09 +08:00
d46d1596e8
处理同步退费逻辑
2026-10-23 14:00:53 +08:00
84939a8875
订单增加状态搜索
2026-10-23 13:47:41 +08:00
fcebf9282c
优化添加附加费
2026-10-23 11:02:24 +08:00
fc94a15f76
✨ 单号筛选改为多行输入并限制1000个
2026-10-23 10:06:59 +08:00
4ec28de073
增加订单复选搜索
2026-10-22 17:40:57 +08:00
23236ec141
导入提示报错
2026-10-22 15:57:08 +08:00
wuweihua
wuweihua