Commit Graph

912 Commits

Author SHA1 Message Date
linfso
b99d0a8fa9 md 2025-07-09 08:16:12 +08:00
linfso
e5c2f68687 md 2025-07-08 10:30:53 +08:00
linfso
876003afd9 md 2025-07-08 10:20:38 +08:00
linfso
e9475b8484 md 2025-07-08 10:06:02 +08:00
linfso
da93b548e3 md 2025-07-08 09:56:17 +08:00
linfso
ec8f714858 md 2025-07-08 09:51:41 +08:00
linfso
91dbe19641 md 2025-07-07 15:57:47 +08:00
heyu
0209bd896f Merge pull request 'develop' (#94) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/94
2025-07-07 10:30:20 +08:00
585c15a803 demand: 批量修改批次拼接名称问题修复
committer: heyu
2025-07-07 10:27:39 +08:00
linfso
15fbf4d573 md 2025-07-07 09:40:18 +08:00
linfso
e49b4e960d md 2025-07-04 13:50:28 +08:00
2d6a2da183 demand: 查询网点总部解禁
committer: heyu
2025-07-04 13:29:00 +08:00
3bfffbb69e demand: 组批次新增/修改添加重复校验 TMS系统-报价管理-干线运输费:报价批量录入
committer: heyu
2025-07-03 17:58:57 +08:00
linfso
eaf74a5405 md 2025-07-03 11:07:19 +08:00
linfso
7928d8fddb md 2025-07-01 17:35:05 +08:00
ac60b02465 demand: 批次规则批量修改bug修改,新增一次性修改批次接口,查询漏组批次增加查询组批次成功条件,查树增加根据始发网点查
committer: heyu
2025-07-01 14:33:50 +08:00
linfso
dd45d34815 md 2025-07-01 07:20:32 +08:00
linfso
c04feab249 md 2025-07-01 00:38:20 +08:00
linfso
8be6118aad md 2025-06-30 22:31:27 +08:00
linfso
1b8f9269d2 md 2025-06-30 19:39:00 +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
9385acb73c demand: 批次规则批量修改,扫描漏组批次过滤线路014
committer: heyu
2025-06-30 13:08:16 +08:00
2d5da6200d demand: 新增规则增加循环校验,增加校验组树接口
committer: heyu
2025-06-30 09:26:06 +08:00
linfso
a3f69bf43a 短驳费维护 2025-06-29 14:37:32 +08:00
linfso
42c22a9687 md 2025-06-26 14:26:36 +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
linfso
4379f415f1 md 2025-06-25 17:16:11 +08:00
e2e6b78e5c demand: 新增获取一级网点TMS组批次详细信息接口(一个接口实现)
committer: heyu
2025-06-25 14:46:07 +08:00
7e1fa091bd demand: 组批次保存、批量录入、修改校验规则
committer: heyu
2025-06-25 13:09:05 +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
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
efd3e7f455 demand: 批量修改批次接口
committer: heyu
2025-06-24 14:32:27 +08:00
c80db35415 demand: 返货快递不拼接备注。批量导入校验操作员。新增根据规则筛选供应商接口。根据虚拟单筛选总数重算。总部不能作为寄件网点
committer: heyu
2025-06-24 11:12:49 +08:00
3c4dbf0311 demand: TMS-缅甸虚拟单调整
committer: heyu
2025-06-21 13:23:18 +08:00
c847446e44 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop 2025-06-20 15:32:09 +08:00
linfso
f035059a56 md 2025-06-20 15:01:43 +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
73c49c43e2 md 2025-06-19 15:49:08 +08:00
linfso
a5c02922fc md 2025-06-18 16:11:45 +08:00
linfso
61a9da48fd md 2025-06-18 15:51:26 +08:00
linfso
670af37ed4 md 2025-06-18 11:17:03 +08:00
81aa722733 demand: TMS-缅甸虚拟单调整
committer: heyu
2025-06-18 09:24:05 +08:00
linfso
3abf041168 md 2025-06-18 08:13:02 +08:00
linfso
674ba8f6fd md 2025-06-18 07:18:02 +08:00
linfso
490adc639b md 2025-06-17 18:06:55 +08:00