Commit Graph

1549 Commits

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