Commit Graph

3165 Commits

Author SHA1 Message Date
adeaa184fc Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop 2025-07-19 16:36:05 +08:00
7975dbf3d2 demand: 财务中心费用审核无法看到驳回原因bug修复,中心运单查询无法根据多个寄件网点查询bug修复 运单补打印部分模板没有取始发网点bug修复
committer: heyu
2025-07-19 16:34:59 +08:00
heyu
c6bf8c5ee2 Merge pull request 'demand: 鲁泰系统对接始发网点为空导致不能面单打印问题bug修复' (#125) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/125
2025-07-19 11:53:32 +08:00
e2ed31140c demand: 鲁泰系统对接始发网点为空导致不能面单打印问题bug修复
committer: heyu
2025-07-19 11:53:11 +08:00
heyu
5d89b4becf Merge pull request 'develop' (#124) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/124
2025-07-19 10:16:47 +08:00
faf538bfd3 demand: 寄件运单查询无法根据寄件网点查询bug修复,非总部网点提示无权限bug修复
committer: heyu
2025-07-19 10:15:54 +08:00
bfa34ed61c demand: TMS系统 - 提成管理 - 员工提成方案配置界面优化
committer: heyu
2025-07-18 16:40:58 +08:00
heyu
19832893de Merge pull request 'demand: TMS系统 - 寄件运单查询/寄件运单查询新/派件运单查询/中心运单查询 -已停用的月结客户 允许模糊搜索选择,并支持查询相关数据 货物组批次返货虚拟单不允许组批次' (#123) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/123
2025-07-17 17:44:27 +08:00
ad0899408f demand: TMS系统 - 寄件运单查询/寄件运单查询新/派件运单查询/中心运单查询 -已停用的月结客户 允许模糊搜索选择,并支持查询相关数据 货物组批次返货虚拟单不允许组批次
committer: heyu
2025-07-17 17:43:33 +08:00
heyu
7a10b7c649 Merge pull request 'demand: tms系统-运单管理-运单录入/修改/网点费用申请-国家与省份要匹配,对应APP端也要修改。' (#122) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/122
2025-07-17 14:24:16 +08:00
1bd42c16af demand: tms系统-运单管理-运单录入/修改/网点费用申请-国家与省份要匹配,对应APP端也要修改。
committer: heyu
2025-07-17 10:15:20 +08:00
heyu
661bba520a Merge pull request 'develop' (#121) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/121
2025-07-15 19:18:41 +08:00
0caaa38f71 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop 2025-07-15 19:17:33 +08:00
06ea898d8a demand: 运单录入/运单修改/运单批量录入/网点费用申请:目的国、产品信息、寄件国家地区信息需要和起始网点一致, 报价计算逻辑改为根据始发网点计算
committer: heyu
2025-07-15 19:15:25 +08:00
heyu
1a9adcc5c8 Merge pull request 'demand: 运单录入/运单修改/运单批量录入/网点费用申请:目的国、产品信息、寄件国家地区信息需要和起始网点一致, 报价计算逻辑改为根据始发网点计算' (#120) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/120
2025-07-15 16:08:36 +08:00
9cca3c8345 demand: 运单录入/运单修改/运单批量录入/网点费用申请:目的国、产品信息、寄件国家地区信息需要和起始网点一致, 报价计算逻辑改为根据始发网点计算
committer: heyu
2025-07-15 15:00:18 +08:00
linfso
9db6240eb1 md 2025-07-14 19:35:57 +08:00
linfso
191a2ee40d md 2025-07-14 19:34:46 +08:00
linfso
ae738bf4cc md 2025-07-14 19:24:27 +08:00
linfso
f1b77c5f4d Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-07-14 18:56:31 +08:00
linfso
a57eb921d4 md 2025-07-14 18:56:22 +08:00
heyu
db0788ae77 Merge pull request 'demand: TMS系统 - 提成管理 - 员工提成方案配置 增加根据日期查询功能 员工提成方案配置新增/修改/批量修改增加验重逻辑' (#119) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/119
2025-07-14 17:26:33 +08:00
a011fcc767 demand: TMS系统 - 提成管理 - 员工提成方案配置 增加根据日期查询功能 员工提成方案配置新增/修改/批量修改增加验重逻辑
committer: heyu
2025-07-14 17:14:53 +08:00
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