Commit Graph

1393 Commits

Author SHA1 Message Date
linfso
e627243b04 md 2025-06-30 19:57:50 +08:00
linfso
293f424070 md 2025-06-30 18:50:33 +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
fefa52b21a md 2025-06-30 17:05:35 +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
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
a3f69bf43a 短驳费维护 2025-06-29 14:37:32 +08:00
a290399ad8 demand: 组树接口增加根据产品类型过滤,定时扫描接口适应打散的产品类型,组批次供应商名称不准确修复,规则接口重复校验
committer: heyu
2025-06-27 16:38:10 +08:00
heyu
fa2406e3b1 Merge pull request 'demand: 定时扫描漏组批次逻辑调整' (#77) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/77
2025-06-26 20:26:10 +08:00
5b5b18284c demand: 定时扫描漏组批次逻辑调整
committer: heyu
2025-06-26 20:23:06 +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
389992d951 Merge pull request 'demand: 组批次规则界面查询逻辑调整' (#74) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/74
2025-06-26 14:18:22 +08:00
83fba12bba demand: 组批次规则界面查询逻辑调整
committer: heyu
2025-06-26 14:17:38 +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
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
0664fb05dd demand: 组批次保存、批量录入、修改校验规则
committer: heyu
2025-06-25 13:08:25 +08:00
84de09d96c demand: 新增筛选网点接口。筛选供应商接口返回nameEn.
committer: heyu
2025-06-25 11:01:23 +08:00
c54ef63b78 demand: 新增筛选网点接口。筛选供应商接口返回nameEn.
committer: heyu
2025-06-25 10:20:43 +08:00
1fc7fb52c5 demand: 扫描组批次规则调整
committer: heyu
2025-06-24 17:11:44 +08:00
c80db35415 demand: 返货快递不拼接备注。批量导入校验操作员。新增根据规则筛选供应商接口。根据虚拟单筛选总数重算。总部不能作为寄件网点
committer: heyu
2025-06-24 11:12:49 +08:00
413aefda36 demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致;
committer: heyu
2025-06-23 20:04:55 +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
99c8bbbda3 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop 2025-06-23 14:06:34 +08:00
linfso
cf5ded2e3e md 2025-06-22 23:05:06 +08:00
467839d750 demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致;
committer: heyu
2025-06-21 17:26:40 +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
50afa217ec md 2025-06-19 16:17:20 +08:00
linfso
73c49c43e2 md 2025-06-19 15:49:08 +08:00
linfso
3fcae709ef md 2025-06-19 15:30:14 +08:00
linfso
58e904c23a md 2025-06-18 11:51:16 +08:00
linfso
ebf9bed530 md 2025-06-18 11:50:14 +08:00
linfso
1c6f4ee3ba md 2025-06-18 11:45:43 +08:00
linfso
670af37ed4 md 2025-06-18 11:17:03 +08:00
linfso
a40435969d md 2025-06-18 10:07:59 +08:00
81aa722733 demand: TMS-缅甸虚拟单调整
committer: heyu
2025-06-18 09:24:05 +08:00