|
|
86fa4d99b5
|
demand: 大客户单独报价修改bug修改
committer: heyu
|
2025-07-08 12:00:29 +08:00 |
|
|
|
9702583f04
|
demand: 批量扫描漏组批次订单扫描过滤未接单/已取消的运单，扫描过滤进口的虚拟单
committer: heyu
|
2025-07-08 09:45:46 +08:00 |
|
linfso
|
df17a6b04e
|
md
|
2025-07-07 17:42:37 +08:00 |
|
linfso
|
cfac49cb70
|
md
|
2025-07-07 16:52:08 +08:00 |
|
linfso
|
2cdf5f5340
|
md
|
2025-07-07 14:57:15 +08:00 |
|
linfso
|
9689ac0c7f
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-07-07 14:48:23 +08:00 |
|
linfso
|
632d105de1
|
md
|
2025-07-07 14:48:16 +08:00 |
|
|
|
34d5e9a7c4
|
demand: TMS系统 - 运输管理 - 货物组批次 - 按照 成本 已录入 未录入 无法查询到未录入的数据 显示 无数据
committer: heyu
|
2025-07-07 11:04:59 +08:00 |
|
|
|
4acd952916
|
demand: 虚拟单主单A换主单B，虚拟单、主单B、主单A都需要更新绑定关系。 报价时间交叉验证逻辑bug修复
committer: heyu
|
2025-07-05 13:19:43 +08:00 |
|
|
|
0bc471ab23
|
demand: 组批次规则新增/导入/修改/批量修改校验时间是否交叉。 批量修改报价验重去除自身
committer: heyu
|
2025-07-04 18:09:20 +08:00 |
|
linfso
|
504f2718ac
|
md
|
2025-07-04 15:38:30 +08:00 |
|
heyu
|
a7de130dc3
|
Merge pull request 'demand: 报价录入重复校验逻辑调整' (#92) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/92
|
2025-07-04 15:02:51 +08:00 |
|
|
|
9cb82154d9
|
demand: 报价录入重复校验逻辑调整
committer: heyu
|
2025-07-04 15:02:04 +08:00 |
|
linfso
|
e7e28a440f
|
md
|
2025-07-04 11:41:23 +08:00 |
|
linfso
|
bd558537cb
|
md
|
2025-07-04 08:18:25 +08:00 |
|
linfso
|
76a0d25e79
|
md
|
2025-07-04 07:55:12 +08:00 |
|
linfso
|
ab1a1ef906
|
md
|
2025-07-04 07:48:25 +08:00 |
|
linfso
|
f5fed5bc9f
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-07-04 07:35:55 +08:00 |
|
linfso
|
0dcc5fbb81
|
md
|
2025-07-04 07:30:03 +08:00 |
|
|
|
ef3cac2ac8
|
demand: 扫描漏组批次过滤面单删除的，扫描一周以前的。漏组批次从表格复制查询优化
committer: heyu
|
2025-07-03 14:23:50 +08:00 |
|
|
|
c47956c5da
|
demand: 查询组批次供应商名称取值问题修复 查询漏组批次效率优化
committer: heyu
|
2025-07-03 11:24:09 +08:00 |
|
|
|
174620b8a1
|
demand: 组树添加南京分拨中心、柯桥分拨中心
committer: heyu
|
2025-07-02 19:52:44 +08:00 |
|
linfso
|
cf5104be89
|
md
|
2025-07-02 15:03:18 +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 |
|
linfso
|
e221e0593d
|
md
|
2025-07-02 13:36:38 +08:00 |
|
linfso
|
7ce7b3885f
|
md
|
2025-07-02 13:19:51 +08:00 |
|
linfso
|
86b5b368dd
|
md
|
2025-07-02 12:05:30 +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 |
|
linfso
|
774bd9be32
|
md
|
2025-07-02 07:27:16 +08:00 |
|
linfso
|
402f38fee0
|
md
|
2025-07-02 07:09:20 +08:00 |
|
|
|
ac60b02465
|
demand: 批次规则批量修改bug修改，新增一次性修改批次接口，查询漏组批次增加查询组批次成功条件，查树增加根据始发网点查
committer: heyu
|
2025-07-01 14:33:50 +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
|
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
|
d9ec87f792
|
md
|
2025-06-30 22:47:19 +08:00 |
|
linfso
|
8be6118aad
|
md
|
2025-06-30 22:31:27 +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
|
e627243b04
|
md
|
2025-06-30 19:57:50 +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
|
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 |
|
|
|
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
|
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
|
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 |
|
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 |
|
