Commit Graph

1245 Commits

Author SHA1 Message Date
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