Commit Graph

922 Commits

Author SHA1 Message Date
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
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
linfso
2e030c5bd1 md 2025-05-20 17:07:21 +08:00
40a30b5cb8 demand: TMS系统 - 客户账单管理 - 航信开票记录 - 新增加“定制导出” 详细查看附件。
committer: heyu
2025-05-20 17:06:28 +08:00
linfso
500c5373d0 md 2025-05-20 11:11:54 +08:00
linfso
f7b1527314 md 2025-05-19 00:00:15 +08:00
linfso
a3de735a8b md 2025-05-18 23:54:46 +08:00
linfso
1703799c03 md 2025-05-18 23:50:11 +08:00
linfso
6c4af74f31 md 2025-05-18 23:46:43 +08:00
linfso
d7d1eb422d md 2025-05-18 00:16:07 +08:00
linfso
10fee5583f md 2025-05-16 19:44:57 +08:00
linfso
2c9ef3a359 md 2025-05-16 17:17:46 +08:00
linfso
33dc7e58d5 md 2025-05-16 15:15:08 +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
979d35073f md 2025-05-14 11:07:38 +08:00
linfso
7b8f7f97a0 md 2025-05-14 11:03:55 +08:00
linfso
381477e97d md 2025-05-14 10:55:38 +08:00
linfso
4e09b531d8 md 2025-05-14 09:50:19 +08:00
linfso
2820973355 md 2025-05-14 06:31:44 +08:00
linfso
4acccb60c3 md 2025-05-14 06:27:40 +08:00
linfso
264e8e7aa0 md 2025-05-14 03:51:36 +08:00
linfso
60ebf5215e md 2025-05-14 03:47:53 +08:00
linfso
ae0b09db47 md 2025-05-13 19:35:17 +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
a50f333e4c demand: 定时扫描运单组批次,漏组批次管理页面
committer: heyu
2025-05-09 17:32:01 +08:00
linfso
e92655c7da md 2025-05-09 07:01:21 +08:00
linfso
49f353a500 md 2025-05-08 15:25:07 +08:00
381ea61971 demand: 计算时间范围内每一天账单总金额修改
committer: heyu
2025-05-08 13:21:53 +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
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
73e9c67b88 md 2025-05-07 09:58:30 +08:00
linfso
beaa4cbb95 md 2025-05-07 06:40:40 +08:00
linfso
b2a7b9cd63 md 2025-05-06 13:16:23 +08:00
linfso
d793366317 md 2025-05-06 08:00:20 +08:00
linfso
e99d55714e md 2025-05-05 18:17:16 +08:00
linfso
0e98328a0b md 2025-05-05 18:05:10 +08:00
linfso
5a0168a9de md 2025-05-05 14:30:39 +08:00
linfso
ae6cbc46dc md 2025-05-05 13:01:44 +08:00
linfso
40af6e50fe md 2025-05-05 08:34:08 +08:00
1d3a29721f demand: 查询海运网点接口去除权限
committer: heyu
2025-04-30 11:29:34 +08:00
smshen
3c7c818a7c Merge branch 'master' into develop 2025-04-28 17:11:02 +08:00
b9d4eaad88 demand: 供应商线路管理页面自测bug修改
committer: heyu
2025-04-28 16:25:11 +08:00
7b91aad79c demand: 供应商线路管理页面自测bug修改
committer: heyu
2025-04-28 16:15:46 +08:00
b8f1d1b01d demand: 1.新增查询海运网点列表接口 2.查询运单列表、查询运单详情返回增加起运港名称、目的港名称
committer: heyu
2025-04-28 09:40:50 +08:00
linfso
51f2ab124c Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-04-27 17:36:24 +08:00
linfso
7ee094137d md 2025-04-27 17:36:09 +08:00
smshen
b74e5e6fcb Merge pull request 'develop' (#5) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/5
2025-04-25 16:18:03 +08:00
820b8583de demand: 订单管理-进仓对货界面新增导出进仓详情功能
committer: heyu
2025-04-25 14:57:59 +08:00
smshen
d0d9f73e03 Merge pull request 'demand: 超期额度、账期内额度代码调整' (#4) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/4
2025-04-25 11:24:14 +08:00
291dc16c7c demand: 超期额度、账期内额度代码调整
committer: heyu
2025-04-25 10:23:24 +08:00
smshen
0775dd13cd Merge pull request 'develop' (#3) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/3
2025-04-25 09:12:24 +08:00
fbd940c3f4 demand: 月结客户/现金客户临时额度增加查询详情接口
committer: heyu
2025-04-24 18:54:42 +08:00
linfso
13ce8f8fc2 md 2025-04-24 13:03:14 +08:00
linfso
b086583c45 md 2025-04-24 12:27:47 +08:00
linfso
8e35aafbbd md 2025-04-24 10:16:47 +08:00
e5b46b3846 demand: 供应商线路规划管理页面增删改查基本功能-初版雏形
committer: heyu
2025-04-24 10:15:54 +08:00
linfso
1cd38d53f8 md 2025-04-24 09:51:10 +08:00
linfso
a801ee8847 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-04-24 09:39:25 +08:00