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 |
|
linfso
|
568bc00098
|
md
|
2025-04-24 09:39:20 +08:00 |
|
smshen
|
6d2be83bb5
|
Merge pull request 'develop' (#2) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/2
|
2025-04-24 09:36:28 +08:00 |
|
|
|
71f2159b4d
|
demand: 计算指定时间范围内每一天的收款总金额
committer: heyu
|
2025-04-23 17:32:25 +08:00 |
|
|
|
f601b62294
|
demand: 海运账单bug修改
committer: heyu
|
2025-04-21 17:09:16 +08:00 |
|
smshen
|
b6873d718a
|
Merge pull request 'develop' (#1) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/1
|
2025-04-21 10:09:39 +08:00 |
|
|
|
7bb93abc47
|
demand: 1.新增月结客户临时额度操作界面，增加增删改查操 作，月结客户额度操作界面查询返回增加临时额度
2.运单录入、运单修改等界面销售额度计算逻辑适应临时额度调整
committer: heyu
|
2025-04-17 14:07:52 +08:00 |
|
linfso
|
0ee73c4001
|
md
|
2025-04-16 20:24:12 +08:00 |
|
|
|
6d879fceb6
|
demand: 客户管理新增现金客户临时额度操作界面对应增删改查逻辑，现金额度管理查询额度列表新增查询临时额度对应逻辑处理
committer: heyu
|
2025-04-16 19:06:29 +08:00 |
|
linfso
|
a35c4ee6a3
|
md
|
2025-04-14 11:20:50 +08:00 |
|
|
|
92438e9d16
|
demand: 已使用额度细分两个字段，一个是超期额度，一个账期内额度。双击需要显示具体明细。
committer: heyu
|
2025-04-11 17:17:19 +08:00 |
|
|
|
6a9780369c
|
demand: 账单导出：在客户账单管理模块中，当选择海运相关运单时，系统要支持上述模版导出，导出的账单表格要包含提单号、面单号、贵司编号（如没有填，输出为空）、起运港、目的港、箱量、件数、毛重、体积、费用名称、币种、金额
committer: heyu
|
2025-04-09 13:46:15 +08:00 |
|
linfso
|
c70bc5a14a
|
md
|
2025-04-07 16:07:18 +08:00 |
|
linfso
|
b4473b1e1d
|
md
|
2025-04-07 12:59:35 +08:00 |
|
linfso
|
0654dcdab6
|
md
|
2025-04-01 07:39:12 +08:00 |
|
linfso
|
58141603bb
|
md
|
2025-03-31 11:09:16 +08:00 |
|
linfso
|
5c1c308698
|
md
|
2025-03-16 22:49:41 +08:00 |
|
linfso
|
37d86b2053
|
md
|
2025-03-16 21:19:24 +08:00 |
|
linfso
|
729be25a12
|
md
|
2025-03-16 20:48:44 +08:00 |
|
linfso
|
6a52a82e5f
|
md
|
2025-03-16 20:26:15 +08:00 |
|
linfso
|
6feab7ee97
|
md
|
2025-03-16 19:28:20 +08:00 |
|
linfso
|
dfb63e5614
|
md
|
2025-03-16 11:35:50 +08:00 |
|
linfso
|
877a754f48
|
md
|
2025-03-16 11:11:39 +08:00 |
|
linfso
|
708297d244
|
md
|
2025-03-16 10:44:15 +08:00 |
|
linfso
|
ac900593f1
|
md
|
2025-03-14 18:08:08 +08:00 |
|
linfso
|
cb89088c1d
|
md
|
2025-03-13 16:53:51 +08:00 |
|
linfso
|
226dfe1ebf
|
md
|
2025-03-13 16:30:42 +08:00 |
|
linfso
|
13d7bf084b
|
md
|
2025-03-12 08:21:29 +08:00 |
|
linfso
|
f8e68d0929
|
md
|
2025-03-11 10:08:11 +08:00 |
|
linfso
|
ae3c354d5d
|
md
|
2025-03-09 00:26:34 +08:00 |
|
linfso
|
1dcbf87876
|
md
|
2025-03-08 20:51:29 +08:00 |
|
linfso
|
c4cfa683ba
|
md
|
2025-03-06 19:04:34 +08:00 |
|
linfso
|
9c3f77a882
|
md
|
2025-03-06 18:55:12 +08:00 |
|
linfso
|
05bb3819c2
|
md
|
2025-03-02 21:05:52 +08:00 |
|
linfso
|
6f392e31cb
|
md
|
2025-02-24 10:22:39 +08:00 |
|
linfso
|
b0920222d2
|
md
|
2025-02-23 23:06:47 +08:00 |
|
linfso
|
2bc22c6276
|
md
|
2025-02-23 17:20:11 +08:00 |
|
linfso
|
e5891ef1e1
|
md
|
2025-02-23 16:32:34 +08:00 |
|
linfso
|
cf86312fb5
|
md
|
2025-02-23 16:28:41 +08:00 |
|
linfso
|
276f04e9f0
|
md
|
2025-02-23 16:10:23 +08:00 |
|
linfso
|
36c395138b
|
md
|
2025-02-23 15:30:04 +08:00 |
|
linfso
|
99684ab180
|
md
|
2025-02-23 09:54:32 +08:00 |
|
linfso
|
af17f2a9e7
|
md
|
2025-02-22 23:41:30 +08:00 |
|
linfso
|
51c6bfcb09
|
md
|
2025-02-22 22:48:54 +08:00 |
|
linfso
|
1fc01ac345
|
md
|
2025-02-22 22:43:39 +08:00 |
|
linfso
|
a5a7df5787
|
md
|
2025-02-22 22:34:48 +08:00 |
|
linfso
|
94d52df243
|
md
|
2025-02-22 18:51:27 +08:00 |
|
linfso
|
e02a4fa5b1
|
md
|
2025-02-22 18:42:18 +08:00 |
|
linfso
|
b0b3fae096
|
md
|
2025-02-17 19:45:02 +08:00 |
|
linfso
|
bf912f8ffc
|
md
|
2025-02-14 12:00:33 +08:00 |
|
linfso
|
3980671e05
|
md
|
2025-02-14 10:18:13 +08:00 |
|
linfso
|
eb5839116c
|
md
|
2025-01-22 14:58:29 +08:00 |
|
linfso
|
51f7c41b40
|
md
|
2025-01-21 17:50:33 +08:00 |
|
linfso
|
ae0e6bb8bc
|
md
|
2025-01-21 13:58:48 +08:00 |
|
linfso
|
02e22c023d
|
md
|
2025-01-21 13:51:43 +08:00 |
|
linfso
|
4de8ff6f4d
|
md
|
2025-01-21 00:46:16 +08:00 |
|
linfso
|
7ba834da0f
|
md
|
2025-01-20 16:43:51 +08:00 |
|
linfso
|
27dbd18422
|
md
|
2025-01-17 08:07:23 +08:00 |
|
linfso
|
c44987dc8a
|
md
|
2025-01-17 07:52:18 +08:00 |
|
linfso
|
d43922dd87
|
md
|
2025-01-14 10:21:10 +08:00 |
|
linfso
|
d87b987b66
|
md
|
2025-01-14 09:11:20 +08:00 |
|
linfso
|
cf51391fd6
|
md
|
2025-01-10 16:11:49 +08:00 |
|
linfso
|
38b317a07d
|
md
|
2025-01-09 15:07:30 +08:00 |
|
linfso
|
8836fe091a
|
md
|
2025-01-06 16:35:10 +08:00 |
|
linfso
|
6b3781aafd
|
md
|
2025-01-06 11:49:01 +08:00 |
|
linfso
|
007d67e77c
|
md
|
2025-01-06 11:18:01 +08:00 |
|
linfso
|
2f091cef12
|
md
|
2025-01-06 05:51:16 +08:00 |
|
linfso
|
9216d20143
|
md
|
2025-01-05 22:03:01 +08:00 |
|
linfso
|
243bd9c91b
|
md
|
2025-01-05 21:49:44 +08:00 |
|
linfso
|
9065cfc4d2
|
md
|
2025-01-05 21:33:40 +08:00 |
|
