Commit Graph

1596 Commits

Author SHA1 Message Date
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
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
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
318e635cce demand: 定时扫描任务优化
committer: heyu
2025-05-16 17:59:43 +08:00
linfso
2c9ef3a359 md 2025-05-16 17:17:46 +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
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
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
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
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