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 |
|
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 |
|
|
|
0664fb05dd
|
demand: 组批次保存、批量录入、修改校验规则
committer: heyu
|
2025-06-25 13:08:25 +08:00 |
|
|
|
84de09d96c
|
demand: 新增筛选网点接口。筛选供应商接口返回nameEn.
committer: heyu
|
2025-06-25 11:01:23 +08:00 |
|
|
|
c54ef63b78
|
demand: 新增筛选网点接口。筛选供应商接口返回nameEn.
committer: heyu
|
2025-06-25 10:20:43 +08:00 |
|
|
|
1fc7fb52c5
|
demand: 扫描组批次规则调整
committer: heyu
|
2025-06-24 17:11:44 +08:00 |
|
|
|
c80db35415
|
demand: 返货快递不拼接备注。批量导入校验操作员。新增根据规则筛选供应商接口。根据虚拟单筛选总数重算。总部不能作为寄件网点
committer: heyu
|
2025-06-24 11:12:49 +08:00 |
|
|
|
413aefda36
|
demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；
committer: heyu
|
2025-06-23 20:04:55 +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 |
|
|
|
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
|
50afa217ec
|
md
|
2025-06-19 16:17:20 +08:00 |
|
linfso
|
73c49c43e2
|
md
|
2025-06-19 15:49:08 +08:00 |
|
linfso
|
3fcae709ef
|
md
|
2025-06-19 15:30:14 +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
|
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
|
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
|
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
|
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
|
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
|
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 |
|
|
|
04bd49b254
|
demand: 对接外部下单接口订单号逻辑修改
committer: heyu
|
2025-06-10 14:43:42 +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 |
|
|
|
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
|
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 |
|
|
|
94f31075dd
|
demand: 航线查询/导出按财务要求调整
committer: heyu
|
2025-05-29 17:07:29 +08:00 |
|
|
|
9d911d5db5
|
demand:定制导出性能优化
committer: heyu
|
2025-05-27 14:21:58 +08:00 |
|
|
|
610fa64dfa
|
demand: 保留原sql重起一个sql
committer: heyu
|
2025-05-26 14:49:45 +08:00 |
|
|
|
883099679a
|
demand: 保留原sql重起一个sql
committer: heyu
|
2025-05-26 14:41:38 +08:00 |
|
|
|
42d6cd077f
|
demand: 航线开票记录自测bug
committer: heyu
|
2025-05-23 16:54:51 +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 |
|
|
|
eada435b31
|
demand: 定制导出按财务要求调整
committer: heyu
|
2025-05-21 11:13:51 +08:00 |
|
smshen
|
ee1f84c5a4
|
Merge pull request 'demand: TMS系统 - 客户账单管理 - 航信开票记录 - 新增加“定制导出” 详细查看附件。' (#28) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/28
|
2025-05-20 17:08:43 +08:00 |
|
|
|
40a30b5cb8
|
demand: TMS系统 - 客户账单管理 - 航信开票记录 - 新增加“定制导出” 详细查看附件。
committer: heyu
|
2025-05-20 17:06:28 +08:00 |
|
linfso
|
0f4e5a505f
|
md
|
2025-05-20 10:46:44 +08:00 |
|
linfso
|
4f5eb76f33
|
md
|
2025-05-20 09:50:02 +08:00 |
|
linfso
|
2fc9d73e31
|
md
|
2025-05-19 18:04:47 +08:00 |
|
linfso
|
befe309816
|
md
|
2025-05-18 00:26:27 +08:00 |
|
linfso
|
3d0bd120f7
|
md
|
2025-05-18 00:04:48 +08:00 |
|
linfso
|
662038862f
|
md
|
2025-05-18 00:02:57 +08:00 |
|
smshen
|
0ada0ca446
|
Merge pull request 'develop' (#26) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/26
|
2025-05-17 14:17:16 +08:00 |
|
linfso
|
02326cb40d
|
md
|
2025-05-16 20:32:23 +08:00 |
|
linfso
|
9a7b03b8ae
|
md
|
2025-05-16 20:22:23 +08:00 |
|
linfso
|
10fee5583f
|
md
|
2025-05-16 19:44:57 +08:00 |
|
linfso
|
7edad142c1
|
md
|
2025-05-16 15:55:16 +08:00 |
|
linfso
|
afaef99dcc
|
md
|
2025-05-16 15:47:32 +08:00 |
|
linfso
|
d6b8d8b596
|
md
|
2025-05-16 15:40:05 +08:00 |
|
linfso
|
8ed6ac6506
|
md
|
2025-05-16 15:33:21 +08:00 |
|
linfso
|
c16accd640
|
md
|
2025-05-16 15:19:02 +08:00 |
|
linfso
|
33dc7e58d5
|
md
|
2025-05-16 15:15:08 +08:00 |
|
|
|
61bcf29a97
|
demand: 新增定时任务扫描记录表,定时扫描任务优化
committer: heyu
|
2025-05-16 11:08:44 +08:00 |
|
linfso
|
9fe8760a09
|
md
|
2025-05-15 19:52:58 +08:00 |
|
smshen
|
62c2204de3
|
Merge pull request 'demand: 漏组批次、供应商线路规划相关需求代码重构。供应商线路规划新增导入接口' (#25) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/25
|
2025-05-15 18:34:01 +08:00 |
|
|
|
c5dee14a0f
|
demand: 漏组批次、供应商线路规划相关需求代码重构。供应商线路规划新增导入接口
committer: heyu
|
2025-05-15 14:29:01 +08:00 |
|
linfso
|
26906d64c3
|
md
|
2025-05-15 06:33:00 +08:00 |
|
linfso
|
c4bc4266a3
|
md
|
2025-05-14 14:22:08 +08:00 |
|
linfso
|
ae783ac894
|
md
|
2025-05-14 13:15:00 +08:00 |
|
linfso
|
60ebf5215e
|
md
|
2025-05-14 03:47:53 +08:00 |
|
linfso
|
f8b40d4718
|
md
|
2025-05-13 19:43:20 +08:00 |
|
linfso
|
369cd90e66
|
md
|
2025-05-13 19:40:30 +08:00 |
|
linfso
|
ae0b09db47
|
md
|
2025-05-13 19:35:17 +08:00 |
|
linfso
|
9981d13642
|
md
|
2025-05-13 19:21:09 +08:00 |
|
smshen
|
58bee0de44
|
Merge pull request 'demand: 现金/月结客户额度临时额度查询/过滤调整' (#24) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/24
|
2025-05-13 18:28:36 +08:00 |
|
|
|
c8e7921fc1
|
demand: 现金/月结客户额度临时额度查询/过滤调整
committer: heyu
|
2025-05-13 18:14:55 +08:00 |
|
linfso
|
20fcc7ed60
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-05-13 14:08:09 +08:00 |
|
linfso
|
45278333b4
|
md
|
2025-05-13 14:08:02 +08:00 |
|
|
|
a983c455bc
|
demand: TMS系统 - 客户账单管理 - 航信开票记录 - 界面优化如下图所示
committer: heyu
|
2025-05-13 10:02:42 +08:00 |
|
|
|
e9fccff6dd
|
demand: TMS系统 - 客户账单管理 - 航信开票记录 - 界面优化如下图所示
committer: heyu
|
2025-05-12 17:52:30 +08:00 |
|
|
|
96b1f12a40
|
demand: TMS系统 - 客户账单管理 - 航信开票记录 - 界面优化如下图所示
committer: heyu
|
2025-05-12 17:00:15 +08:00 |
|
smshen
|
3dbf682425
|
Merge pull request 'demand: 定时扫描运单组批次,漏组批次管理页面' (#20) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/20
|
2025-05-12 14:25:51 +08:00 |
|
linfso
|
beb213a53b
|
md
|
2025-05-11 12:34:38 +08:00 |
|
linfso
|
38a642610c
|
md
|
2025-05-11 11:17:42 +08:00 |
|
|
|
a50f333e4c
|
demand: 定时扫描运单组批次,漏组批次管理页面
committer: heyu
|
2025-05-09 17:32:01 +08:00 |
|
linfso
|
1ce2938ed8
|
md
|
2025-05-08 16:11:17 +08:00 |
|
linfso
|
6fef3b8c1f
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRecordMapper.java
|
2025-05-08 12:57:21 +08:00 |
|
|
|
3c636156e0
|
demand: 计算时间范围内每一天账单总金额
committer: heyu
|
2025-05-08 10:26:54 +08:00 |
|
linfso
|
2143f13d51
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-05-08 02:10:47 +08:00 |
|
linfso
|
205803ab95
|
md
|
2025-05-08 02:10:06 +08:00 |
|
smshen
|
07d5854c8d
|
Merge pull request 'demand: 进仓详情导出增加进仓子单号' (#16) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/16
|
2025-05-07 17:08:05 +08:00 |
|
|
|
d6fa69984a
|
demand: 进仓详情导出增加进仓子单号
committer: heyu
|
2025-05-07 17:06:52 +08:00 |
|
linfso
|
af44502b1d
|
md
|
2025-05-07 14:43:03 +08:00 |
|
linfso
|
873cdfbe7d
|
md
|
2025-05-07 14:38:30 +08:00 |
|
smshen
|
53eac627bb
|
Merge pull request 'demand: 海运账单mapper格式修改' (#15) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/15
|
2025-05-07 14:08:47 +08:00 |
|
|
|
1b87708e30
|
demand: 海运账单mapper格式修改
committer: heyu
|
2025-05-07 14:07:46 +08:00 |
|
smshen
|
00d8c4e100
|
Merge pull request 'demand: 海运账单起运港目的港导出名称' (#14) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/14
|
2025-05-07 13:53:50 +08:00 |
|
linfso
|
6aefe0bb24
|
md
|
2025-05-07 13:52:59 +08:00 |
|
|
|
7ff25d2de6
|
demand: 海运账单起运港目的港导出名称
committer: heyu
|
2025-05-07 13:25:55 +08:00 |
|
linfso
|
88c33e4e8d
|
md
|
2025-05-07 10:34:18 +08:00 |
|
linfso
|
a0c081118f
|
md
|
2025-05-07 09:34:57 +08:00 |
|
linfso
|
495f75b4bc
|
md
|
2025-05-07 08:12:41 +08:00 |
|
linfso
|
8a1b1544b8
|
md
|
2025-05-07 07:42:17 +08:00 |
|
linfso
|
fe4618d6db
|
md
|
2025-05-07 07:18:57 +08:00 |
|
linfso
|
6f9d159dce
|
md
|
2025-05-07 06:56:24 +08:00 |
|
linfso
|
beaa4cbb95
|
md
|
2025-05-07 06:40:40 +08:00 |
|
linfso
|
1d41a4b1fa
|
md
|
2025-05-06 14:57:20 +08:00 |
|
linfso
|
3d2f73554c
|
md
|
2025-05-06 13:01:19 +08:00 |
|
linfso
|
7439f1a0fc
|
md
|
2025-05-06 08:35:40 +08:00 |
|
linfso
|
62795f1c49
|
md
|
2025-05-06 08:20:01 +08:00 |
|
