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 |
|
heyu
|
ea0fd3749b
|
Merge pull request 'develop' (#69) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/69
|
2025-06-25 13:09:40 +08:00 |
|
|
|
7e1fa091bd
|
demand: 组批次保存、批量录入、修改校验规则
committer: heyu
|
2025-06-25 13:09:05 +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 |
|
heyu
|
c94ce85912
|
Merge pull request 'demand: 扫描组批次规则调整' (#66) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/66
|
2025-06-24 17:12:12 +08:00 |
|
|
|
1fc7fb52c5
|
demand: 扫描组批次规则调整
committer: heyu
|
2025-06-24 17:11:44 +08:00 |
|
heyu
|
4839acc678
|
Merge pull request 'demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；' (#64) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/64
|
2025-06-24 14:58:11 +08:00 |
|
|
|
bfd40fc09e
|
demand: 修复虚拟单重复录入问题
committer: heyu
|
2025-06-24 14:57:51 +08:00 |
|
|
|
efd3e7f455
|
demand: 批量修改批次接口
committer: heyu
|
2025-06-24 14:32:27 +08:00 |
|
heyu
|
fd93c05cb2
|
Merge pull request 'demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；' (#63) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/63
|
2025-06-24 13:39:55 +08:00 |
|
|
|
22f371e439
|
demand: 打印备注修改，始发网点为空时设置默认值
committer: heyu
|
2025-06-24 13:38:00 +08:00 |
|
heyu
|
54b6a1f907
|
Merge pull request 'demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；' (#62) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/62
|
2025-06-24 11:14:38 +08:00 |
|
|
|
c80db35415
|
demand: 返货快递不拼接备注。批量导入校验操作员。新增根据规则筛选供应商接口。根据虚拟单筛选总数重算。总部不能作为寄件网点
committer: heyu
|
2025-06-24 11:12:49 +08:00 |
|
heyu
|
6ff77cea3c
|
Merge pull request 'demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；' (#65) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/65
|
2025-06-23 21:33:06 +08:00 |
|
|
|
25beb21519
|
demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；
committer: heyu
|
2025-06-23 21:31:18 +08:00 |
|
heyu
|
950cebc2a6
|
Merge pull request 'demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；' (#61) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/61
|
2025-06-23 21:20:32 +08:00 |
|
|
|
6c0a94acf8
|
demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；
committer: heyu
|
2025-06-23 21:13:44 +08:00 |
|
heyu
|
cbae1cc19a
|
Merge pull request 'develop' (#60) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/60
|
2025-06-23 20:07:48 +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 |
|
|
|
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
|
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 |
|
