linfso
|
676398989c
|
md
|
2025-07-03 12:43:11 +08:00 |
|
linfso
|
4d02c794e2
|
md
|
2025-07-03 11:58:12 +08:00 |
|
linfso
|
904f43177f
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-07-03 11:31:59 +08:00 |
|
linfso
|
dc1a9442a3
|
md
|
2025-07-03 11:31:51 +08:00 |
|
|
|
c47956c5da
|
demand: 查询组批次供应商名称取值问题修复 查询漏组批次效率优化
committer: heyu
|
2025-07-03 11:24:09 +08:00 |
|
linfso
|
88887af375
|
md
|
2025-07-03 10:56:18 +08:00 |
|
linfso
|
c77191b2f8
|
md
|
2025-07-03 01:46:55 +08:00 |
|
|
|
174620b8a1
|
demand: 组树添加南京分拨中心、柯桥分拨中心
committer: heyu
|
2025-07-02 19:52:44 +08:00 |
|
linfso
|
5c4a513c10
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-07-02 15:03:27 +08:00 |
|
linfso
|
cf5104be89
|
md
|
2025-07-02 15:03:18 +08:00 |
|
|
|
602ff5a685
|
demand: 组树添加南京分拨中心、柯桥分拨中心
committer: heyu
|
2025-07-02 14:41:47 +08:00 |
|
linfso
|
c6a40b0295
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-07-02 14:40:45 +08:00 |
|
linfso
|
cc4a42b405
|
md
|
2025-07-02 14:40:39 +08:00 |
|
|
|
3480cf0de2
|
demand: 批量修改报重精确指出重复信息
committer: heyu
|
2025-07-02 13:50:29 +08:00 |
|
|
|
39800dac0c
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop
|
2025-07-02 13:50:14 +08:00 |
|
linfso
|
e221e0593d
|
md
|
2025-07-02 13:36:38 +08:00 |
|
linfso
|
7ce7b3885f
|
md
|
2025-07-02 13:19:51 +08:00 |
|
linfso
|
4f1dbcf3c4
|
md
|
2025-07-02 12:51:23 +08:00 |
|
linfso
|
e627d5dcb0
|
md
|
2025-07-02 12:44:04 +08:00 |
|
linfso
|
20fa4aae66
|
md
|
2025-07-02 12:39:01 +08:00 |
|
linfso
|
86b5b368dd
|
md
|
2025-07-02 12:05:30 +08:00 |
|
linfso
|
8dc9c4146a
|
md
|
2025-07-02 11:22:13 +08:00 |
|
linfso
|
e81f3f7ea9
|
md
|
2025-07-02 11:14:22 +08:00 |
|
linfso
|
7ade873106
|
md
|
2025-07-02 11:08:54 +08:00 |
|
linfso
|
02ffff907f
|
md
|
2025-07-02 11:07:36 +08:00 |
|
linfso
|
66d6ae20af
|
md
|
2025-07-02 10:58:38 +08:00 |
|
|
|
047bba7d4a
|
demand: 漏组批次扫描寄件网点为无锡、柯桥、南京时多个网点可互换
committer: heyu
|
2025-07-02 10:29:19 +08:00 |
|
linfso
|
aea06188e6
|
md
|
2025-07-02 07:45:06 +08:00 |
|
linfso
|
774bd9be32
|
md
|
2025-07-02 07:27:16 +08:00 |
|
linfso
|
402f38fee0
|
md
|
2025-07-02 07:09:20 +08:00 |
|
linfso
|
52111fd06f
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-07-01 17:35:31 +08:00 |
|
linfso
|
7928d8fddb
|
md
|
2025-07-01 17:35:05 +08:00 |
|
|
|
da189a7ef8
|
demand: 虚拟单相关字段加修改监控
committer: heyu
|
2025-07-01 17:32:15 +08:00 |
|
|
|
ac60b02465
|
demand: 批次规则批量修改bug修改，新增一次性修改批次接口，查询漏组批次增加查询组批次成功条件，查树增加根据始发网点查
committer: heyu
|
2025-07-01 14:33:50 +08:00 |
|
linfso
|
38a45dd71e
|
md
|
2025-07-01 08:03:18 +08:00 |
|
linfso
|
c81858a646
|
md
|
2025-07-01 07:51:46 +08:00 |
|
linfso
|
fd894098a5
|
md
|
2025-07-01 07:50:04 +08:00 |
|
linfso
|
7a28c6ed78
|
md
|
2025-07-01 07:22:09 +08:00 |
|
linfso
|
dd45d34815
|
md
|
2025-07-01 07:20:32 +08:00 |
|
linfso
|
658afa7c5f
|
md
|
2025-07-01 01:02:17 +08:00 |
|
linfso
|
c04feab249
|
md
|
2025-07-01 00:38:20 +08:00 |
|
linfso
|
15afb07131
|
md
|
2025-07-01 00:05:16 +08:00 |
|
linfso
|
4b7641bd23
|
md
|
2025-06-30 23:50:55 +08:00 |
|
linfso
|
f4908f4bce
|
md
|
2025-06-30 23:44:56 +08:00 |
|
linfso
|
dead8b3c95
|
md
|
2025-06-30 23:37:10 +08:00 |
|
linfso
|
580232e364
|
md
|
2025-06-30 23:34:54 +08:00 |
|
linfso
|
73bbc4bb5a
|
md
|
2025-06-30 23:34:18 +08:00 |
|
linfso
|
bd972aec66
|
md
|
2025-06-30 23:29:54 +08:00 |
|
linfso
|
5e89650007
|
md
|
2025-06-30 23:19:17 +08:00 |
|
linfso
|
db266c5404
|
md
|
2025-06-30 23:17:55 +08:00 |
|
linfso
|
4388209f50
|
md
|
2025-06-30 23:10:44 +08:00 |
|
linfso
|
91363c361e
|
md
|
2025-06-30 23:05:30 +08:00 |
|
linfso
|
9b7406af3f
|
md
|
2025-06-30 22:53:36 +08:00 |
|
linfso
|
d9ec87f792
|
md
|
2025-06-30 22:47:19 +08:00 |
|
linfso
|
8be6118aad
|
md
|
2025-06-30 22:31:27 +08:00 |
|
linfso
|
972aa789da
|
md
|
2025-06-30 20:45:26 +08:00 |
|
linfso
|
209b86aa9f
|
md
|
2025-06-30 20:41:37 +08:00 |
|
linfso
|
e79ad23af6
|
md
|
2025-06-30 20:36:39 +08:00 |
|
linfso
|
60276eeebb
|
md
|
2025-06-30 20:36:27 +08:00 |
|
linfso
|
f93dd55296
|
md
|
2025-06-30 20:11:11 +08:00 |
|
linfso
|
e627243b04
|
md
|
2025-06-30 19:57:50 +08:00 |
|
linfso
|
fac740133a
|
md
|
2025-06-30 19:37:19 +08:00 |
|
linfso
|
6592fb2599
|
dm
|
2025-06-30 19:32:36 +08:00 |
|
linfso
|
293f424070
|
md
|
2025-06-30 18:50:33 +08:00 |
|
linfso
|
ef79e03b5b
|
md
|
2025-06-30 18:08:20 +08:00 |
|
|
|
26198b9716
|
demand: 批次规则批量修改，扫描漏组批次过滤线路014
committer: heyu
|
2025-06-30 18:02:36 +08:00 |
|
linfso
|
1095bc354b
|
md
|
2025-06-30 17:59:03 +08:00 |
|
linfso
|
5a89ffb005
|
md
|
2025-06-30 17:58:32 +08:00 |
|
linfso
|
ea5bc4c15c
|
md
|
2025-06-30 17:52:13 +08:00 |
|
linfso
|
fefa52b21a
|
md
|
2025-06-30 17:05:35 +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 |
|
|
|
a5e8836d14
|
demand: 批次规则批量修改，扫描漏组批次过滤线路014
committer: heyu
|
2025-06-30 15:10:37 +08:00 |
|
|
|
9385acb73c
|
demand: 批次规则批量修改，扫描漏组批次过滤线路014
committer: heyu
|
2025-06-30 13:08:16 +08:00 |
|
|
|
f4fd60e8b7
|
demand: 修改规则增加循环校验
committer: heyu
|
2025-06-30 10:42:17 +08:00 |
|
|
|
33e3d850ff
|
demand: 修改规则增加循环校验
committer: heyu
|
2025-06-30 10:28:07 +08:00 |
|
|
|
2d5da6200d
|
demand: 新增规则增加循环校验，增加校验组树接口
committer: heyu
|
2025-06-30 09:26:06 +08:00 |
|
|
|
2d7f021860
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop
|
2025-06-30 09:25:57 +08:00 |
|
linfso
|
b33b10717b
|
md
|
2025-06-29 16:04:51 +08:00 |
|
linfso
|
1d28e4ef75
|
md
|
2025-06-29 15:44:25 +08:00 |
|
linfso
|
a3f69bf43a
|
短驳费维护
|
2025-06-29 14:37:32 +08:00 |
|
|
|
a290399ad8
|
demand: 组树接口增加根据产品类型过滤，定时扫描接口适应打散的产品类型，组批次供应商名称不准确修复，规则接口重复校验
committer: heyu
|
2025-06-27 16:38:10 +08:00 |
|
heyu
|
fa2406e3b1
|
Merge pull request 'demand: 定时扫描漏组批次逻辑调整' (#77) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/77
|
2025-06-26 20:26:10 +08:00 |
|
|
|
5b5b18284c
|
demand: 定时扫描漏组批次逻辑调整
committer: heyu
|
2025-06-26 20:23:06 +08:00 |
|
heyu
|
5b64bc0a9d
|
Merge pull request 'demand: 定时扫描漏组批次逻辑调整' (#76) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/76
|
2025-06-26 19:54:14 +08:00 |
|
|
|
8004b40000
|
demand: 定时扫描漏组批次逻辑调整
committer: heyu
|
2025-06-26 19:53:38 +08:00 |
|
heyu
|
53c263d6dc
|
Merge pull request 'demand: 定时扫描漏组批次添加treeId' (#75) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/75
|
2025-06-26 18:45:17 +08:00 |
|
|
|
fac835bcb2
|
demand: 定时扫描漏组批次添加treeId
committer: heyu
|
2025-06-26 18:44:41 +08:00 |
|
heyu
|
389992d951
|
Merge pull request 'demand: 组批次规则界面查询逻辑调整' (#74) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/74
|
2025-06-26 14:18:22 +08:00 |
|
|
|
83fba12bba
|
demand: 组批次规则界面查询逻辑调整
committer: heyu
|
2025-06-26 14:17:38 +08:00 |
|
heyu
|
e6f99d48f0
|
Merge pull request 'demand: 组树规则重构，虚拟单增加香港-缅甸快递逻辑。' (#73) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/73
|
2025-06-26 10:41:33 +08:00 |
|
|
|
410ec25e02
|
demand: 组树规则重构，虚拟单增加香港-缅甸快递逻辑。
committer: heyu
|
2025-06-26 10:40:45 +08:00 |
|
linfso
|
700fbba21f
|
md
|
2025-06-26 07:30:32 +08:00 |
|
linfso
|
ad9c95582b
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-06-26 07:28:19 +08:00 |
|
linfso
|
15051e5eba
|
md
|
2025-06-26 07:28:12 +08:00 |
|
heyu
|
f0070f7a8e
|
Merge pull request 'demand: 组树规则重构，虚拟单增加香港-缅甸快递逻辑。' (#72) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/72
|
2025-06-25 18:37:26 +08:00 |
|
|
|
578d5d67c3
|
demand: 组树规则重构，虚拟单增加香港-缅甸快递逻辑。
committer: heyu
|
2025-06-25 18:35:43 +08:00 |
|
heyu
|
d4f2da5921
|
Merge pull request 'demand: 组树规则重构，虚拟单增加香港-缅甸快递逻辑。' (#71) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/71
|
2025-06-25 18:02:20 +08:00 |
|
|
|
cbbeab9d44
|
demand: 组树规则重构，虚拟单增加香港-缅甸快递逻辑。
committer: heyu
|
2025-06-25 18:00:50 +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 |
|
|
|
7a8c1f77a3
|
demand: 组树规则重构，虚拟单增加香港-缅甸快递逻辑。
committer: heyu
|
2025-06-25 17:38:30 +08:00 |
|
|
|
ed5eea160e
|
demand: 组树规则重构，虚拟单增加香港-缅甸快递逻辑。
committer: heyu
|
2025-06-25 17:27:18 +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 |
|
|
|
0664fb05dd
|
demand: 组批次保存、批量录入、修改校验规则
committer: heyu
|
2025-06-25 13:08:25 +08:00 |
|
heyu
|
56c444522b
|
Merge pull request 'demand: 新增筛选网点接口。筛选供应商接口返回nameEn.' (#68) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/68
|
2025-06-25 11:01:46 +08:00 |
|
|
|
84de09d96c
|
demand: 新增筛选网点接口。筛选供应商接口返回nameEn.
committer: heyu
|
2025-06-25 11:01:23 +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
|
7c0096a2d1
|
md
|
2025-06-25 03:29:07 +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 |
|
|
|
1fc7fb52c5
|
demand: 扫描组批次规则调整
committer: heyu
|
2025-06-24 17:11:44 +08:00 |
|
|
|
bfd40fc09e
|
demand: 修复虚拟单重复录入问题
committer: heyu
|
2025-06-24 14:57:51 +08:00 |
|
|
|
22f371e439
|
demand: 打印备注修改，始发网点为空时设置默认值
committer: heyu
|
2025-06-24 13:38:00 +08:00 |
|
|
|
c80db35415
|
demand: 返货快递不拼接备注。批量导入校验操作员。新增根据规则筛选供应商接口。根据虚拟单筛选总数重算。总部不能作为寄件网点
committer: heyu
|
2025-06-24 11:12:49 +08:00 |
|
|
|
25beb21519
|
demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；
committer: heyu
|
2025-06-23 21:31:18 +08:00 |
|
|
|
6c0a94acf8
|
demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；
committer: heyu
|
2025-06-23 21:13:44 +08:00 |
|
|
|
413aefda36
|
demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；
committer: heyu
|
2025-06-23 20:04:55 +08:00 |
|
|
|
eeefc44f86
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop
|
2025-06-23 20:04:02 +08:00 |
|
linfso
|
c5c4e0bb06
|
md
|
2025-06-23 16:54:51 +08:00 |
|
|
|
9a9aa336e6
|
demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；
committer: heyu
|
2025-06-23 15:20:22 +08:00 |
|
|
|
659179197a
|
demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；
committer: heyu
|
2025-06-23 14:07:08 +08:00 |
|
|
|
99c8bbbda3
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop
|
2025-06-23 14:06:34 +08:00 |
|
linfso
|
cf5ded2e3e
|
md
|
2025-06-22 23:05:06 +08:00 |
|
|
|
467839d750
|
demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；
committer: heyu
|
2025-06-21 17:26:40 +08:00 |
|
|
|
5dd79f74f7
|
demand: 新增字段：始发网点 网点表已启用网点
committer: heyu
|
2025-06-21 15:40:02 +08:00 |
|
|
|
3c4dbf0311
|
demand: TMS-缅甸虚拟单调整
committer: heyu
|
2025-06-21 13:23:18 +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
|
ee31ebefec
|
md
|
2025-06-19 18:42:25 +08:00 |
|
linfso
|
6a626af581
|
md
|
2025-06-19 16:39:49 +08:00 |
|
linfso
|
50afa217ec
|
md
|
2025-06-19 16:17:20 +08:00 |
|
linfso
|
73c49c43e2
|
md
|
2025-06-19 15:49:08 +08:00 |
|
linfso
|
1421701c06
|
md
|
2025-06-19 15:31:41 +08:00 |
|
linfso
|
3fcae709ef
|
md
|
2025-06-19 15:30:14 +08:00 |
|
linfso
|
2afa8a395a
|
md
|
2025-06-19 10:13:44 +08:00 |
|
linfso
|
104fc567ee
|
md
|
2025-06-19 09:59:47 +08:00 |
|
linfso
|
4000ce0489
|
md
|
2025-06-18 16:31:03 +08:00 |
|
linfso
|
a5c02922fc
|
md
|
2025-06-18 16:11:45 +08:00 |
|
linfso
|
ea4850e575
|
md
|
2025-06-18 15:50:05 +08:00 |
|
linfso
|
7e0fa0eb78
|
md
|
2025-06-18 15:48:53 +08:00 |
|
linfso
|
d0d243dda6
|
md
|
2025-06-18 15:46:29 +08:00 |
|
linfso
|
3b35c592bf
|
md
|
2025-06-18 15:04:33 +08:00 |
|
linfso
|
58e904c23a
|
md
|
2025-06-18 11:51:16 +08:00 |
|
linfso
|
ebf9bed530
|
md
|
2025-06-18 11:50:14 +08:00 |
|
linfso
|
1c6f4ee3ba
|
md
|
2025-06-18 11:45:43 +08:00 |
|
linfso
|
670af37ed4
|
md
|
2025-06-18 11:17:03 +08:00 |
|
linfso
|
a40435969d
|
md
|
2025-06-18 10:07:59 +08:00 |
|
|
|
81aa722733
|
demand: TMS-缅甸虚拟单调整
committer: heyu
|
2025-06-18 09:24:05 +08:00 |
|
linfso
|
79ac74843c
|
md
|
2025-06-18 08:14:36 +08:00 |
|
linfso
|
3abf041168
|
md
|
2025-06-18 08:13:02 +08:00 |
|
linfso
|
963af279fe
|
md
|
2025-06-17 17:17:32 +08:00 |
|
linfso
|
732678dd94
|
md
|
2025-06-17 14:10:08 +08:00 |
|
linfso
|
209a22439c
|
md
|
2025-06-17 14:01:26 +08:00 |
|
linfso
|
0d8ae4bb1c
|
md
|
2025-06-17 14:00:22 +08:00 |
|
linfso
|
0ba3afb5a1
|
md
|
2025-06-17 10:57:37 +08:00 |
|
linfso
|
e0420de664
|
md
|
2025-06-17 08:39:51 +08:00 |
|
linfso
|
0f05e1d72a
|
供应商费用
|
2025-06-17 08:38:36 +08:00 |
|
|
|
424cc100d1
|
demand: 运单录入界面-缅甸虚拟单调整
committer: heyu
|
2025-06-16 19:04:37 +08:00 |
|
|
|
97ff62ca74
|
demand: 运单录入界面-缅甸虚拟单调整
committer: heyu
|
2025-06-16 16:19:03 +08:00 |
|
heyu
|
1028f741ee
|
Merge pull request 'demand: TMS系统 - 客户账单管理 - 航信开票记录 - 定制导出 - 字段 快递公司取值=申请人' (#59) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/59
|
2025-06-16 10:36:20 +08:00 |
|
|
|
501319d514
|
demand: TMS系统 - 客户账单管理 - 航信开票记录 - 定制导出 - 字段 快递公司取值=申请人
committer: heyu
|
2025-06-16 09:21:41 +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 |
|
linfso
|
a6c8700f9d
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-06-13 09:56:43 +08:00 |
|
linfso
|
253275cbc2
|
提成按实际重量
|
2025-06-13 09:55:46 +08:00 |
|
heyu
|
c8c4c36cba
|
Merge pull request 'demand: 定时扫描运单货物组批次支持按线路扫描，查询漏组批次列表支持按运单寄件日期查' (#57) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/57
|
2025-06-12 16:08:07 +08:00 |
|
|
|
3ccead415e
|
demand: 定时扫描运单货物组批次支持按线路扫描，查询漏组批次列表支持按运单寄件日期查
committer: heyu
|
2025-06-12 16:07:21 +08:00 |
|
heyu
|
53b6fd4bed
|
Merge pull request 'demand: 定时扫描运单货物组批次支持按线路扫描，查询漏组批次列表支持按运单寄件日期查' (#56) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/56
|
2025-06-12 15:32:30 +08:00 |
|
|
|
d9c942c14e
|
demand: 定时扫描运单货物组批次支持按线路扫描，查询漏组批次列表支持按运单寄件日期查
committer: heyu
|
2025-06-12 15:31:13 +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
|
3ede36e863
|
Merge pull request 'demand: 批量导入线路规则bug修改' (#53) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/53
|
2025-06-12 10:57:03 +08:00 |
|
|
|
4afcfedc14
|
demand: 批量导入线路规则bug修改
committer: heyu
|
2025-06-12 10:56:21 +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 |
|
|
|
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 |
|
linfso
|
629e4b2065
|
md
|
2025-06-11 18:10:29 +08:00 |
|
linfso
|
fcbdc5bdaa
|
md
|
2025-06-11 17:39:40 +08:00 |
|
heyu
|
0c687733ce
|
Merge pull request 'demand: 定时扫描漏组批次自测bug修改' (#51) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/51
|
2025-06-11 17:23:25 +08:00 |
|
|
|
0fab01cd67
|
demand: 定时扫描漏组批次自测bug修改
committer: heyu
|
2025-06-11 17:22:52 +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 |
|
heyu
|
5fb8369e0a
|
Merge pull request 'demand: TMS系统-提成管理-运单提成明细：新增查询条件支持按支付方式查询' (#49) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/49
|
2025-06-10 14:49:31 +08:00 |
|
|
|
911bc976ef
|
demand: TMS系统-提成管理-运单提成明细：新增查询条件支持按支付方式查询
committer: heyu
|
2025-06-10 14:49:03 +08:00 |
|
heyu
|
d99e4d7fce
|
Merge pull request 'develop' (#48) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/48
|
2025-06-10 14:46:54 +08:00 |
|
|
|
27f4e5fcc4
|
demand: 对接外部下单接口订单号逻辑修改
committer: heyu
|
2025-06-10 14:45:55 +08:00 |
|
|
|
1f71bc4c21
|
demand: 对接外部下单接口订单号逻辑修改
committer: heyu
|
2025-06-10 14:44:54 +08:00 |
|
|
|
04bd49b254
|
demand: 对接外部下单接口订单号逻辑修改
committer: heyu
|
2025-06-10 14:43:42 +08:00 |
|
linfso
|
15aeaa5f51
|
md
|
2025-06-09 22:15:12 +08:00 |
|
linfso
|
ede7e53286
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-06-09 22:09:32 +08:00 |
|
linfso
|
da0ddd434c
|
md
|
2025-06-09 22:09:04 +08:00 |
|
|
|
3a4e632557
|
demand: TMS系统-提成管理-运单提成明细：新增查询条件支持按支付方式查询
committer: heyu
|
2025-06-09 18:43:41 +08:00 |
|
heyu
|
b811153a65
|
Merge pull request 'develop' (#47) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/47
|
2025-06-09 18:23:52 +08:00 |
|
|
|
c26197080f
|
demand:TMS系统-航信开票记录查询/导出/定制导出支持按收款状态、账单月份、月结客户、销售联系人、回款联系人查询、导出
committer: heyu
|
2025-06-09 18:22:20 +08:00 |
|
|
|
cb177ee353
|
demand:TMS系统 - 统计报表- 收款统计 - 最后回款时间 目前显示的是时分秒 不合适，需要显示日期 如图所示
committer: heyu
|
2025-06-09 14:41:35 +08:00 |
|
heyu
|
e67ffd66d5
|
Merge pull request 'develop' (#46) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/46
|
2025-06-07 17:15:26 +08:00 |
|
|
|
4b9764efa0
|
demand:1.新增客户秘钥管理界面增删改查接口 2.新增客户对接tms下单接口
committer: heyu
|
2025-06-07 17:03:14 +08:00 |
|
heyu
|
080defd184
|
Merge pull request 'develop' (#45) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/45
|
2025-06-05 14:23:45 +08:00 |
|
|
|
b220c5a40a
|
demand: 1.定时任务批量更新新提成统计某月统计数据为空时不会更新金额bug修复 2.根据单号重新计算提成增加校验问题件及支付方式相关场景
committer: heyu
|
2025-06-05 14:17:16 +08:00 |
|
|
|
6d06ca6fcc
|
demand: 问题件登记、运单修改、运单录入、网点费用申请等相关场景下触发提成重算
committer: heyu
|
2025-06-04 09:57:56 +08:00 |
|
|
|
be6e3279d1
|
demand: 航线查询不支持按账单号查询bug修复，航线查询/导出支持按多个运单号/账单号查询/导出
committer: heyu
|
2025-06-03 11:45:21 +08:00 |
|
linfso
|
fa78be9f46
|
md
|
2025-05-30 19:53:43 +08:00 |
|
linfso
|
2a9f0f6078
|
md
|
2025-05-30 08:14:27 +08:00 |
|
linfso
|
ca29695c77
|
md
|
2025-05-30 08:01:16 +08:00 |
|
linfso
|
034ad477ce
|
md
|
2025-05-30 07:09:38 +08:00 |
|
linfso
|
4e477336da
|
md
|
2025-05-29 19:12:50 +08:00 |
|
linfso
|
68e6ebc416
|
md
|
2025-05-29 19:03:46 +08:00 |
|
linfso
|
8cb2a6012b
|
md
|
2025-05-29 17:51:10 +08:00 |
|
linfso
|
bb2e950338
|
md
|
2025-05-29 17:39:55 +08:00 |
|
linfso
|
eb78a46cd0
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-05-29 17:22:32 +08:00 |
|
linfso
|
97f0b26b2d
|
md
|
2025-05-29 17:22:20 +08:00 |
|
heyu
|
b02453b134
|
Merge pull request 'demand: 航线查询/导出按财务要求调整' (#44) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/44
|
2025-05-29 17:08:01 +08:00 |
|
|
|
94f31075dd
|
demand: 航线查询/导出按财务要求调整
committer: heyu
|
2025-05-29 17:07:29 +08:00 |
|
heyu
|
5e7aca0701
|
Merge pull request 'demand: TMS系统 - 客户账单管理 - 收款信息查询 - 缴款客户是必填项，但是此界面显示的缴款客户为空呢' (#43) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/43
|
2025-05-29 14:23:29 +08:00 |
|
|
|
1e2f0fea17
|
demand: TMS系统 - 客户账单管理 - 收款信息查询 - 缴款客户是必填项，但是此界面显示的缴款客户为空呢
committer: heyu
|
2025-05-29 14:22:33 +08:00 |
|
heyu
|
d25cfd7144
|
Merge pull request 'demand:检查月结客户首次签约日期bug修改' (#42) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/42
|
2025-05-28 13:27:02 +08:00 |
|
|
|
90357b26ee
|
demand:检查月结客户首次签约日期bug修改
committer: heyu
|
2025-05-28 13:26:19 +08:00 |
|
heyu
|
780868584e
|
Merge pull request 'develop' (#41) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/41
|
2025-05-28 10:54:06 +08:00 |
|
|
|
31259ec806
|
demand:TMS系统-运单录入限制：寄件国家和目的国家需要和所选线路一致
committer: heyu
|
2025-05-28 10:52:56 +08:00 |
|
|
|
db4e658ec1
|
demand:TMS-现金核销界面/月结核销界面/发票收款界面新增限制交易/退款时间不能早于当天
committer: heyu
|
2025-05-27 18:58:44 +08:00 |
|
|
|
ace2a5034d
|
demand:TMS-现金核销界面/月结核销界面/发票收款界面新增限制交易时间不能早于当天
committer: heyu
|
2025-05-27 18:49:21 +08:00 |
|
|
|
ec274798ed
|
demand:报价管理页面新增批量修改报价接口
committer: heyu
|
2025-05-27 16:55:59 +08:00 |
|
smshen
|
f46fa4eec8
|
Merge pull request 'demand:定制导出性能优化' (#40) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/40
|
2025-05-27 15:46:34 +08:00 |
|
|
|
9d911d5db5
|
demand:定制导出性能优化
committer: heyu
|
2025-05-27 14:21:58 +08:00 |
|
smshen
|
46407a5996
|
Merge pull request 'demand:1.定制导出排除废弃的发票 2.定制导出修改业务员取值' (#39) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/39
|
2025-05-27 09:07:56 +08:00 |
|
|
|
5c2bad4ef5
|
demand:1.定制导出排除废弃的发票 2.定制导出修改业务员取值
committer: heyu
|
2025-05-26 18:57:40 +08:00 |
|
smshen
|
9f23967fb8
|
Merge pull request 'demand: 保留原sql重起一个sql' (#38) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/38
|
2025-05-26 15:39:15 +08:00 |
|
|
|
c36991ea41
|
demand: 保留原sql重起一个sql
committer: heyu
|
2025-05-26 15:34:00 +08:00 |
|
smshen
|
cdbae36910
|
Merge pull request 'demand: 保留原sql重起一个sql' (#37) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/37
|
2025-05-26 14:50:53 +08:00 |
|
|
|
610fa64dfa
|
demand: 保留原sql重起一个sql
committer: heyu
|
2025-05-26 14:49:45 +08:00 |
|
smshen
|
daf6940784
|
Merge pull request 'demand: 保留原sql重起一个sql' (#35) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/35
|
2025-05-26 14:43:30 +08:00 |
|
|
|
883099679a
|
demand: 保留原sql重起一个sql
committer: heyu
|
2025-05-26 14:41:38 +08:00 |
|
smshen
|
da2b20951c
|
Merge pull request 'demand: 1.TMS系统-网点费用申请：费用申请，审批修改回款联系人，当被修改的回款联系人额度不足的时候应该无法修改 2.新增判断：网点费用申请/运单修改界面修改月结的时候需要判断一下…' (#34) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/34
|
2025-05-26 13:40:06 +08:00 |
|
|
|
e544d35378
|
demand: 1.TMS系统-网点费用申请：费用申请，审批修改回款联系人，当被修改的回款联系人额度不足的时候应该无法修改 2.新增判断：网点费用申请/运单修改界面修改月结的时候需要判断一下这个运单是首次签约之前开的还是之后开的，之前开的就不允许修改
committer: heyu
|
2025-05-26 13:34:16 +08:00 |
|
smshen
|
f32b16ea02
|
Merge pull request 'develop' (#33) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/33
|
2025-05-26 13:29:11 +08:00 |
|
|
|
b9b65f0838
|
demand: 1.TMS系统-网点费用申请：费用申请，审批修改回款联系人，当被修改的回款联系人额度不足的时候应该无法修改 2.新增判断：网点费用申请/运单修改界面修改月结的时候需要判断一下这个运单是首次签约之前开的还是之后开的，之前开的就不允许修改
committer: heyu
|
2025-05-26 13:20:57 +08:00 |
|
|
|
42d6cd077f
|
demand: 航线开票记录自测bug
committer: heyu
|
2025-05-23 16:54:51 +08:00 |
|
smshen
|
ac12147a3a
|
Merge pull request 'demand: 航线开票记录查询、导出、定制导出性能优化' (#32) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/32
|
2025-05-23 16:12:14 +08:00 |
|
|
|
d5404feec8
|
demand: 航线开票记录查询、导出、定制导出性能优化
committer: heyu
|
2025-05-23 14:41:19 +08:00 |
|
linfso
|
6a7b78424f
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-05-23 14:25:32 +08:00 |
|
linfso
|
20b3f1b7bf
|
md
|
2025-05-23 14:25:24 +08:00 |
|
|
|
c9f50691ca
|
demand: 网点费用申请/运单修改界面修改月结的时候需要判断一下这个运单是首次签约之前开的还是之后开的，之前开的就不允许修改
committer: heyu
|
2025-05-22 14:29:04 +08:00 |
|
|
|
4ae68d2310
|
Merge branch 'develop' of http://git.xdadan.loc/tanex/emis-service into develop
# Conflicts:
# emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
|
2025-05-22 14:02:45 +08:00 |
|
|
|
259de46812
|
demand: 网点费用申请/运单修改界面修改月结的时候需要判断一下这个运单是首次签约之前开的还是之后开的，之前开的就不允许修改
committer: heyu
|
2025-05-22 14:00:58 +08:00 |
|
