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 |
|
|
|
42d6cd077f
|
demand: 航线开票记录自测bug
committer: heyu
|
2025-05-23 16:54:51 +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 |
|
|
|
40a30b5cb8
|
demand: TMS系统 - 客户账单管理 - 航信开票记录 - 新增加“定制导出” 详细查看附件。
committer: heyu
|
2025-05-20 17:06:28 +08:00 |
|
linfso
|
0f4e5a505f
|
md
|
2025-05-20 10:46:44 +08:00 |
|
linfso
|
4f5eb76f33
|
md
|
2025-05-20 09:50:02 +08:00 |
|
linfso
|
2fc9d73e31
|
md
|
2025-05-19 18:04:47 +08:00 |
|
linfso
|
befe309816
|
md
|
2025-05-18 00:26:27 +08:00 |
|
linfso
|
3d0bd120f7
|
md
|
2025-05-18 00:04:48 +08:00 |
|
linfso
|
662038862f
|
md
|
2025-05-18 00:02:57 +08:00 |
|
smshen
|
0ada0ca446
|
Merge pull request 'develop' (#26) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/26
|
2025-05-17 14:17:16 +08:00 |
|
linfso
|
02326cb40d
|
md
|
2025-05-16 20:32:23 +08:00 |
|
linfso
|
9a7b03b8ae
|
md
|
2025-05-16 20:22:23 +08:00 |
|
linfso
|
10fee5583f
|
md
|
2025-05-16 19:44:57 +08:00 |
|
linfso
|
7edad142c1
|
md
|
2025-05-16 15:55:16 +08:00 |
|
linfso
|
afaef99dcc
|
md
|
2025-05-16 15:47:32 +08:00 |
|
linfso
|
d6b8d8b596
|
md
|
2025-05-16 15:40:05 +08:00 |
|
linfso
|
8ed6ac6506
|
md
|
2025-05-16 15:33:21 +08:00 |
|
linfso
|
c16accd640
|
md
|
2025-05-16 15:19:02 +08:00 |
|
linfso
|
33dc7e58d5
|
md
|
2025-05-16 15:15:08 +08:00 |
|
|
|
61bcf29a97
|
demand: 新增定时任务扫描记录表,定时扫描任务优化
committer: heyu
|
2025-05-16 11:08:44 +08:00 |
|
linfso
|
9fe8760a09
|
md
|
2025-05-15 19:52:58 +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
|
60ebf5215e
|
md
|
2025-05-14 03:47:53 +08:00 |
|
linfso
|
f8b40d4718
|
md
|
2025-05-13 19:43:20 +08:00 |
|
linfso
|
369cd90e66
|
md
|
2025-05-13 19:40:30 +08:00 |
|
linfso
|
ae0b09db47
|
md
|
2025-05-13 19:35:17 +08:00 |
|
linfso
|
9981d13642
|
md
|
2025-05-13 19:21:09 +08:00 |
|
smshen
|
58bee0de44
|
Merge pull request 'demand: 现金/月结客户额度临时额度查询/过滤调整' (#24) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/24
|
2025-05-13 18:28:36 +08:00 |
|
|
|
c8e7921fc1
|
demand: 现金/月结客户额度临时额度查询/过滤调整
committer: heyu
|
2025-05-13 18:14:55 +08:00 |
|
linfso
|
20fcc7ed60
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-05-13 14:08:09 +08:00 |
|
linfso
|
45278333b4
|
md
|
2025-05-13 14:08:02 +08:00 |
|
|
|
a983c455bc
|
demand: TMS系统 - 客户账单管理 - 航信开票记录 - 界面优化如下图所示
committer: heyu
|
2025-05-13 10:02:42 +08:00 |
|
|
|
e9fccff6dd
|
demand: TMS系统 - 客户账单管理 - 航信开票记录 - 界面优化如下图所示
committer: heyu
|
2025-05-12 17:52:30 +08:00 |
|
|
|
96b1f12a40
|
demand: TMS系统 - 客户账单管理 - 航信开票记录 - 界面优化如下图所示
committer: heyu
|
2025-05-12 17:00:15 +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 |
|
linfso
|
beb213a53b
|
md
|
2025-05-11 12:34:38 +08:00 |
|
linfso
|
38a642610c
|
md
|
2025-05-11 11:17:42 +08:00 |
|
|
|
a50f333e4c
|
demand: 定时扫描运单组批次,漏组批次管理页面
committer: heyu
|
2025-05-09 17:32:01 +08:00 |
|
linfso
|
1ce2938ed8
|
md
|
2025-05-08 16:11:17 +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 |
|
linfso
|
2143f13d51
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-05-08 02:10:47 +08:00 |
|
linfso
|
205803ab95
|
md
|
2025-05-08 02:10:06 +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
|
af44502b1d
|
md
|
2025-05-07 14:43:03 +08:00 |
|
linfso
|
873cdfbe7d
|
md
|
2025-05-07 14:38:30 +08:00 |
|
smshen
|
53eac627bb
|
Merge pull request 'demand: 海运账单mapper格式修改' (#15) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/15
|
2025-05-07 14:08:47 +08:00 |
|
|
|
1b87708e30
|
demand: 海运账单mapper格式修改
committer: heyu
|
2025-05-07 14:07:46 +08:00 |
|
smshen
|
00d8c4e100
|
Merge pull request 'demand: 海运账单起运港目的港导出名称' (#14) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/14
|
2025-05-07 13:53:50 +08:00 |
|
linfso
|
6aefe0bb24
|
md
|
2025-05-07 13:52:59 +08:00 |
|
|
|
7ff25d2de6
|
demand: 海运账单起运港目的港导出名称
committer: heyu
|
2025-05-07 13:25:55 +08:00 |
|
linfso
|
88c33e4e8d
|
md
|
2025-05-07 10:34:18 +08:00 |
|
linfso
|
a0c081118f
|
md
|
2025-05-07 09:34:57 +08:00 |
|
linfso
|
495f75b4bc
|
md
|
2025-05-07 08:12:41 +08:00 |
|
linfso
|
8a1b1544b8
|
md
|
2025-05-07 07:42:17 +08:00 |
|
linfso
|
fe4618d6db
|
md
|
2025-05-07 07:18:57 +08:00 |
|
linfso
|
6f9d159dce
|
md
|
2025-05-07 06:56:24 +08:00 |
|
linfso
|
beaa4cbb95
|
md
|
2025-05-07 06:40:40 +08:00 |
|
linfso
|
1d41a4b1fa
|
md
|
2025-05-06 14:57:20 +08:00 |
|
linfso
|
3d2f73554c
|
md
|
2025-05-06 13:01:19 +08:00 |
|
linfso
|
7439f1a0fc
|
md
|
2025-05-06 08:35:40 +08:00 |
|
linfso
|
62795f1c49
|
md
|
2025-05-06 08:20:01 +08:00 |
|
linfso
|
d793366317
|
md
|
2025-05-06 08:00:20 +08:00 |
|
linfso
|
9151b2cdd2
|
md
|
2025-05-06 05:52:05 +08:00 |
|
linfso
|
de2035866d
|
md
|
2025-05-05 20:01:55 +08:00 |
|
linfso
|
7fbf667897
|
md
|
2025-05-05 19:44:56 +08:00 |
|
linfso
|
695d1f0901
|
md
|
2025-05-05 19:43:53 +08:00 |
|
linfso
|
0e98328a0b
|
md
|
2025-05-05 18:05:10 +08:00 |
|
linfso
|
f776024f02
|
md
|
2025-05-05 15:48:05 +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
|
952b06caf0
|
md
|
2025-05-05 09:22:24 +08:00 |
|
linfso
|
40af6e50fe
|
md
|
2025-05-05 08:34:08 +08:00 |
|
|
|
c93db40daf
|
demand: 1.超期额度计算时间规则只取天数（不精确到时分秒），2.小数点去除问题修复
committer: heyu
|
2025-04-30 14:57:43 +08:00 |
|
|
|
f6a07a41b9
|
demand: 获取查询统计信息适应账期内/超期额度
committer: heyu
|
2025-04-30 11:11:17 +08:00 |
|
|
|
665f42e90c
|
demand: 临时额度bug修改
committer: heyu
|
2025-04-29 15:12:01 +08:00 |
|
|
|
eb05fe19bd
|
demand: 查询海运网点列表接口能根据名称过滤
committer: heyu
|
2025-04-29 09:14:46 +08:00 |
|
smshen
|
3c7c818a7c
|
Merge branch 'master' into develop
|
2025-04-28 17:11:02 +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 |
|
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
|
b086583c45
|
md
|
2025-04-24 12:27: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 |
|
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 |
|
|
|
86d3d5d74c
|
demand: 临时额度界面自测微调
committer: heyu
|
2025-04-17 17:19:16 +08:00 |
|
|
|
7bb93abc47
|
demand: 1.新增月结客户临时额度操作界面，增加增删改查操 作，月结客户额度操作界面查询返回增加临时额度
2.运单录入、运单修改等界面销售额度计算逻辑适应临时额度调整
committer: heyu
|
2025-04-17 14:07:52 +08:00 |
|
|
|
6d879fceb6
|
demand: 客户管理新增现金客户临时额度操作界面对应增删改查逻辑，现金额度管理查询额度列表新增查询临时额度对应逻辑处理
committer: heyu
|
2025-04-16 19:06:29 +08:00 |
|
|
|
92438e9d16
|
demand: 已使用额度细分两个字段，一个是超期额度，一个账期内额度。双击需要显示具体明细。
committer: heyu
|
2025-04-11 17:17:19 +08:00 |
|
|
|
519cfbaf96
|
demand: 新增字段需要展现在寄件运单查询、派件运单查询、运单修改、快件跟踪（运单信息）、网点费用申请、财务中心费用审核、业务出账确认、业务账单确认、客户账单查询。
committer: heyu
|
2025-04-09 17:33:03 +08:00 |
|
linfso
|
14fa1380ca
|
md
|
2025-04-09 17:32:36 +08:00 |
|
|
|
6a9780369c
|
demand: 账单导出：在客户账单管理模块中，当选择海运相关运单时，系统要支持上述模版导出，导出的账单表格要包含提单号、面单号、贵司编号（如没有填，输出为空）、起运港、目的港、箱量、件数、毛重、体积、费用名称、币种、金额
committer: heyu
|
2025-04-09 13:46:15 +08:00 |
|
|
|
a6f3454a48
|
demand: 新增字段：提单号（记录海运提单信息）、贵司编号（记录相关业务的贵司编号）、起运港（关联网点表）、目的港（关联网点表）、箱量。加在运单录入界面。
committer: heyu
|
2025-04-02 17:21:19 +08:00 |
|
|
|
864cc35107
|
demand: 需要新增成本录入状态，需要可以导出并且查看哪些组批次是已经进行成本录入的，哪些组批次是未进行成本录入的
committer: heyu
|
2025-04-01 10:41:37 +08:00 |
|
linfso
|
3c6bab1279
|
md
|
2025-04-01 09:20:40 +08:00 |
|
linfso
|
af09f65f71
|
md
|
2025-04-01 09:17:52 +08:00 |
|
linfso
|
56a403da6a
|
md
|
2025-04-01 09:14:00 +08:00 |
|
linfso
|
5c78a388e9
|
md
|
2025-04-01 09:07:35 +08:00 |
|
linfso
|
116672837b
|
md
|
2025-04-01 07:56:23 +08:00 |
|
linfso
|
0654dcdab6
|
md
|
2025-04-01 07:39:12 +08:00 |
|
linfso
|
af07178e6c
|
md
|
2025-03-31 12:32:05 +08:00 |
|
linfso
|
94e455b7de
|
md
|
2025-03-31 11:32:54 +08:00 |
|
linfso
|
58141603bb
|
md
|
2025-03-31 11:09:16 +08:00 |
|
linfso
|
b85007c561
|
md
|
2025-03-31 10:52:07 +08:00 |
|
linfso
|
baeea90f1d
|
md
|
2025-03-31 10:37:37 +08:00 |
|
linfso
|
f2ca4a90b1
|
md
|
2025-03-28 06:49:56 +08:00 |
|
linfso
|
6f4f5125cf
|
md
|
2025-03-21 10:04:16 +08:00 |
|
linfso
|
4dc37fbb0a
|
md
|
2025-03-20 16:11:38 +08:00 |
|
linfso
|
930bd307cb
|
md
|
2025-03-20 16:10:02 +08:00 |
|
linfso
|
d0ecfd5db4
|
md
|
2025-03-19 10:48:07 +08:00 |
|
linfso
|
5757aeb4cb
|
md
|
2025-03-18 11:03:03 +08:00 |
|
linfso
|
645c2ec657
|
md
|
2025-03-18 10:30:18 +08:00 |
|
linfso
|
fe46043f9e
|
md
|
2025-03-17 19:28:30 +08:00 |
|
linfso
|
413643c967
|
md
|
2025-03-17 19:08:46 +08:00 |
|
linfso
|
067c4be61a
|
md
|
2025-03-17 17:38:19 +08:00 |
|
linfso
|
dd45dd8756
|
md
|
2025-03-17 17:21:57 +08:00 |
|
linfso
|
34433d58fb
|
md
|
2025-03-17 17:13:56 +08:00 |
|
linfso
|
5d610b20f1
|
md
|
2025-03-17 09:37:25 +08:00 |
|
linfso
|
bd8a0bc110
|
md
|
2025-03-17 09:29:19 +08:00 |
|
linfso
|
97f3bc7e9e
|
md
|
2025-03-17 09:03:27 +08:00 |
|
linfso
|
bdf5dfce7b
|
md
|
2025-03-16 23:55:04 +08:00 |
|
linfso
|
39f957c596
|
md
|
2025-03-16 23:54:10 +08:00 |
|
linfso
|
4cb1e03459
|
md
|
2025-03-16 23:51:10 +08:00 |
|
linfso
|
772b60dc0f
|
md
|
2025-03-16 23:50:22 +08:00 |
|
linfso
|
4607ee7f63
|
md
|
2025-03-16 23:43:01 +08:00 |
|
linfso
|
76a6bc7c25
|
md
|
2025-03-16 23:21:34 +08:00 |
|
linfso
|
30d50b0231
|
md
|
2025-03-16 23:13:11 +08:00 |
|
linfso
|
0496510689
|
md
|
2025-03-16 23:01:39 +08:00 |
|
linfso
|
4d8403b437
|
md
|
2025-03-16 22:52:45 +08:00 |
|
linfso
|
49429945e3
|
md
|
2025-03-16 22:09:03 +08:00 |
|
