Commit Graph

2641 Commits

Author SHA1 Message Date
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
linfso
49f353a500 md 2025-05-08 15:25:07 +08:00
smshen
897b265198 Merge pull request 'demand: 计算时间范围内每一天账单总金额修改' (#19) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/19
2025-05-08 13:25:53 +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
linfso
86af5e9744 md 2025-05-08 10:38:54 +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
b2a7b9cd63 md 2025-05-06 13:16:23 +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