heyu
|
e67ffd66d5
|
Merge pull request 'develop' (#46) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/46
|
2025-06-07 17:15:26 +08:00 |
|
|
|
4b9764efa0
|
demand:1.新增客户秘钥管理界面增删改查接口 2.新增客户对接tms下单接口
committer: heyu
|
2025-06-07 17:03:14 +08:00 |
|
heyu
|
080defd184
|
Merge pull request 'develop' (#45) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/45
|
2025-06-05 14:23:45 +08:00 |
|
|
|
b220c5a40a
|
demand: 1.定时任务批量更新新提成统计某月统计数据为空时不会更新金额bug修复 2.根据单号重新计算提成增加校验问题件及支付方式相关场景
committer: heyu
|
2025-06-05 14:17:16 +08:00 |
|
|
|
6d06ca6fcc
|
demand: 问题件登记、运单修改、运单录入、网点费用申请等相关场景下触发提成重算
committer: heyu
|
2025-06-04 09:57:56 +08:00 |
|
|
|
be6e3279d1
|
demand: 航线查询不支持按账单号查询bug修复，航线查询/导出支持按多个运单号/账单号查询/导出
committer: heyu
|
2025-06-03 11:45:21 +08:00 |
|
linfso
|
fa78be9f46
|
md
|
2025-05-30 19:53:43 +08:00 |
|
linfso
|
2a9f0f6078
|
md
|
2025-05-30 08:14:27 +08:00 |
|
linfso
|
ca29695c77
|
md
|
2025-05-30 08:01:16 +08:00 |
|
linfso
|
034ad477ce
|
md
|
2025-05-30 07:09:38 +08:00 |
|
linfso
|
4e477336da
|
md
|
2025-05-29 19:12:50 +08:00 |
|
linfso
|
68e6ebc416
|
md
|
2025-05-29 19:03:46 +08:00 |
|
linfso
|
8cb2a6012b
|
md
|
2025-05-29 17:51:10 +08:00 |
|
linfso
|
bb2e950338
|
md
|
2025-05-29 17:39:55 +08:00 |
|
linfso
|
eb78a46cd0
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-05-29 17:22:32 +08:00 |
|
linfso
|
97f0b26b2d
|
md
|
2025-05-29 17:22:20 +08:00 |
|
heyu
|
b02453b134
|
Merge pull request 'demand: 航线查询/导出按财务要求调整' (#44) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/44
|
2025-05-29 17:08:01 +08:00 |
|
|
|
94f31075dd
|
demand: 航线查询/导出按财务要求调整
committer: heyu
|
2025-05-29 17:07:29 +08:00 |
|
heyu
|
5e7aca0701
|
Merge pull request 'demand: TMS系统 - 客户账单管理 - 收款信息查询 - 缴款客户是必填项，但是此界面显示的缴款客户为空呢' (#43) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/43
|
2025-05-29 14:23:29 +08:00 |
|
|
|
1e2f0fea17
|
demand: TMS系统 - 客户账单管理 - 收款信息查询 - 缴款客户是必填项，但是此界面显示的缴款客户为空呢
committer: heyu
|
2025-05-29 14:22:33 +08:00 |
|
heyu
|
d25cfd7144
|
Merge pull request 'demand:检查月结客户首次签约日期bug修改' (#42) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/42
|
2025-05-28 13:27:02 +08:00 |
|
|
|
90357b26ee
|
demand:检查月结客户首次签约日期bug修改
committer: heyu
|
2025-05-28 13:26:19 +08:00 |
|
heyu
|
780868584e
|
Merge pull request 'develop' (#41) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/41
|
2025-05-28 10:54:06 +08:00 |
|
|
|
31259ec806
|
demand:TMS系统-运单录入限制：寄件国家和目的国家需要和所选线路一致
committer: heyu
|
2025-05-28 10:52:56 +08:00 |
|
|
|
db4e658ec1
|
demand:TMS-现金核销界面/月结核销界面/发票收款界面新增限制交易/退款时间不能早于当天
committer: heyu
|
2025-05-27 18:58:44 +08:00 |
|
|
|
ace2a5034d
|
demand:TMS-现金核销界面/月结核销界面/发票收款界面新增限制交易时间不能早于当天
committer: heyu
|
2025-05-27 18:49:21 +08:00 |
|
|
|
ec274798ed
|
demand:报价管理页面新增批量修改报价接口
committer: heyu
|
2025-05-27 16:55:59 +08:00 |
|
smshen
|
f46fa4eec8
|
Merge pull request 'demand:定制导出性能优化' (#40) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/40
|
2025-05-27 15:46:34 +08:00 |
|
|
|
9d911d5db5
|
demand:定制导出性能优化
committer: heyu
|
2025-05-27 14:21:58 +08:00 |
|
smshen
|
46407a5996
|
Merge pull request 'demand:1.定制导出排除废弃的发票 2.定制导出修改业务员取值' (#39) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/39
|
2025-05-27 09:07:56 +08:00 |
|
|
|
5c2bad4ef5
|
demand:1.定制导出排除废弃的发票 2.定制导出修改业务员取值
committer: heyu
|
2025-05-26 18:57:40 +08:00 |
|
smshen
|
9f23967fb8
|
Merge pull request 'demand: 保留原sql重起一个sql' (#38) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/38
|
2025-05-26 15:39:15 +08:00 |
|
|
|
c36991ea41
|
demand: 保留原sql重起一个sql
committer: heyu
|
2025-05-26 15:34:00 +08:00 |
|
smshen
|
cdbae36910
|
Merge pull request 'demand: 保留原sql重起一个sql' (#37) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/37
|
2025-05-26 14:50:53 +08:00 |
|
|
|
610fa64dfa
|
demand: 保留原sql重起一个sql
committer: heyu
|
2025-05-26 14:49:45 +08:00 |
|
smshen
|
daf6940784
|
Merge pull request 'demand: 保留原sql重起一个sql' (#35) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/35
|
2025-05-26 14:43:30 +08:00 |
|
|
|
883099679a
|
demand: 保留原sql重起一个sql
committer: heyu
|
2025-05-26 14:41:38 +08:00 |
|
smshen
|
da2b20951c
|
Merge pull request 'demand: 1.TMS系统-网点费用申请：费用申请，审批修改回款联系人，当被修改的回款联系人额度不足的时候应该无法修改 2.新增判断：网点费用申请/运单修改界面修改月结的时候需要判断一下…' (#34) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/34
|
2025-05-26 13:40:06 +08:00 |
|
|
|
e544d35378
|
demand: 1.TMS系统-网点费用申请：费用申请，审批修改回款联系人，当被修改的回款联系人额度不足的时候应该无法修改 2.新增判断：网点费用申请/运单修改界面修改月结的时候需要判断一下这个运单是首次签约之前开的还是之后开的，之前开的就不允许修改
committer: heyu
|
2025-05-26 13:34:16 +08:00 |
|
smshen
|
f32b16ea02
|
Merge pull request 'develop' (#33) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/33
|
2025-05-26 13:29:11 +08:00 |
|
|
|
b9b65f0838
|
demand: 1.TMS系统-网点费用申请：费用申请，审批修改回款联系人，当被修改的回款联系人额度不足的时候应该无法修改 2.新增判断：网点费用申请/运单修改界面修改月结的时候需要判断一下这个运单是首次签约之前开的还是之后开的，之前开的就不允许修改
committer: heyu
|
2025-05-26 13:20:57 +08:00 |
|
|
|
42d6cd077f
|
demand: 航线开票记录自测bug
committer: heyu
|
2025-05-23 16:54:51 +08:00 |
|
smshen
|
ac12147a3a
|
Merge pull request 'demand: 航线开票记录查询、导出、定制导出性能优化' (#32) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/32
|
2025-05-23 16:12:14 +08:00 |
|
|
|
d5404feec8
|
demand: 航线开票记录查询、导出、定制导出性能优化
committer: heyu
|
2025-05-23 14:41:19 +08:00 |
|
linfso
|
6a7b78424f
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-05-23 14:25:32 +08:00 |
|
linfso
|
20b3f1b7bf
|
md
|
2025-05-23 14:25:24 +08:00 |
|
|
|
c9f50691ca
|
demand: 网点费用申请/运单修改界面修改月结的时候需要判断一下这个运单是首次签约之前开的还是之后开的，之前开的就不允许修改
committer: heyu
|
2025-05-22 14:29:04 +08:00 |
|
|
|
4ae68d2310
|
Merge branch 'develop' of http://git.xdadan.loc/tanex/emis-service into develop
# Conflicts:
# emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
|
2025-05-22 14:02:45 +08:00 |
|
|
|
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 |
|
linfso
|
0f4e5a505f
|
md
|
2025-05-20 10:46:44 +08:00 |
|
linfso
|
4f5eb76f33
|
md
|
2025-05-20 09:50:02 +08:00 |
|
linfso
|
75ea8c1cce
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-05-19 18:04:53 +08:00 |
|
linfso
|
2fc9d73e31
|
md
|
2025-05-19 18:04:47 +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 |
|
linfso
|
befe309816
|
md
|
2025-05-18 00:26:27 +08:00 |
|
linfso
|
3d0bd120f7
|
md
|
2025-05-18 00:04:48 +08:00 |
|
linfso
|
662038862f
|
md
|
2025-05-18 00:02:57 +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 |
|
linfso
|
02326cb40d
|
md
|
2025-05-16 20:32:23 +08:00 |
|
linfso
|
9a7b03b8ae
|
md
|
2025-05-16 20:22:23 +08:00 |
|
linfso
|
10fee5583f
|
md
|
2025-05-16 19:44:57 +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
|
7edad142c1
|
md
|
2025-05-16 15:55:16 +08:00 |
|
linfso
|
afaef99dcc
|
md
|
2025-05-16 15:47:32 +08:00 |
|
linfso
|
d6b8d8b596
|
md
|
2025-05-16 15:40:05 +08:00 |
|
linfso
|
8ed6ac6506
|
md
|
2025-05-16 15:33:21 +08:00 |
|
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 |
|
