|
|
5b81b500f1
|
demand: TMS系统 - 员工提成方案配置 - 启用状态优化
committer: heyu
|
2025-07-28 16:17:22 +08:00 |
|
|
|
20341af8a1
|
demand: TMS系统 - 提成管理 - 新增加二级菜单“销售月评登记”
committer: heyu
|
2025-07-24 14:41:26 +08:00 |
|
|
|
a7bda4b93c
|
demand: 模版导入 是否是短信字段 值没存
committer: heyu
|
2025-07-24 14:19:38 +08:00 |
|
|
|
fcd13b31bb
|
demand: TMS系统- 提成管理 - 新增加二级菜单功能“销售计提比例配置”
committer: heyu
|
2025-07-23 14:48:31 +08:00 |
|
|
|
5641204efe
|
demand: 导入功能 国家、省份、城市、开通oms、启用状态 未保存
committer: heyu
|
2025-07-22 15:22:47 +08:00 |
|
linfso
|
00430ef65e
|
md
|
2025-07-21 17:34:21 +08:00 |
|
linfso
|
fd45a23c20
|
md
|
2025-07-21 16:39:18 +08:00 |
|
linfso
|
fc5122f4d2
|
md
|
2025-07-21 15:58:29 +08:00 |
|
linfso
|
745c4f9670
|
md
|
2025-07-21 15:28:49 +08:00 |
|
|
|
7975dbf3d2
|
demand: 财务中心费用审核无法看到驳回原因bug修复，中心运单查询无法根据多个寄件网点查询bug修复 运单补打印部分模板没有取始发网点bug修复
committer: heyu
|
2025-07-19 16:34:59 +08:00 |
|
|
|
faf538bfd3
|
demand: 寄件运单查询无法根据寄件网点查询bug修复，非总部网点提示无权限bug修复
committer: heyu
|
2025-07-19 10:15:54 +08:00 |
|
|
|
ad0899408f
|
demand: TMS系统 - 寄件运单查询/寄件运单查询新/派件运单查询/中心运单查询 -已停用的月结客户 允许模糊搜索选择，并支持查询相关数据 货物组批次返货虚拟单不允许组批次
committer: heyu
|
2025-07-17 17:43:33 +08:00 |
|
|
|
1bd42c16af
|
demand: tms系统-运单管理-运单录入/修改/网点费用申请-国家与省份要匹配，对应APP端也要修改。
committer: heyu
|
2025-07-17 10:15:20 +08:00 |
|
linfso
|
ae738bf4cc
|
md
|
2025-07-14 19:24:27 +08:00 |
|
|
|
f5eb5d3e9e
|
demand: TMS系统 - 提成管理 - 员工提成方案配置 增加根据日期查询功能 员工提成方案配置新增/修改/批量修改增加验重逻辑
committer: heyu
|
2025-07-14 16:05:28 +08:00 |
|
|
|
50231d1a28
|
demand: TMS系统 - 提成管理 - 员工提成方案配置 新增批量修改员工提成方案，报价维护界面字段“起始国、目的国”新增加字段 非东南亚 ：剔除中国、越南、柬埔寨、缅甸、孟加拉、老挝 以外的国家’
committer: heyu
|
2025-07-14 14:35:25 +08:00 |
|
|
|
0d9f023f8c
|
demand: TMS系统 - 提成管理 - 员工提成方案配置 新增批量修改员工提成方案，报价维护界面字段“起始国、目的国”新增加字段 非东南亚 ：剔除中国、越南、柬埔寨、缅甸、孟加拉、老挝 以外的国家’
committer: heyu
|
2025-07-14 11:15:49 +08:00 |
|
linfso
|
4341a91a90
|
md
|
2025-07-11 08:02:23 +08:00 |
|
linfso
|
c8557290bf
|
compress
|
2025-07-11 04:56:46 +08:00 |
|
linfso
|
2305e25931
|
md
|
2025-07-10 17:39:39 +08:00 |
|
linfso
|
d170abe87d
|
md
|
2025-07-10 17:33:59 +08:00 |
|
linfso
|
88a25f233b
|
md
|
2025-07-10 16:01:18 +08:00 |
|
linfso
|
e551e10a73
|
md
|
2025-07-10 15:48:25 +08:00 |
|
linfso
|
e35023b240
|
md
|
2025-07-10 15:07:58 +08:00 |
|
linfso
|
b99d0a8fa9
|
md
|
2025-07-09 08:16:12 +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
|
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
|
91dbe19641
|
md
|
2025-07-07 15:57:47 +08:00 |
|
heyu
|
0209bd896f
|
Merge pull request 'develop' (#94) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/94
|
2025-07-07 10:30:20 +08:00 |
|
|
|
585c15a803
|
demand: 批量修改批次拼接名称问题修复
committer: heyu
|
2025-07-07 10:27:39 +08:00 |
|
linfso
|
15fbf4d573
|
md
|
2025-07-07 09:40:18 +08:00 |
|
linfso
|
e49b4e960d
|
md
|
2025-07-04 13:50:28 +08:00 |
|
|
|
2d6a2da183
|
demand: 查询网点总部解禁
committer: heyu
|
2025-07-04 13:29:00 +08:00 |
|
|
|
3bfffbb69e
|
demand: 组批次新增/修改添加重复校验 TMS系统-报价管理-干线运输费：报价批量录入
committer: heyu
|
2025-07-03 17:58:57 +08:00 |
|
linfso
|
eaf74a5405
|
md
|
2025-07-03 11:07:19 +08:00 |
|
linfso
|
7928d8fddb
|
md
|
2025-07-01 17:35:05 +08:00 |
|
|
|
ac60b02465
|
demand: 批次规则批量修改bug修改，新增一次性修改批次接口，查询漏组批次增加查询组批次成功条件，查树增加根据始发网点查
committer: heyu
|
2025-07-01 14:33:50 +08:00 |
|
linfso
|
dd45d34815
|
md
|
2025-07-01 07:20:32 +08:00 |
|
linfso
|
c04feab249
|
md
|
2025-07-01 00:38:20 +08:00 |
|
linfso
|
8be6118aad
|
md
|
2025-06-30 22:31:27 +08:00 |
|
linfso
|
1b8f9269d2
|
md
|
2025-06-30 19:39:00 +08:00 |
|
linfso
|
03cb19257d
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-06-30 16:32:58 +08:00 |
|
linfso
|
b19f12d31f
|
md
|
2025-06-30 16:32:49 +08:00 |
|
|
|
9385acb73c
|
demand: 批次规则批量修改，扫描漏组批次过滤线路014
committer: heyu
|
2025-06-30 13:08:16 +08:00 |
|
|
|
2d5da6200d
|
demand: 新增规则增加循环校验，增加校验组树接口
committer: heyu
|
2025-06-30 09:26:06 +08:00 |
|
linfso
|
a3f69bf43a
|
短驳费维护
|
2025-06-29 14:37:32 +08:00 |
|
linfso
|
42c22a9687
|
md
|
2025-06-26 14:26:36 +08:00 |
|
heyu
|
6a2ee17a4d
|
Merge pull request 'develop' (#70) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/70
|
2025-06-25 17:41:33 +08:00 |
|
linfso
|
4379f415f1
|
md
|
2025-06-25 17:16:11 +08:00 |
|
|
|
e2e6b78e5c
|
demand: 新增获取一级网点TMS组批次详细信息接口（一个接口实现）
committer: heyu
|
2025-06-25 14:46:07 +08:00 |
|
|
|
7e1fa091bd
|
demand: 组批次保存、批量录入、修改校验规则
committer: heyu
|
2025-06-25 13:09:05 +08:00 |
|
heyu
|
dab0bbeb29
|
Merge pull request 'demand: 新增筛选网点接口。筛选供应商接口返回nameEn.' (#67) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/67
|
2025-06-25 10:21:20 +08:00 |
|
|
|
c54ef63b78
|
demand: 新增筛选网点接口。筛选供应商接口返回nameEn.
committer: heyu
|
2025-06-25 10:20:43 +08:00 |
|
linfso
|
8323922753
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-06-25 02:58:12 +08:00 |
|
linfso
|
f3d8f4fa57
|
md
|
2025-06-25 02:57:34 +08:00 |
|
|
|
efd3e7f455
|
demand: 批量修改批次接口
committer: heyu
|
2025-06-24 14:32:27 +08:00 |
|
|
|
c80db35415
|
demand: 返货快递不拼接备注。批量导入校验操作员。新增根据规则筛选供应商接口。根据虚拟单筛选总数重算。总部不能作为寄件网点
committer: heyu
|
2025-06-24 11:12:49 +08:00 |
|
|
|
3c4dbf0311
|
demand: TMS-缅甸虚拟单调整
committer: heyu
|
2025-06-21 13:23:18 +08:00 |
|
|
|
c847446e44
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop
|
2025-06-20 15:32:09 +08:00 |
|
linfso
|
f035059a56
|
md
|
2025-06-20 15:01:43 +08:00 |
|
|
|
a1a2253847
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop
# Conflicts:
# emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java
# emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
|
2025-06-20 15:00:18 +08:00 |
|
|
|
44cc39999b
|
demand: TMS-缅甸虚拟单调整
committer: heyu
|
2025-06-20 13:56:56 +08:00 |
|
linfso
|
4a1be66503
|
md
|
2025-06-20 03:41:36 +08:00 |
|
linfso
|
73c49c43e2
|
md
|
2025-06-19 15:49:08 +08:00 |
|
linfso
|
a5c02922fc
|
md
|
2025-06-18 16:11:45 +08:00 |
|
linfso
|
61a9da48fd
|
md
|
2025-06-18 15:51:26 +08:00 |
|
linfso
|
670af37ed4
|
md
|
2025-06-18 11:17:03 +08:00 |
|
|
|
81aa722733
|
demand: TMS-缅甸虚拟单调整
committer: heyu
|
2025-06-18 09:24:05 +08:00 |
|
linfso
|
3abf041168
|
md
|
2025-06-18 08:13:02 +08:00 |
|
linfso
|
674ba8f6fd
|
md
|
2025-06-18 07:18:02 +08:00 |
|
linfso
|
490adc639b
|
md
|
2025-06-17 18:06:55 +08:00 |
|
linfso
|
963af279fe
|
md
|
2025-06-17 17:17:32 +08:00 |
|
linfso
|
0ba3afb5a1
|
md
|
2025-06-17 10:57:37 +08:00 |
|
linfso
|
6ea6433f1a
|
md
|
2025-06-17 09:21:43 +08:00 |
|
linfso
|
0f05e1d72a
|
供应商费用
|
2025-06-17 08:38:36 +08:00 |
|
|
|
97ff62ca74
|
demand: 运单录入界面-缅甸虚拟单调整
committer: heyu
|
2025-06-16 16:19:03 +08:00 |
|
heyu
|
7b0f9689c1
|
Merge pull request 'demand: 批量修改报价增加校验日期交叉逻辑；新增根据批次号扫描组批次状态' (#58) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/58
|
2025-06-13 15:18:58 +08:00 |
|
|
|
8a247ae2a7
|
demand: 批量修改报价增加校验日期交叉逻辑；新增根据批次号扫描组批次状态
committer: heyu
|
2025-06-13 15:18:03 +08:00 |
|
heyu
|
68dbc5f8fb
|
Merge pull request 'demand: 定时扫描运单货物组批次支持按线路扫描，查询漏组批次列表支持按运单寄件日期查' (#55) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/55
|
2025-06-12 14:21:13 +08:00 |
|
|
|
26cb46e443
|
demand: 定时扫描运单货物组批次支持按线路扫描，查询漏组批次列表支持按运单寄件日期查
committer: heyu
|
2025-06-12 14:19:58 +08:00 |
|
heyu
|
44211a8f61
|
Merge pull request 'demand: 批量导入线路规则bug修改' (#54) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/54
|
2025-06-12 11:44:47 +08:00 |
|
|
|
aade7c0bf0
|
demand: 批量导入线路规则bug修改
committer: heyu
|
2025-06-12 11:44:19 +08:00 |
|
heyu
|
4868f7bace
|
Merge pull request 'develop' (#52) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/52
|
2025-06-12 10:33:58 +08:00 |
|
|
|
7dfc212251
|
demand: 对接外部更新/查询运单接口，对接外部导出进仓单、查询物流轨迹接口
committer: heyu
|
2025-06-12 10:33:19 +08:00 |
|
|
|
0ece5214b8
|
demand: 对接外部更新/查询运单接口，对接外部导出进仓单、查询物流轨迹接口
committer: heyu
|
2025-06-12 10:30:09 +08:00 |
|
linfso
|
ee672af586
|
md
|
2025-06-12 05:54:10 +08:00 |
|
linfso
|
ca29db1e26
|
md
|
2025-06-12 05:40:39 +08:00 |
|
heyu
|
23e050fd44
|
Merge pull request 'demand: 线路规则、漏组批次相关逻辑调整' (#50) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/50
|
2025-06-11 16:09:52 +08:00 |
|
|
|
b5d9c982e3
|
demand: 线路规则、漏组批次相关逻辑调整
committer: heyu
|
2025-06-11 16:09:09 +08:00 |
|
linfso
|
15aeaa5f51
|
md
|
2025-06-09 22:15:12 +08:00 |
|
linfso
|
eac599fe8b
|
md
|
2025-06-09 17:27:17 +08:00 |
|
|
|
a8b429a777
|
demand:1.新增客户秘钥管理界面增删改查接口 2.新增客户对接tms下单接口
committer: heyu
|
2025-06-07 17:10:34 +08:00 |
|
|
|
4b9764efa0
|
demand:1.新增客户秘钥管理界面增删改查接口 2.新增客户对接tms下单接口
committer: heyu
|
2025-06-07 17:03:14 +08:00 |
|
|
|
ec274798ed
|
demand:报价管理页面新增批量修改报价接口
committer: heyu
|
2025-05-27 16:55:59 +08:00 |
|
|
|
c36991ea41
|
demand: 保留原sql重起一个sql
committer: heyu
|
2025-05-26 15:34:00 +08:00 |
|
|
|
d5404feec8
|
demand: 航线开票记录查询、导出、定制导出性能优化
committer: heyu
|
2025-05-23 14:41:19 +08:00 |
|
smshen
|
711f504386
|
Merge pull request 'master' (#29) from master into develop
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/29
|
2025-05-21 11:36:07 +08:00 |
|
