Commit Graph

1308 Commits

Author SHA1 Message Date
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