heyu
|
a7de130dc3
|
Merge pull request 'demand: 报价录入重复校验逻辑调整' (#92) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/92
|
2025-07-04 15:02:51 +08:00 |
|
|
|
9cb82154d9
|
demand: 报价录入重复校验逻辑调整
committer: heyu
|
2025-07-04 15:02:04 +08:00 |
|
linfso
|
a573ff1f9e
|
md
|
2025-07-04 14:55:22 +08:00 |
|
linfso
|
f7f6be2e6d
|
md
|
2025-07-04 14:10:04 +08:00 |
|
linfso
|
e0dc07848c
|
md
|
2025-07-04 13:51:46 +08:00 |
|
linfso
|
6c90a56582
|
md
|
2025-07-04 13:45:15 +08:00 |
|
heyu
|
3aa79c8f36
|
Merge pull request 'demand: 网点费用申请新增添加登记网点、登记人' (#91) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/91
|
2025-07-04 13:39:30 +08:00 |
|
|
|
a9053dd41c
|
demand: 网点费用申请新增添加登记网点、登记人
committer: heyu
|
2025-07-04 13:39:09 +08:00 |
|
linfso
|
7718fd3bab
|
md
|
2025-07-04 13:18:17 +08:00 |
|
linfso
|
a2f8e979d4
|
md
|
2025-07-04 13:16:44 +08:00 |
|
linfso
|
337b80807f
|
md
|
2025-07-04 13:03:46 +08:00 |
|
linfso
|
9803b59532
|
md
|
2025-07-04 12:45:40 +08:00 |
|
linfso
|
e7e28a440f
|
md
|
2025-07-04 11:41:23 +08:00 |
|
linfso
|
42979545fe
|
md
|
2025-07-04 10:22:18 +08:00 |
|
linfso
|
e841fc04c9
|
md
|
2025-07-04 10:03:56 +08:00 |
|
linfso
|
e38ed9da62
|
md
|
2025-07-04 09:34:57 +08:00 |
|
linfso
|
fe60f49f68
|
md
|
2025-07-04 09:31:56 +08:00 |
|
linfso
|
93c12a6e72
|
md
|
2025-07-04 08:23:38 +08:00 |
|
linfso
|
bd558537cb
|
md
|
2025-07-04 08:18:25 +08:00 |
|
linfso
|
296370f77c
|
md
|
2025-07-04 08:08:02 +08:00 |
|
linfso
|
ab1a1ef906
|
md
|
2025-07-04 07:48:25 +08:00 |
|
linfso
|
f5fed5bc9f
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-07-04 07:35:55 +08:00 |
|
linfso
|
3befe5635e
|
md
|
2025-07-04 07:35:46 +08:00 |
|
linfso
|
0dcc5fbb81
|
md
|
2025-07-04 07:30:03 +08:00 |
|
heyu
|
c33d6e6459
|
Merge pull request 'develop' (#89) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/89
|
2025-07-03 17:59:48 +08:00 |
|
|
|
3bfffbb69e
|
demand: 组批次新增/修改添加重复校验 TMS系统-报价管理-干线运输费：报价批量录入
committer: heyu
|
2025-07-03 17:58:57 +08:00 |
|
|
|
8b8512812a
|
demand: TMS系统 - 航信开票记录 - 定制导出 - 导出内容字段“备注”内容调整
committer: heyu
|
2025-07-03 14:58:40 +08:00 |
|
heyu
|
873677b59b
|
Merge pull request 'demand: 扫描漏组批次过滤面单删除的，扫描一周以前的。漏组批次从表格复制查询优化' (#88) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/88
|
2025-07-03 14:25:38 +08:00 |
|
|
|
ef3cac2ac8
|
demand: 扫描漏组批次过滤面单删除的，扫描一周以前的。漏组批次从表格复制查询优化
committer: heyu
|
2025-07-03 14:23:50 +08:00 |
|
linfso
|
5186ff16ab
|
md
|
2025-07-03 14:18:23 +08:00 |
|
linfso
|
e253498595
|
md
|
2025-07-03 14:17:30 +08:00 |
|
linfso
|
7173a98fbd
|
md
|
2025-07-03 12:46:43 +08:00 |
|
linfso
|
676398989c
|
md
|
2025-07-03 12:43:11 +08:00 |
|
linfso
|
4d02c794e2
|
md
|
2025-07-03 11:58:12 +08:00 |
|
linfso
|
904f43177f
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-07-03 11:31:59 +08:00 |
|
linfso
|
dc1a9442a3
|
md
|
2025-07-03 11:31:51 +08:00 |
|
|
|
c47956c5da
|
demand: 查询组批次供应商名称取值问题修复 查询漏组批次效率优化
committer: heyu
|
2025-07-03 11:24:09 +08:00 |
|
linfso
|
88887af375
|
md
|
2025-07-03 10:56:18 +08:00 |
|
linfso
|
c77191b2f8
|
md
|
2025-07-03 01:46:55 +08:00 |
|
|
|
174620b8a1
|
demand: 组树添加南京分拨中心、柯桥分拨中心
committer: heyu
|
2025-07-02 19:52:44 +08:00 |
|
|
|
602ff5a685
|
demand: 组树添加南京分拨中心、柯桥分拨中心
committer: heyu
|
2025-07-02 14:41:47 +08:00 |
|
|
|
3480cf0de2
|
demand: 批量修改报重精确指出重复信息
committer: heyu
|
2025-07-02 13:50:29 +08:00 |
|
|
|
39800dac0c
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop
|
2025-07-02 13:50:14 +08:00 |
|
linfso
|
4f1dbcf3c4
|
md
|
2025-07-02 12:51:23 +08:00 |
|
linfso
|
e627d5dcb0
|
md
|
2025-07-02 12:44:04 +08:00 |
|
linfso
|
20fa4aae66
|
md
|
2025-07-02 12:39:01 +08:00 |
|
linfso
|
86b5b368dd
|
md
|
2025-07-02 12:05:30 +08:00 |
|
linfso
|
8dc9c4146a
|
md
|
2025-07-02 11:22:13 +08:00 |
|
linfso
|
e81f3f7ea9
|
md
|
2025-07-02 11:14:22 +08:00 |
|
linfso
|
02ffff907f
|
md
|
2025-07-02 11:07:36 +08:00 |
|
linfso
|
66d6ae20af
|
md
|
2025-07-02 10:58:38 +08:00 |
|
|
|
047bba7d4a
|
demand: 漏组批次扫描寄件网点为无锡、柯桥、南京时多个网点可互换
committer: heyu
|
2025-07-02 10:29:19 +08:00 |
|
linfso
|
aea06188e6
|
md
|
2025-07-02 07:45:06 +08:00 |
|
linfso
|
774bd9be32
|
md
|
2025-07-02 07:27:16 +08:00 |
|
linfso
|
402f38fee0
|
md
|
2025-07-02 07:09:20 +08:00 |
|
linfso
|
52111fd06f
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-07-01 17:35:31 +08:00 |
|
linfso
|
7928d8fddb
|
md
|
2025-07-01 17:35:05 +08:00 |
|
|
|
da189a7ef8
|
demand: 虚拟单相关字段加修改监控
committer: heyu
|
2025-07-01 17:32:15 +08:00 |
|
|
|
ac60b02465
|
demand: 批次规则批量修改bug修改，新增一次性修改批次接口，查询漏组批次增加查询组批次成功条件，查树增加根据始发网点查
committer: heyu
|
2025-07-01 14:33:50 +08:00 |
|
linfso
|
38a45dd71e
|
md
|
2025-07-01 08:03:18 +08:00 |
|
linfso
|
c81858a646
|
md
|
2025-07-01 07:51:46 +08:00 |
|
linfso
|
fd894098a5
|
md
|
2025-07-01 07:50:04 +08:00 |
|
linfso
|
7a28c6ed78
|
md
|
2025-07-01 07:22:09 +08:00 |
|
linfso
|
dd45d34815
|
md
|
2025-07-01 07:20:32 +08:00 |
|
linfso
|
15afb07131
|
md
|
2025-07-01 00:05:16 +08:00 |
|
linfso
|
f4908f4bce
|
md
|
2025-06-30 23:44:56 +08:00 |
|
linfso
|
dead8b3c95
|
md
|
2025-06-30 23:37:10 +08:00 |
|
linfso
|
bd972aec66
|
md
|
2025-06-30 23:29:54 +08:00 |
|
linfso
|
db266c5404
|
md
|
2025-06-30 23:17:55 +08:00 |
|
linfso
|
4388209f50
|
md
|
2025-06-30 23:10:44 +08:00 |
|
linfso
|
91363c361e
|
md
|
2025-06-30 23:05:30 +08:00 |
|
linfso
|
9b7406af3f
|
md
|
2025-06-30 22:53:36 +08:00 |
|
linfso
|
d9ec87f792
|
md
|
2025-06-30 22:47:19 +08:00 |
|
linfso
|
8be6118aad
|
md
|
2025-06-30 22:31:27 +08:00 |
|
linfso
|
972aa789da
|
md
|
2025-06-30 20:45:26 +08:00 |
|
linfso
|
209b86aa9f
|
md
|
2025-06-30 20:41:37 +08:00 |
|
linfso
|
f93dd55296
|
md
|
2025-06-30 20:11:11 +08:00 |
|
linfso
|
e627243b04
|
md
|
2025-06-30 19:57:50 +08:00 |
|
linfso
|
fac740133a
|
md
|
2025-06-30 19:37:19 +08:00 |
|
linfso
|
6592fb2599
|
dm
|
2025-06-30 19:32:36 +08:00 |
|
linfso
|
ef79e03b5b
|
md
|
2025-06-30 18:08:20 +08:00 |
|
|
|
26198b9716
|
demand: 批次规则批量修改，扫描漏组批次过滤线路014
committer: heyu
|
2025-06-30 18:02:36 +08:00 |
|
linfso
|
1095bc354b
|
md
|
2025-06-30 17:59:03 +08:00 |
|
linfso
|
5a89ffb005
|
md
|
2025-06-30 17:58:32 +08:00 |
|
linfso
|
ea5bc4c15c
|
md
|
2025-06-30 17:52:13 +08:00 |
|
linfso
|
03cb19257d
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-06-30 16:32:58 +08:00 |
|
linfso
|
b19f12d31f
|
md
|
2025-06-30 16:32:49 +08:00 |
|
|
|
a5e8836d14
|
demand: 批次规则批量修改，扫描漏组批次过滤线路014
committer: heyu
|
2025-06-30 15:10:37 +08:00 |
|
|
|
9385acb73c
|
demand: 批次规则批量修改，扫描漏组批次过滤线路014
committer: heyu
|
2025-06-30 13:08:16 +08:00 |
|
|
|
f4fd60e8b7
|
demand: 修改规则增加循环校验
committer: heyu
|
2025-06-30 10:42:17 +08:00 |
|
|
|
33e3d850ff
|
demand: 修改规则增加循环校验
committer: heyu
|
2025-06-30 10:28:07 +08:00 |
|
|
|
2d5da6200d
|
demand: 新增规则增加循环校验，增加校验组树接口
committer: heyu
|
2025-06-30 09:26:06 +08:00 |
|
|
|
2d7f021860
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop
|
2025-06-30 09:25:57 +08:00 |
|
linfso
|
b33b10717b
|
md
|
2025-06-29 16:04:51 +08:00 |
|
linfso
|
1d28e4ef75
|
md
|
2025-06-29 15:44:25 +08:00 |
|
linfso
|
a3f69bf43a
|
短驳费维护
|
2025-06-29 14:37:32 +08:00 |
|
|
|
a290399ad8
|
demand: 组树接口增加根据产品类型过滤，定时扫描接口适应打散的产品类型，组批次供应商名称不准确修复，规则接口重复校验
committer: heyu
|
2025-06-27 16:38:10 +08:00 |
|
heyu
|
5b64bc0a9d
|
Merge pull request 'demand: 定时扫描漏组批次逻辑调整' (#76) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/76
|
2025-06-26 19:54:14 +08:00 |
|
|
|
8004b40000
|
demand: 定时扫描漏组批次逻辑调整
committer: heyu
|
2025-06-26 19:53:38 +08:00 |
|
heyu
|
53c263d6dc
|
Merge pull request 'demand: 定时扫描漏组批次添加treeId' (#75) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/75
|
2025-06-26 18:45:17 +08:00 |
|
|
|
fac835bcb2
|
demand: 定时扫描漏组批次添加treeId
committer: heyu
|
2025-06-26 18:44:41 +08:00 |
|
heyu
|
e6f99d48f0
|
Merge pull request 'demand: 组树规则重构，虚拟单增加香港-缅甸快递逻辑。' (#73) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/73
|
2025-06-26 10:41:33 +08:00 |
|
|
|
410ec25e02
|
demand: 组树规则重构，虚拟单增加香港-缅甸快递逻辑。
committer: heyu
|
2025-06-26 10:40:45 +08:00 |
|
linfso
|
700fbba21f
|
md
|
2025-06-26 07:30:32 +08:00 |
|
linfso
|
ad9c95582b
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-06-26 07:28:19 +08:00 |
|
linfso
|
15051e5eba
|
md
|
2025-06-26 07:28:12 +08:00 |
|
heyu
|
f0070f7a8e
|
Merge pull request 'demand: 组树规则重构，虚拟单增加香港-缅甸快递逻辑。' (#72) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/72
|
2025-06-25 18:37:26 +08:00 |
|
|
|
578d5d67c3
|
demand: 组树规则重构，虚拟单增加香港-缅甸快递逻辑。
committer: heyu
|
2025-06-25 18:35:43 +08:00 |
|
heyu
|
d4f2da5921
|
Merge pull request 'demand: 组树规则重构，虚拟单增加香港-缅甸快递逻辑。' (#71) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/71
|
2025-06-25 18:02:20 +08:00 |
|
|
|
cbbeab9d44
|
demand: 组树规则重构，虚拟单增加香港-缅甸快递逻辑。
committer: heyu
|
2025-06-25 18:00:50 +08:00 |
|
heyu
|
6a2ee17a4d
|
Merge pull request 'develop' (#70) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/70
|
2025-06-25 17:41:33 +08:00 |
|
|
|
7a8c1f77a3
|
demand: 组树规则重构，虚拟单增加香港-缅甸快递逻辑。
committer: heyu
|
2025-06-25 17:38:30 +08:00 |
|
|
|
ed5eea160e
|
demand: 组树规则重构，虚拟单增加香港-缅甸快递逻辑。
committer: heyu
|
2025-06-25 17:27:18 +08:00 |
|
linfso
|
4379f415f1
|
md
|
2025-06-25 17:16:11 +08:00 |
|
|
|
e2e6b78e5c
|
demand: 新增获取一级网点TMS组批次详细信息接口（一个接口实现）
committer: heyu
|
2025-06-25 14:46:07 +08:00 |
|
|
|
0664fb05dd
|
demand: 组批次保存、批量录入、修改校验规则
committer: heyu
|
2025-06-25 13:08:25 +08:00 |
|
heyu
|
dab0bbeb29
|
Merge pull request 'demand: 新增筛选网点接口。筛选供应商接口返回nameEn.' (#67) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/67
|
2025-06-25 10:21:20 +08:00 |
|
|
|
c54ef63b78
|
demand: 新增筛选网点接口。筛选供应商接口返回nameEn.
committer: heyu
|
2025-06-25 10:20:43 +08:00 |
|
linfso
|
7c0096a2d1
|
md
|
2025-06-25 03:29:07 +08:00 |
|
linfso
|
8323922753
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
|
2025-06-25 02:58:12 +08:00 |
|
linfso
|
f3d8f4fa57
|
md
|
2025-06-25 02:57:34 +08:00 |
|
|
|
1fc7fb52c5
|
demand: 扫描组批次规则调整
committer: heyu
|
2025-06-24 17:11:44 +08:00 |
|
|
|
bfd40fc09e
|
demand: 修复虚拟单重复录入问题
committer: heyu
|
2025-06-24 14:57:51 +08:00 |
|
|
|
22f371e439
|
demand: 打印备注修改，始发网点为空时设置默认值
committer: heyu
|
2025-06-24 13:38:00 +08:00 |
|
|
|
c80db35415
|
demand: 返货快递不拼接备注。批量导入校验操作员。新增根据规则筛选供应商接口。根据虚拟单筛选总数重算。总部不能作为寄件网点
committer: heyu
|
2025-06-24 11:12:49 +08:00 |
|
|
|
25beb21519
|
demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；
committer: heyu
|
2025-06-23 21:31:18 +08:00 |
|
|
|
6c0a94acf8
|
demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；
committer: heyu
|
2025-06-23 21:13:44 +08:00 |
|
|
|
413aefda36
|
demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；
committer: heyu
|
2025-06-23 20:04:55 +08:00 |
|
|
|
eeefc44f86
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop
|
2025-06-23 20:04:02 +08:00 |
|
linfso
|
c5c4e0bb06
|
md
|
2025-06-23 16:54:51 +08:00 |
|
|
|
9a9aa336e6
|
demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；
committer: heyu
|
2025-06-23 15:20:22 +08:00 |
|
|
|
659179197a
|
demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；
committer: heyu
|
2025-06-23 14:07:08 +08:00 |
|
|
|
5dd79f74f7
|
demand: 新增字段：始发网点 网点表已启用网点
committer: heyu
|
2025-06-21 15:40:02 +08:00 |
|
|
|
3c4dbf0311
|
demand: TMS-缅甸虚拟单调整
committer: heyu
|
2025-06-21 13:23:18 +08:00 |
|
|
|
a1a2253847
|
Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop
# Conflicts:
# emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java
# emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
|
2025-06-20 15:00:18 +08:00 |
|
|
|
44cc39999b
|
demand: TMS-缅甸虚拟单调整
committer: heyu
|
2025-06-20 13:56:56 +08:00 |
|
linfso
|
4a1be66503
|
md
|
2025-06-20 03:41:36 +08:00 |
|
linfso
|
ee31ebefec
|
md
|
2025-06-19 18:42:25 +08:00 |
|
linfso
|
6a626af581
|
md
|
2025-06-19 16:39:49 +08:00 |
|
linfso
|
73c49c43e2
|
md
|
2025-06-19 15:49:08 +08:00 |
|
linfso
|
1421701c06
|
md
|
2025-06-19 15:31:41 +08:00 |
|
linfso
|
3fcae709ef
|
md
|
2025-06-19 15:30:14 +08:00 |
|
linfso
|
2afa8a395a
|
md
|
2025-06-19 10:13:44 +08:00 |
|
linfso
|
104fc567ee
|
md
|
2025-06-19 09:59:47 +08:00 |
|
linfso
|
4000ce0489
|
md
|
2025-06-18 16:31:03 +08:00 |
|
linfso
|
a5c02922fc
|
md
|
2025-06-18 16:11:45 +08:00 |
|
linfso
|
ea4850e575
|
md
|
2025-06-18 15:50:05 +08:00 |
|
linfso
|
7e0fa0eb78
|
md
|
2025-06-18 15:48:53 +08:00 |
|
linfso
|
d0d243dda6
|
md
|
2025-06-18 15:46:29 +08:00 |
|
linfso
|
3b35c592bf
|
md
|
2025-06-18 15:04:33 +08:00 |
|
