|
|
259de46812
|
demand: 网点费用申请/运单修改界面修改月结的时候需要判断一下这个运单是首次签约之前开的还是之后开的，之前开的就不允许修改
committer: heyu
|
2025-05-22 14:00:58 +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 |
|
smshen
|
2351a1985a
|
Merge pull request 'demand: 销售可通过下单后修改销售联系人绕过额度校验bug修复' (#27) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/27
|
2025-05-19 16:37:49 +08:00 |
|
|
|
2a0888cfec
|
demand: 销售可通过下单后修改销售联系人绕过额度校验bug修复
committer: heyu
|
2025-05-19 16:34:39 +08:00 |
|
linfso
|
6c4af74f31
|
md
|
2025-05-18 23:46:43 +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 |
|
|
|
006d7d4a73
|
demand: 销售可通过下单后修改销售联系人绕过额度校验bug修复
committer: heyu
|
2025-05-17 14:02:44 +08:00 |
|
|
|
acb0494fe7
|
demand: 销售可通过下单后修改销售联系人绕过额度校验bug修复
committer: heyu
|
2025-05-17 13:37:40 +08:00 |
|
linfso
|
6f3931c847
|
md
|
2025-05-17 11:22:41 +08:00 |
|
|
|
318e635cce
|
demand: 定时扫描任务优化
committer: heyu
|
2025-05-16 17:59:43 +08:00 |
|
linfso
|
2c9ef3a359
|
md
|
2025-05-16 17:17:46 +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
|
7ffe5d1c1a
|
md
|
2025-05-16 10:31:54 +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
|
ae783ac894
|
md
|
2025-05-14 13:15:00 +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
|
2d31146315
|
md
|
2025-05-13 19:22:25 +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
|
fb9ecef397
|
md
|
2025-05-13 17:42:16 +08:00 |
|
linfso
|
6d71078e46
|
md
|
2025-05-13 17:33:36 +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 |
|
|
|
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
|
086eacc5e2
|
md
|
2025-05-12 11:56:18 +08:00 |
|
linfso
|
70f4fba5fb
|
md
|
2025-05-12 11:55:32 +08:00 |
|
linfso
|
357c29d7ce
|
md
|
2025-05-11 12:35:16 +08:00 |
|
linfso
|
beb213a53b
|
md
|
2025-05-11 12:34:38 +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
|
85b62e8a96
|
md
|
2025-05-08 16:30:05 +08:00 |
|
linfso
|
4705cf91bd
|
md
|
2025-05-08 16:16:44 +08:00 |
|
linfso
|
1ce2938ed8
|
md
|
2025-05-08 16:11:17 +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 |
|
|
|
ea5367efb9
|
demand: 导出进仓详情bug修改
committer: heyu
|
2025-05-08 10:41:05 +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
|
b0d39b8e13
|
md
|
2025-05-07 14:21:17 +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 |
|
|
|
7ff25d2de6
|
demand: 海运账单起运港目的港导出名称
committer: heyu
|
2025-05-07 13:25:55 +08:00 |
|
linfso
|
88c33e4e8d
|
md
|
2025-05-07 10:34:18 +08:00 |
|
linfso
|
73e9c67b88
|
md
|
2025-05-07 09:58:30 +08:00 |
|
linfso
|
a0c081118f
|
md
|
2025-05-07 09:34:57 +08:00 |
|
linfso
|
beaa4cbb95
|
md
|
2025-05-07 06:40:40 +08:00 |
|
smshen
|
bcc893ce15
|
Merge pull request 'demand: 修改现金客户额度触发定时任务' (#13) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/13
|
2025-05-06 14:34:44 +08:00 |
|
|
|
4b5aa4b9b3
|
demand: 修改现金客户额度触发定时任务
committer: heyu
|
2025-05-06 14:21:21 +08:00 |
|
smshen
|
d55610ebd0
|
Merge pull request 'demand: 运单批量录入回款/销售联系人校验bug修复' (#12) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/12
|
2025-05-06 13:36:11 +08:00 |
|
linfso
|
513e82c36a
|
md
|
2025-05-06 13:13:11 +08:00 |
|
|
|
f3c29f0c5d
|
demand: 运单批量录入回款/销售联系人校验bug修复
committer: heyu
|
2025-05-06 13:05:45 +08:00 |
|
smshen
|
714300681a
|
Merge pull request 'demand: 运单批量录入不直接回款/销售联系人校验bug修复' (#11) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/11
|
2025-05-06 12:45:57 +08:00 |
|
linfso
|
62795f1c49
|
md
|
2025-05-06 08:20:01 +08:00 |
|
linfso
|
d793366317
|
md
|
2025-05-06 08:00:20 +08:00 |
|
|
|
1079d6a9e1
|
demand: 运单批量录入不直接回款/销售联系人校验bug修复
committer: heyu
|
2025-05-05 18:43:34 +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
|
51164a0fb9
|
md
|
2025-05-05 15:07:57 +08:00 |
|
linfso
|
5a0168a9de
|
md
|
2025-05-05 14:30:39 +08:00 |
|
linfso
|
29439280bd
|
md
|
2025-05-05 09:59:37 +08:00 |
|
linfso
|
3472c84596
|
账单合并收款
|
2025-05-05 09:57:06 +08:00 |
|
linfso
|
952b06caf0
|
md
|
2025-05-05 09:22:24 +08:00 |
|
linfso
|
40af6e50fe
|
md
|
2025-05-05 08:34:08 +08:00 |
|
linfso
|
373d8ed225
|
md
|
2025-04-30 16:49:35 +08:00 |
|
linfso
|
690e4c90ba
|
md
|
2025-04-30 16:48:10 +08:00 |
|
linfso
|
89edee10a3
|
md
|
2025-04-30 15:52:03 +08:00 |
|
smshen
|
f1ea61609e
|
Merge pull request 'demand: 1.超期额度计算时间规则只取天数（不精确到时分秒），2.小数点去除问题修复' (#10) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/10
|
2025-04-30 15:05:53 +08:00 |
|
|
|
c93db40daf
|
demand: 1.超期额度计算时间规则只取天数（不精确到时分秒），2.小数点去除问题修复
committer: heyu
|
2025-04-30 14:57:43 +08:00 |
|
linfso
|
655d271dd1
|
md
|
2025-04-30 12:32:31 +08:00 |
|
linfso
|
9310e1f12b
|
md
|
2025-04-30 12:30:42 +08:00 |
|
linfso
|
8bc304ce64
|
md
|
2025-04-30 12:28:39 +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 |
|
|
|
7f2beeeb63
|
update .gitignore
|
2025-04-25 15:55:08 +08:00 |
|
|
|
0dd8f7f99a
|
demand: 海运账单bug修改
committer: heyu
|
2025-04-25 15:49:56 +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 |
|
|
|
0648f44ccc
|
demand: 海运账单bug修改
committer: heyu
|
2025-04-24 18:18:36 +08:00 |
|
linfso
|
13ce8f8fc2
|
md
|
2025-04-24 13:03:14 +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
|
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 |
|
|
|
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 |
|
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 |
|
|
|
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
|
af07178e6c
|
md
|
2025-03-31 12:32:05 +08:00 |
|
linfso
|
6186f39767
|
md
|
2025-03-31 11:25:28 +08:00 |
|
linfso
|
131a5d4b53
|
md
|
2025-03-31 10:39:12 +08:00 |
|
linfso
|
9367dac479
|
md
|
2025-03-28 15:18:46 +08:00 |
|
linfso
|
cabfe79b4d
|
md
|
2025-03-28 09:14:08 +08:00 |
|
linfso
|
b7ccdd1d90
|
md
|
2025-03-28 09:10:31 +08:00 |
|
linfso
|
325c6f3695
|
md
|
2025-03-28 09:07:22 +08:00 |
|
linfso
|
b8fa82b6a2
|
md
|
2025-03-28 07:15:49 +08:00 |
|
linfso
|
f2ca4a90b1
|
md
|
2025-03-28 06:49:56 +08:00 |
|
linfso
|
29324868b2
|
md
|
2025-03-25 16:29:38 +08:00 |
|
linfso
|
436e57f726
|
md
|
2025-03-24 13:08:14 +08:00 |
|
linfso
|
1bc637aa40
|
md
|
2025-03-21 10:14:35 +08:00 |
|
linfso
|
fb37150beb
|
md
|
2025-03-21 10:05:28 +08:00 |
|
linfso
|
6f4f5125cf
|
md
|
2025-03-21 10:04:16 +08:00 |
|
linfso
|
130248d260
|
md
|
2025-03-19 11:54:22 +08:00 |
|
linfso
|
284e1ac289
|
md
|
2025-03-19 11:02:00 +08:00 |
|
linfso
|
d0ecfd5db4
|
md
|
2025-03-19 10:48:07 +08:00 |
|
linfso
|
e10a94bc92
|
md
|
2025-03-18 09:48:24 +08:00 |
|
linfso
|
de36958ff1
|
md
|
2025-03-18 09:46:07 +08:00 |
|
linfso
|
1152f0534c
|
md
|
2025-03-18 09:45:20 +08:00 |
|
linfso
|
413643c967
|
md
|
2025-03-17 19:08:46 +08:00 |
|
linfso
|
5d610b20f1
|
md
|
2025-03-17 09:37:25 +08:00 |
|
linfso
|
d97a1f41ff
|
md
|
2025-03-17 09:07:32 +08:00 |
|
linfso
|
97f3bc7e9e
|
md
|
2025-03-17 09:03:27 +08:00 |
|
linfso
|
76a6bc7c25
|
md
|
2025-03-16 23:21:34 +08:00 |
|
linfso
|
c50c66c552
|
md
|
2025-03-16 23:04:54 +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
|
5c1c308698
|
md
|
2025-03-16 22:49:41 +08:00 |
|
linfso
|
22c9b46a6d
|
md
|
2025-03-16 22:45:28 +08:00 |
|
linfso
|
c5ee4e3205
|
md
|
2025-03-16 22:41:32 +08:00 |
|
linfso
|
df91b619dc
|
md
|
2025-03-16 22:40:29 +08:00 |
|
linfso
|
c7973a7c0f
|
md
|
2025-03-16 22:39:58 +08:00 |
|
linfso
|
aabdb48d84
|
md
|
2025-03-16 22:36:43 +08:00 |
|
linfso
|
651b11cd96
|
md
|
2025-03-16 22:33:36 +08:00 |
|
linfso
|
cf73dde25a
|
md
|
2025-03-16 22:27:49 +08:00 |
|
