Commit Graph

3542 Commits

Author SHA1 Message Date
heyu
22e02e951b Merge pull request 'develop' (#118) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/118
2025-07-14 16:06:09 +08:00
f5eb5d3e9e demand: TMS系统 - 提成管理 - 员工提成方案配置 增加根据日期查询功能 员工提成方案配置新增/修改/批量修改增加验重逻辑
committer: heyu
2025-07-14 16:05:28 +08:00
9860c10c27 demand: TMS系统 - 提成管理 - 员工提成方案配置 增加根据日期查询功能
committer: heyu
2025-07-14 15:00:58 +08:00
heyu
67cb9b7df9 Merge pull request 'develop' (#117) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/117
2025-07-14 14:36:25 +08:00
50231d1a28 demand: TMS系统 - 提成管理 - 员工提成方案配置 新增批量修改员工提成方案,报价维护界面字段“起始国、目的国”新增加字段 非东南亚 :剔除中国、越南、柬埔寨、缅甸、孟加拉、老挝 以外的国家’
committer: heyu
2025-07-14 14:35:25 +08:00
0d9f023f8c demand: TMS系统 - 提成管理 - 员工提成方案配置 新增批量修改员工提成方案,报价维护界面字段“起始国、目的国”新增加字段 非东南亚 :剔除中国、越南、柬埔寨、缅甸、孟加拉、老挝 以外的国家’
committer: heyu
2025-07-14 11:15:49 +08:00
linfso
3f0d6cde0b Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-07-12 15:42:16 +08:00
linfso
a90748ddee md 2025-07-12 15:41:35 +08:00
heyu
5f931d236e Merge pull request 'demand: 运单提成明细重算员工提成无法根据线路选择合适的提成规则计算bug修复' (#116) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/116
2025-07-11 15:34:42 +08:00
86569422ae demand: 运单提成明细重算员工提成无法根据线路选择合适的提成规则计算bug修复
committer: heyu
2025-07-11 15:21:35 +08:00
heyu
b800e7f1c9 Merge pull request 'demand: 运单修改取件方式会导致寄件网点不准确bug修复' (#115) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/115
2025-07-11 14:14:26 +08:00
e46dc56bff demand: 运单修改取件方式会导致寄件网点不准确bug修复
committer: heyu
2025-07-11 14:13:51 +08:00
heyu
10d3821fd6 Merge pull request 'demand: 扫描漏组批次supplierCode线程安全问题修复' (#113) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/113
2025-07-11 10:51:50 +08:00
1445bc97a5 demand: 录单和签收图片管理查询返回顺序根据用户传的运单号排序
committer: heyu
2025-07-11 10:51:22 +08:00
heyu
97b4857526 Merge pull request 'demand: 扫描漏组批次supplierCode线程安全问题修复' (#114) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/114
2025-07-11 10:33:40 +08:00
dce675e149 demand: 扫描漏组批次supplierCode线程安全问题修复
committer: heyu
2025-07-11 10:24:26 +08:00
linfso
8ce28d94a3 md 2025-07-11 10:15:46 +08:00
linfso
4ff754cfaf md 2025-07-11 09:34:31 +08:00
linfso
8afce5fdaf Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-07-11 09:25:19 +08:00
linfso
bceb12b02e md 2025-07-11 09:24:59 +08:00
heyu
c721cb0978 Merge pull request 'demand: 扫描漏组批次supplierCode线程安全问题修复' (#112) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/112
2025-07-11 09:02:23 +08:00
cbf8f70fa9 demand: 扫描漏组批次supplierCode线程安全问题修复
committer: heyu
2025-07-11 09:01:08 +08:00
linfso
4341a91a90 md 2025-07-11 08:02:23 +08:00
linfso
49d091c555 md 2025-07-11 07:14:48 +08:00
linfso
d10a99cbe8 md 2025-07-11 06:29:15 +08:00
linfso
31ab5dce13 add tms_site_batch total_settlement_weight 2025-07-11 05:45:29 +08:00
linfso
c8557290bf compress 2025-07-11 04:56:46 +08:00
linfso
2305e25931 md 2025-07-10 17:39:39 +08:00
linfso
a2799b4e52 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-07-10 17:34:23 +08:00
linfso
d170abe87d md 2025-07-10 17:33:59 +08:00
heyu
9fdf48e67a Merge pull request 'demand: 扫描漏组批次问题件取问题件表' (#111) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/111
2025-07-10 17:04:19 +08:00
846cc6b438 demand: 扫描漏组批次问题件取问题件表
committer: heyu
2025-07-10 16:49:21 +08:00
linfso
88a25f233b md 2025-07-10 16:01:18 +08:00
linfso
cf01247e99 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-07-10 15:48:46 +08:00
linfso
e551e10a73 md 2025-07-10 15:48:25 +08:00
heyu
ca69bb88bf Merge pull request 'demand:' (#110) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/110
2025-07-10 15:08:58 +08:00
cd8521afad demand:
(1)查询条件:漏组次数 新增加类型“其他异常” 用于排查现有漏组次数条件以外的运单号   TMS系统 - 漏组批次订单 - 数据显示栏“目的网点”字段取值错误,目前取值取得是目的地,应该取值 录单表 目的网点
committer: heyu
2025-07-10 15:08:24 +08:00
linfso
e35023b240 md 2025-07-10 15:07:58 +08:00
linfso
1a84f5a610 md 2025-07-10 12:03:07 +08:00
heyu
9726ff1623 Merge pull request 'demand: 组批次添加操作监控,批量扫描漏组批次改为硬删除' (#109) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/109
2025-07-10 12:01:32 +08:00
c476bd6060 demand: 组批次添加操作监控,批量扫描漏组批次改为硬删除
committer: heyu
2025-07-10 12:00:57 +08:00
linfso
547f1be88f Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-07-10 11:44:01 +08:00
linfso
9c5cf0f98d md 2025-07-10 11:43:51 +08:00
heyu
1c7ac79df3 Merge pull request 'demand: 新增组批次成功运单过滤重复运单,查询漏组批次运单过滤出口虚拟单的主单' (#108) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/108
2025-07-10 10:50:33 +08:00
5a7febde47 demand: 新增组批次成功运单过滤重复运单,查询漏组批次运单过滤出口虚拟单的主单
committer: heyu
2025-07-10 10:48:25 +08:00
heyu
ebcf305898 Merge pull request 'demand: 新增组批次成功运单过滤重复运单,查询漏组批次运单过滤出口虚拟单的主单' (#107) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/107
2025-07-10 09:02:55 +08:00
07781bd360 demand: 新增组批次成功运单过滤重复运单,查询漏组批次运单过滤出口虚拟单的主单
committer: heyu
2025-07-10 09:01:59 +08:00
heyu
a620e879e5 Merge pull request 'demand: 组批次添加操作监控,批量扫描漏组批次改为硬删除' (#106) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/106
2025-07-09 17:03:33 +08:00
059b0640b8 demand: 组批次添加操作监控,批量扫描漏组批次改为硬删除
committer: heyu
2025-07-09 17:00:46 +08:00
linfso
1166db3c8c Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-07-09 16:28:08 +08:00