|
|
bfa34ed61c
|
demand: TMS系统 - 提成管理 - 员工提成方案配置界面优化
committer: heyu
|
2025-07-18 16:40:58 +08:00 |
|
|
|
ad0899408f
|
demand: TMS系统 - 寄件运单查询/寄件运单查询新/派件运单查询/中心运单查询 -已停用的月结客户 允许模糊搜索选择，并支持查询相关数据 货物组批次返货虚拟单不允许组批次
committer: heyu
|
2025-07-17 17:43:33 +08:00 |
|
|
|
0caaa38f71
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop
|
2025-07-15 19:17:33 +08:00 |
|
|
|
06ea898d8a
|
demand: 运单录入/运单修改/运单批量录入/网点费用申请：目的国、产品信息、寄件国家地区信息需要和起始网点一致, 报价计算逻辑改为根据始发网点计算
committer: heyu
|
2025-07-15 19:15:25 +08:00 |
|
heyu
|
1a9adcc5c8
|
Merge pull request 'demand: 运单录入/运单修改/运单批量录入/网点费用申请：目的国、产品信息、寄件国家地区信息需要和起始网点一致, 报价计算逻辑改为根据始发网点计算' (#120) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/120
|
2025-07-15 16:08:36 +08:00 |
|
|
|
9cca3c8345
|
demand: 运单录入/运单修改/运单批量录入/网点费用申请：目的国、产品信息、寄件国家地区信息需要和起始网点一致, 报价计算逻辑改为根据始发网点计算
committer: heyu
|
2025-07-15 15:00:18 +08:00 |
|
linfso
|
9db6240eb1
|
md
|
2025-07-14 19:35:57 +08:00 |
|
linfso
|
191a2ee40d
|
md
|
2025-07-14 19:34:46 +08:00 |
|
linfso
|
ae738bf4cc
|
md
|
2025-07-14 19:24:27 +08:00 |
|
linfso
|
f1b77c5f4d
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-07-14 18:56:31 +08:00 |
|
linfso
|
a57eb921d4
|
md
|
2025-07-14 18:56:22 +08:00 |
|
|
|
a011fcc767
|
demand: TMS系统 - 提成管理 - 员工提成方案配置 增加根据日期查询功能 员工提成方案配置新增/修改/批量修改增加验重逻辑
committer: heyu
|
2025-07-14 17:14:53 +08:00 |
|
|
|
f5eb5d3e9e
|
demand: TMS系统 - 提成管理 - 员工提成方案配置 增加根据日期查询功能 员工提成方案配置新增/修改/批量修改增加验重逻辑
committer: heyu
|
2025-07-14 16:05:28 +08:00 |
|
|
|
0d9f023f8c
|
demand: TMS系统 - 提成管理 - 员工提成方案配置 新增批量修改员工提成方案，报价维护界面字段“起始国、目的国”新增加字段 非东南亚 ：剔除中国、越南、柬埔寨、缅甸、孟加拉、老挝 以外的国家’
committer: heyu
|
2025-07-14 11:15:49 +08:00 |
|
|
|
86569422ae
|
demand: 运单提成明细重算员工提成无法根据线路选择合适的提成规则计算bug修复
committer: heyu
|
2025-07-11 15:21:35 +08:00 |
|
heyu
|
b800e7f1c9
|
Merge pull request 'demand: 运单修改取件方式会导致寄件网点不准确bug修复' (#115) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/115
|
2025-07-11 14:14:26 +08:00 |
|
|
|
e46dc56bff
|
demand: 运单修改取件方式会导致寄件网点不准确bug修复
committer: heyu
|
2025-07-11 14:13:51 +08:00 |
|
heyu
|
97b4857526
|
Merge pull request 'demand: 扫描漏组批次supplierCode线程安全问题修复' (#114) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/114
|
2025-07-11 10:33:40 +08:00 |
|
|
|
dce675e149
|
demand: 扫描漏组批次supplierCode线程安全问题修复
committer: heyu
|
2025-07-11 10:24:26 +08:00 |
|
linfso
|
8ce28d94a3
|
md
|
2025-07-11 10:15:46 +08:00 |
|
linfso
|
4ff754cfaf
|
md
|
2025-07-11 09:34:31 +08:00 |
|
|
|
cbf8f70fa9
|
demand: 扫描漏组批次supplierCode线程安全问题修复
committer: heyu
|
2025-07-11 09:01:08 +08:00 |
|
linfso
|
49d091c555
|
md
|
2025-07-11 07:14:48 +08:00 |
|
linfso
|
d10a99cbe8
|
md
|
2025-07-11 06:29:15 +08:00 |
|
linfso
|
31ab5dce13
|
add tms_site_batch total_settlement_weight
|
2025-07-11 05:45:29 +08:00 |
|
|
|
cd8521afad
|
demand:
（1）查询条件：漏组次数 新增加类型“其他异常” 用于排查现有漏组次数条件以外的运单号 TMS系统 - 漏组批次订单 - 数据显示栏“目的网点”字段取值错误，目前取值取得是目的地，应该取值 录单表 目的网点
committer: heyu
|
2025-07-10 15:08:24 +08:00 |
|
linfso
|
e35023b240
|
md
|
2025-07-10 15:07:58 +08:00 |
|
linfso
|
1a84f5a610
|
md
|
2025-07-10 12:03:07 +08:00 |
|
|
|
c476bd6060
|
demand: 组批次添加操作监控，批量扫描漏组批次改为硬删除
committer: heyu
|
2025-07-10 12:00:57 +08:00 |
|
linfso
|
547f1be88f
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-07-10 11:44:01 +08:00 |
|
linfso
|
9c5cf0f98d
|
md
|
2025-07-10 11:43:51 +08:00 |
|
|
|
5a7febde47
|
demand: 新增组批次成功运单过滤重复运单，查询漏组批次运单过滤出口虚拟单的主单
committer: heyu
|
2025-07-10 10:48:25 +08:00 |
|
|
|
07781bd360
|
demand: 新增组批次成功运单过滤重复运单，查询漏组批次运单过滤出口虚拟单的主单
committer: heyu
|
2025-07-10 09:01:59 +08:00 |
|
|
|
059b0640b8
|
demand: 组批次添加操作监控，批量扫描漏组批次改为硬删除
committer: heyu
|
2025-07-09 17:00:46 +08:00 |
|
linfso
|
1166db3c8c
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-07-09 16:28:08 +08:00 |
|
linfso
|
62ccace14c
|
md
|
2025-07-09 16:28:03 +08:00 |
|
|
|
82b33097f2
|
demand: 查询组批次完成添加去重
committer: heyu
|
2025-07-09 15:58:45 +08:00 |
|
heyu
|
ee2ecd2339
|
Merge pull request 'demand: 定时扫描漏组批次从未组批次运单统计不准确的问题' (#104) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/104
|
2025-07-09 09:33:41 +08:00 |
|
|
|
0b6f9aa1ed
|
demand: 定时扫描漏组批次从未组批次运单统计不准确的问题
committer: heyu
|
2025-07-09 09:32:29 +08:00 |
|
linfso
|
6cca8e2495
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-07-09 08:16:20 +08:00 |
|
linfso
|
b99d0a8fa9
|
md
|
2025-07-09 08:16:12 +08:00 |
|
heyu
|
2df63b217e
|
Merge pull request 'demand: 费用币种校验只能为CNY/USD' (#103) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/103
|
2025-07-08 18:08:11 +08:00 |
|
|
|
aba30b7d9b
|
demand: 费用币种校验只能为CNY/USD
committer: heyu
|
2025-07-08 18:07:39 +08:00 |
|
heyu
|
15db89cf76
|
Merge pull request 'demand: 查询漏组批次查询组批次完成时各网点只能查询自己网点的运单 供应商线路规划新增/修改/批量新增/批量修改去除死循环相关的校验' (#102) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/102
|
2025-07-08 16:38:02 +08:00 |
|
|
|
08fffb5592
|
demand: 查询漏组批次查询组批次完成时各网点只能查询自己网点的运单 供应商线路规划新增/修改/批量新增/批量修改去除死循环相关的校验
committer: heyu
|
2025-07-08 16:36:52 +08:00 |
|
heyu
|
361504a273
|
Merge pull request 'demand: TMS系统-大客户管理-大客户单独报价-报价批量录入 漏组批次订单查询各网点能查询到自己网点相关的漏组信息' (#101) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/101
|
2025-07-08 14:23:20 +08:00 |
|
|
|
d8d7f98e6d
|
demand: TMS系统-大客户管理-大客户单独报价-报价批量录入 漏组批次订单查询各网点能查询到自己网点相关的漏组信息
committer: heyu
|
2025-07-08 14:22:45 +08:00 |
|
linfso
|
cda08fc8e8
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-07-08 14:21:02 +08:00 |
|
linfso
|
c0949346f4
|
md
|
2025-07-08 14:20:50 +08:00 |
|
heyu
|
792e71302b
|
Merge pull request 'demand: 大客户单独报价修改bug修改' (#100) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/100
|
2025-07-08 12:01:03 +08:00 |
|
|
|
86fa4d99b5
|
demand: 大客户单独报价修改bug修改
committer: heyu
|
2025-07-08 12:00:29 +08:00 |
|
linfso
|
e5c2f68687
|
md
|
2025-07-08 10:30:53 +08:00 |
|
linfso
|
876003afd9
|
md
|
2025-07-08 10:20:38 +08:00 |
|
linfso
|
5c8b1029e1
|
md
|
2025-07-08 10:18:23 +08:00 |
|
linfso
|
e9475b8484
|
md
|
2025-07-08 10:06:02 +08:00 |
|
linfso
|
da93b548e3
|
md
|
2025-07-08 09:56:17 +08:00 |
|
linfso
|
ec8f714858
|
md
|
2025-07-08 09:51:41 +08:00 |
|
linfso
|
eb5f85960e
|
md
|
2025-07-08 04:45:23 +08:00 |
|
heyu
|
aadb49af24
|
Merge pull request 'demand: 修改虚拟单后对应主单对应虚拟单备注消失bug修复' (#98) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/98
|
2025-07-07 16:13:10 +08:00 |
|
|
|
3c206a2ee7
|
demand: 修改虚拟单后对应主单对应虚拟单备注消失bug修复
committer: heyu
|
2025-07-07 16:12:40 +08:00 |
|
linfso
|
404c4b1e04
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-07-07 15:57:54 +08:00 |
|
linfso
|
91dbe19641
|
md
|
2025-07-07 15:57:47 +08:00 |
|
heyu
|
d843be726d
|
Merge pull request 'demand: 组批次规则图查询添加去重逻辑' (#97) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/97
|
2025-07-07 15:30:52 +08:00 |
|
|
|
90628ece0e
|
demand: 组批次规则图查询添加去重逻辑
committer: heyu
|
2025-07-07 15:29:58 +08:00 |
|
linfso
|
2cdf5f5340
|
md
|
2025-07-07 14:57:15 +08:00 |
|
linfso
|
632d105de1
|
md
|
2025-07-07 14:48:16 +08:00 |
|
heyu
|
b9c95f5d0a
|
Merge pull request 'develop' (#96) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/96
|
2025-07-05 17:19:10 +08:00 |
|
|
|
74f4bd80ba
|
demand: 组树接口市场部-分拨中心可互换
committer: heyu
|
2025-07-05 17:18:09 +08:00 |
|
linfso
|
db29669089
|
md
|
2025-07-05 15:33:55 +08:00 |
|
|
|
4acd952916
|
demand: 虚拟单主单A换主单B，虚拟单、主单B、主单A都需要更新绑定关系。 报价时间交叉验证逻辑bug修复
committer: heyu
|
2025-07-05 13:19:43 +08:00 |
|
|
|
0bc471ab23
|
demand: 组批次规则新增/导入/修改/批量修改校验时间是否交叉。 批量修改报价验重去除自身
committer: heyu
|
2025-07-04 18:09:20 +08:00 |
|
linfso
|
504f2718ac
|
md
|
2025-07-04 15:38:30 +08:00 |
|
linfso
|
f6d0b2fada
|
md
|
2025-07-04 15:20:11 +08:00 |
|
linfso
|
cc4040bf06
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-07-04 15:09:16 +08:00 |
|
linfso
|
27a02301c5
|
md
|
2025-07-04 15:09:10 +08:00 |
|
heyu
|
a7de130dc3
|
Merge pull request 'demand: 报价录入重复校验逻辑调整' (#92) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/92
|
2025-07-04 15:02:51 +08:00 |
|
|
|
9cb82154d9
|
demand: 报价录入重复校验逻辑调整
committer: heyu
|
2025-07-04 15:02:04 +08:00 |
|
linfso
|
a573ff1f9e
|
md
|
2025-07-04 14:55:22 +08:00 |
|
linfso
|
f7f6be2e6d
|
md
|
2025-07-04 14:10:04 +08:00 |
|
linfso
|
e0dc07848c
|
md
|
2025-07-04 13:51:46 +08:00 |
|
linfso
|
6c90a56582
|
md
|
2025-07-04 13:45:15 +08:00 |
|
heyu
|
3aa79c8f36
|
Merge pull request 'demand: 网点费用申请新增添加登记网点、登记人' (#91) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/91
|
2025-07-04 13:39:30 +08:00 |
|
|
|
a9053dd41c
|
demand: 网点费用申请新增添加登记网点、登记人
committer: heyu
|
2025-07-04 13:39:09 +08:00 |
|
linfso
|
7718fd3bab
|
md
|
2025-07-04 13:18:17 +08:00 |
|
linfso
|
a2f8e979d4
|
md
|
2025-07-04 13:16:44 +08:00 |
|
linfso
|
337b80807f
|
md
|
2025-07-04 13:03:46 +08:00 |
|
linfso
|
9803b59532
|
md
|
2025-07-04 12:45:40 +08:00 |
|
linfso
|
e7e28a440f
|
md
|
2025-07-04 11:41:23 +08:00 |
|
linfso
|
42979545fe
|
md
|
2025-07-04 10:22:18 +08:00 |
|
linfso
|
e841fc04c9
|
md
|
2025-07-04 10:03:56 +08:00 |
|
linfso
|
e38ed9da62
|
md
|
2025-07-04 09:34:57 +08:00 |
|
linfso
|
fe60f49f68
|
md
|
2025-07-04 09:31:56 +08:00 |
|
linfso
|
93c12a6e72
|
md
|
2025-07-04 08:23:38 +08:00 |
|
linfso
|
bd558537cb
|
md
|
2025-07-04 08:18:25 +08:00 |
|
linfso
|
296370f77c
|
md
|
2025-07-04 08:08:02 +08:00 |
|
linfso
|
ab1a1ef906
|
md
|
2025-07-04 07:48:25 +08:00 |
|
linfso
|
f5fed5bc9f
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-07-04 07:35:55 +08:00 |
|
linfso
|
3befe5635e
|
md
|
2025-07-04 07:35:46 +08:00 |
|
linfso
|
0dcc5fbb81
|
md
|
2025-07-04 07:30:03 +08:00 |
|
heyu
|
c33d6e6459
|
Merge pull request 'develop' (#89) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/89
|
2025-07-03 17:59:48 +08:00 |
|
