Commit Graph

887 Commits

Author SHA1 Message Date
linfso
42c22a9687 md 2025-06-26 14:26:36 +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
7e1fa091bd demand: 组批次保存、批量录入、修改校验规则
committer: heyu
2025-06-25 13:09:05 +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
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
efd3e7f455 demand: 批量修改批次接口
committer: heyu
2025-06-24 14:32:27 +08:00
c80db35415 demand: 返货快递不拼接备注。批量导入校验操作员。新增根据规则筛选供应商接口。根据虚拟单筛选总数重算。总部不能作为寄件网点
committer: heyu
2025-06-24 11:12:49 +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
73c49c43e2 md 2025-06-19 15:49:08 +08:00
linfso
a5c02922fc md 2025-06-18 16:11:45 +08:00
linfso
61a9da48fd md 2025-06-18 15:51:26 +08:00
linfso
670af37ed4 md 2025-06-18 11:17:03 +08:00
81aa722733 demand: TMS-缅甸虚拟单调整
committer: heyu
2025-06-18 09:24:05 +08:00
linfso
3abf041168 md 2025-06-18 08:13:02 +08:00
linfso
674ba8f6fd md 2025-06-18 07:18:02 +08:00
linfso
490adc639b md 2025-06-17 18:06:55 +08:00
linfso
963af279fe md 2025-06-17 17:17:32 +08:00
linfso
0ba3afb5a1 md 2025-06-17 10:57:37 +08:00
linfso
6ea6433f1a md 2025-06-17 09:21:43 +08:00
linfso
0f05e1d72a 供应商费用 2025-06-17 08:38:36 +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
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
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
7dfc212251 demand: 对接外部更新/查询运单接口,对接外部导出进仓单、查询物流轨迹接口
committer: heyu
2025-06-12 10:33:19 +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
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
linfso
15aeaa5f51 md 2025-06-09 22:15:12 +08:00
linfso
eac599fe8b md 2025-06-09 17:27:17 +08:00
a8b429a777 demand:1.新增客户秘钥管理界面增删改查接口 2.新增客户对接tms下单接口
committer: heyu
2025-06-07 17:10:34 +08:00
4b9764efa0 demand:1.新增客户秘钥管理界面增删改查接口 2.新增客户对接tms下单接口
committer: heyu
2025-06-07 17:03:14 +08:00
ec274798ed demand:报价管理页面新增批量修改报价接口
committer: heyu
2025-05-27 16:55:59 +08:00
c36991ea41 demand: 保留原sql重起一个sql
committer: heyu
2025-05-26 15:34:00 +08:00
d5404feec8 demand: 航线开票记录查询、导出、定制导出性能优化
committer: heyu
2025-05-23 14:41:19 +08:00