|
|
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 |
|
