Commit Graph

2295 Commits

Author SHA1 Message Date
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
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
c4bc4266a3 md 2025-05-14 14:22:08 +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
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
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
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
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
linfso
38a642610c md 2025-05-11 11:17:42 +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
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
linfso
da51cd4691 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-05-07 14:21:23 +08:00
linfso
b0d39b8e13 md 2025-05-07 14:21:17 +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
73e9c67b88 md 2025-05-07 09:58:30 +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
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
linfso
c60525ffcf Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-05-06 13:01:26 +08:00
linfso
3d2f73554c md 2025-05-06 13:01:19 +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
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
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
ae6cbc46dc md 2025-05-05 13:01:44 +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
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