Commit Graph

2975 Commits

Author SHA1 Message Date
e2ed31140c demand: 鲁泰系统对接始发网点为空导致不能面单打印问题bug修复
committer: heyu
2025-07-19 11:53:11 +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
ad0899408f demand: TMS系统 - 寄件运单查询/寄件运单查询新/派件运单查询/中心运单查询 -已停用的月结客户 允许模糊搜索选择,并支持查询相关数据 货物组批次返货虚拟单不允许组批次
committer: heyu
2025-07-17 17:43:33 +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
a011fcc767 demand: TMS系统 - 提成管理 - 员工提成方案配置 增加根据日期查询功能 员工提成方案配置新增/修改/批量修改增加验重逻辑
committer: heyu
2025-07-14 17:14:53 +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
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
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
cbf8f70fa9 demand: 扫描漏组批次supplierCode线程安全问题修复
committer: heyu
2025-07-11 09:01:08 +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
846cc6b438 demand: 扫描漏组批次问题件取问题件表
committer: heyu
2025-07-10 16:49:21 +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
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
5a7febde47 demand: 新增组批次成功运单过滤重复运单,查询漏组批次运单过滤出口虚拟单的主单
committer: heyu
2025-07-10 10:48:25 +08:00
07781bd360 demand: 新增组批次成功运单过滤重复运单,查询漏组批次运单过滤出口虚拟单的主单
committer: heyu
2025-07-10 09:01:59 +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
linfso
62ccace14c md 2025-07-09 16:28:03 +08:00
82b33097f2 demand: 查询组批次完成添加去重
committer: heyu
2025-07-09 15:58:45 +08:00
heyu
ee2ecd2339 Merge pull request 'demand: 定时扫描漏组批次从未组批次运单统计不准确的问题' (#104) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/104
2025-07-09 09:33:41 +08:00
0b6f9aa1ed demand: 定时扫描漏组批次从未组批次运单统计不准确的问题
committer: heyu
2025-07-09 09:32:29 +08:00
linfso
6cca8e2495 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-07-09 08:16:20 +08:00
linfso
b99d0a8fa9 md 2025-07-09 08:16:12 +08:00
heyu
2df63b217e Merge pull request 'demand: 费用币种校验只能为CNY/USD' (#103) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/103
2025-07-08 18:08:11 +08:00
aba30b7d9b demand: 费用币种校验只能为CNY/USD
committer: heyu
2025-07-08 18:07:39 +08:00
heyu
15db89cf76 Merge pull request 'demand: 查询漏组批次查询组批次完成时各网点只能查询自己网点的运单 供应商线路规划新增/修改/批量新增/批量修改去除死循环相关的校验' (#102) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/102
2025-07-08 16:38:02 +08:00
08fffb5592 demand: 查询漏组批次查询组批次完成时各网点只能查询自己网点的运单 供应商线路规划新增/修改/批量新增/批量修改去除死循环相关的校验
committer: heyu
2025-07-08 16:36:52 +08:00
heyu
361504a273 Merge pull request 'demand: TMS系统-大客户管理-大客户单独报价-报价批量录入 漏组批次订单查询各网点能查询到自己网点相关的漏组信息' (#101) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/101
2025-07-08 14:23:20 +08:00
d8d7f98e6d demand: TMS系统-大客户管理-大客户单独报价-报价批量录入 漏组批次订单查询各网点能查询到自己网点相关的漏组信息
committer: heyu
2025-07-08 14:22:45 +08:00
linfso
cda08fc8e8 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-07-08 14:21:02 +08:00
linfso
c0949346f4 md 2025-07-08 14:20:50 +08:00
heyu
792e71302b Merge pull request 'demand: 大客户单独报价修改bug修改' (#100) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/100
2025-07-08 12:01:03 +08:00
86fa4d99b5 demand: 大客户单独报价修改bug修改
committer: heyu
2025-07-08 12:00:29 +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
5c8b1029e1 md 2025-07-08 10:18:23 +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
058597b8d0 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-07-08 09:51:48 +08:00
linfso
ec8f714858 md 2025-07-08 09:51:41 +08:00
9702583f04 demand: 批量扫描漏组批次订单扫描过滤未接单/已取消的运单,扫描过滤进口的虚拟单
committer: heyu
2025-07-08 09:45:46 +08:00
linfso
eb5f85960e md 2025-07-08 04:45:23 +08:00
linfso
df17a6b04e md 2025-07-07 17:42:37 +08:00
linfso
00f3da9ac7 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-07-07 16:52:14 +08:00
linfso
cfac49cb70 md 2025-07-07 16:52:08 +08:00
heyu
aadb49af24 Merge pull request 'demand: 修改虚拟单后对应主单对应虚拟单备注消失bug修复' (#98) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/98
2025-07-07 16:13:10 +08:00
3c206a2ee7 demand: 修改虚拟单后对应主单对应虚拟单备注消失bug修复
committer: heyu
2025-07-07 16:12:40 +08:00
linfso
404c4b1e04 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-07-07 15:57:54 +08:00
linfso
91dbe19641 md 2025-07-07 15:57:47 +08:00
heyu
d843be726d Merge pull request 'demand: 组批次规则图查询添加去重逻辑' (#97) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/97
2025-07-07 15:30:52 +08:00
90628ece0e demand: 组批次规则图查询添加去重逻辑
committer: heyu
2025-07-07 15:29:58 +08:00
linfso
2cdf5f5340 md 2025-07-07 14:57:15 +08:00
linfso
9689ac0c7f Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-07-07 14:48:23 +08:00
linfso
632d105de1 md 2025-07-07 14:48:16 +08:00
heyu
28a175740c Merge pull request 'develop' (#95) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/95
2025-07-07 11:05:22 +08:00
34d5e9a7c4 demand: TMS系统 - 运输管理 - 货物组批次 - 按照 成本 已录入 未录入 无法查询到未录入的数据 显示 无数据
committer: heyu
2025-07-07 11:04:59 +08:00
heyu
b9c95f5d0a Merge pull request 'develop' (#96) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/96
2025-07-05 17:19:10 +08:00
74f4bd80ba demand: 组树接口市场部-分拨中心可互换
committer: heyu
2025-07-05 17:18:09 +08:00
linfso
db29669089 md 2025-07-05 15:33:55 +08:00
4acd952916 demand: 虚拟单主单A换主单B,虚拟单、主单B、主单A都需要更新绑定关系。 报价时间交叉验证逻辑bug修复
committer: heyu
2025-07-05 13:19:43 +08:00
0bc471ab23 demand: 组批次规则新增/导入/修改/批量修改校验时间是否交叉。 批量修改报价验重去除自身
committer: heyu
2025-07-04 18:09:20 +08:00
linfso
504f2718ac md 2025-07-04 15:38:30 +08:00
linfso
f6d0b2fada md 2025-07-04 15:20:11 +08:00
linfso
cc4040bf06 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-07-04 15:09:16 +08:00
linfso
27a02301c5 md 2025-07-04 15:09:10 +08:00
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
76a0d25e79 md 2025-07-04 07:55:12 +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
linfso
5c4a513c10 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-07-02 15:03:27 +08:00
linfso
cf5104be89 md 2025-07-02 15:03:18 +08:00
602ff5a685 demand: 组树添加南京分拨中心、柯桥分拨中心
committer: heyu
2025-07-02 14:41:47 +08:00
linfso
c6a40b0295 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-07-02 14:40:45 +08:00
linfso
cc4a42b405 md 2025-07-02 14:40:39 +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
e221e0593d md 2025-07-02 13:36:38 +08:00
linfso
7ce7b3885f md 2025-07-02 13:19:51 +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
7ade873106 md 2025-07-02 11:08:54 +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
658afa7c5f md 2025-07-01 01:02:17 +08:00
linfso
c04feab249 md 2025-07-01 00:38:20 +08:00
linfso
15afb07131 md 2025-07-01 00:05:16 +08:00
linfso
4b7641bd23 md 2025-06-30 23:50:55 +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
580232e364 md 2025-06-30 23:34:54 +08:00
linfso
73bbc4bb5a md 2025-06-30 23:34:18 +08:00
linfso
bd972aec66 md 2025-06-30 23:29:54 +08:00
linfso
5e89650007 md 2025-06-30 23:19:17 +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
e79ad23af6 md 2025-06-30 20:36:39 +08:00
linfso
60276eeebb md 2025-06-30 20:36:27 +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
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
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
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
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
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
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
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
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
56c444522b Merge pull request 'demand: 新增筛选网点接口。筛选供应商接口返回nameEn.' (#68) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/68
2025-06-25 11:01:46 +08:00
84de09d96c demand: 新增筛选网点接口。筛选供应商接口返回nameEn.
committer: heyu
2025-06-25 11:01:23 +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
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
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
50afa217ec md 2025-06-19 16:17:20 +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
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
linfso
79ac74843c md 2025-06-18 08:14:36 +08:00
linfso
3abf041168 md 2025-06-18 08:13:02 +08:00
linfso
963af279fe md 2025-06-17 17:17:32 +08:00
linfso
732678dd94 md 2025-06-17 14:10:08 +08:00
linfso
209a22439c md 2025-06-17 14:01:26 +08:00
linfso
0d8ae4bb1c md 2025-06-17 14:00:22 +08:00
linfso
0ba3afb5a1 md 2025-06-17 10:57:37 +08:00
linfso
e0420de664 md 2025-06-17 08:39:51 +08:00
linfso
0f05e1d72a 供应商费用 2025-06-17 08:38:36 +08:00
424cc100d1 demand: 运单录入界面-缅甸虚拟单调整
committer: heyu
2025-06-16 19:04:37 +08:00
97ff62ca74 demand: 运单录入界面-缅甸虚拟单调整
committer: heyu
2025-06-16 16:19:03 +08:00
heyu
1028f741ee Merge pull request 'demand: TMS系统 - 客户账单管理 - 航信开票记录 - 定制导出 - 字段 快递公司取值=申请人' (#59) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/59
2025-06-16 10:36:20 +08:00
501319d514 demand: TMS系统 - 客户账单管理 - 航信开票记录 - 定制导出 - 字段 快递公司取值=申请人
committer: heyu
2025-06-16 09:21:41 +08:00
heyu
7b0f9689c1 Merge pull request 'demand: 批量修改报价增加校验日期交叉逻辑;新增根据批次号扫描组批次状态' (#58) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/58
2025-06-13 15:18:58 +08:00
8a247ae2a7 demand: 批量修改报价增加校验日期交叉逻辑;新增根据批次号扫描组批次状态
committer: heyu
2025-06-13 15:18:03 +08:00
linfso
a6c8700f9d Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-06-13 09:56:43 +08:00
linfso
253275cbc2 提成按实际重量 2025-06-13 09:55:46 +08:00
heyu
c8c4c36cba Merge pull request 'demand: 定时扫描运单货物组批次支持按线路扫描,查询漏组批次列表支持按运单寄件日期查' (#57) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/57
2025-06-12 16:08:07 +08:00
3ccead415e demand: 定时扫描运单货物组批次支持按线路扫描,查询漏组批次列表支持按运单寄件日期查
committer: heyu
2025-06-12 16:07:21 +08:00
heyu
53b6fd4bed Merge pull request 'demand: 定时扫描运单货物组批次支持按线路扫描,查询漏组批次列表支持按运单寄件日期查' (#56) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/56
2025-06-12 15:32:30 +08:00
d9c942c14e demand: 定时扫描运单货物组批次支持按线路扫描,查询漏组批次列表支持按运单寄件日期查
committer: heyu
2025-06-12 15:31:13 +08:00
heyu
68dbc5f8fb Merge pull request 'demand: 定时扫描运单货物组批次支持按线路扫描,查询漏组批次列表支持按运单寄件日期查' (#55) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/55
2025-06-12 14:21:13 +08:00
26cb46e443 demand: 定时扫描运单货物组批次支持按线路扫描,查询漏组批次列表支持按运单寄件日期查
committer: heyu
2025-06-12 14:19:58 +08:00
heyu
44211a8f61 Merge pull request 'demand: 批量导入线路规则bug修改' (#54) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/54
2025-06-12 11:44:47 +08:00
aade7c0bf0 demand: 批量导入线路规则bug修改
committer: heyu
2025-06-12 11:44:19 +08:00
heyu
3ede36e863 Merge pull request 'demand: 批量导入线路规则bug修改' (#53) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/53
2025-06-12 10:57:03 +08:00
4afcfedc14 demand: 批量导入线路规则bug修改
committer: heyu
2025-06-12 10:56:21 +08:00
heyu
4868f7bace Merge pull request 'develop' (#52) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/52
2025-06-12 10:33:58 +08:00
0ece5214b8 demand: 对接外部更新/查询运单接口,对接外部导出进仓单、查询物流轨迹接口
committer: heyu
2025-06-12 10:30:09 +08:00
linfso
ee672af586 md 2025-06-12 05:54:10 +08:00
linfso
ca29db1e26 md 2025-06-12 05:40:39 +08:00
linfso
629e4b2065 md 2025-06-11 18:10:29 +08:00
linfso
fcbdc5bdaa md 2025-06-11 17:39:40 +08:00
heyu
0c687733ce Merge pull request 'demand: 定时扫描漏组批次自测bug修改' (#51) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/51
2025-06-11 17:23:25 +08:00
0fab01cd67 demand: 定时扫描漏组批次自测bug修改
committer: heyu
2025-06-11 17:22:52 +08:00
heyu
23e050fd44 Merge pull request 'demand: 线路规则、漏组批次相关逻辑调整' (#50) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/50
2025-06-11 16:09:52 +08:00
b5d9c982e3 demand: 线路规则、漏组批次相关逻辑调整
committer: heyu
2025-06-11 16:09:09 +08:00
heyu
5fb8369e0a Merge pull request 'demand: TMS系统-提成管理-运单提成明细:新增查询条件支持按支付方式查询' (#49) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/49
2025-06-10 14:49:31 +08:00
911bc976ef demand: TMS系统-提成管理-运单提成明细:新增查询条件支持按支付方式查询
committer: heyu
2025-06-10 14:49:03 +08:00
heyu
d99e4d7fce Merge pull request 'develop' (#48) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/48
2025-06-10 14:46:54 +08:00
27f4e5fcc4 demand: 对接外部下单接口订单号逻辑修改
committer: heyu
2025-06-10 14:45:55 +08:00
1f71bc4c21 demand: 对接外部下单接口订单号逻辑修改
committer: heyu
2025-06-10 14:44:54 +08:00
04bd49b254 demand: 对接外部下单接口订单号逻辑修改
committer: heyu
2025-06-10 14:43:42 +08:00
linfso
15aeaa5f51 md 2025-06-09 22:15:12 +08:00
linfso
ede7e53286 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-06-09 22:09:32 +08:00
linfso
da0ddd434c md 2025-06-09 22:09:04 +08:00
3a4e632557 demand: TMS系统-提成管理-运单提成明细:新增查询条件支持按支付方式查询
committer: heyu
2025-06-09 18:43:41 +08:00
heyu
b811153a65 Merge pull request 'develop' (#47) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/47
2025-06-09 18:23:52 +08:00
c26197080f demand:TMS系统-航信开票记录查询/导出/定制导出支持按收款状态、账单月份、月结客户、销售联系人、回款联系人查询、导出
committer: heyu
2025-06-09 18:22:20 +08:00
cb177ee353 demand:TMS系统 - 统计报表- 收款统计 - 最后回款时间 目前显示的是时分秒 不合适,需要显示日期 如图所示
committer: heyu
2025-06-09 14:41:35 +08:00
heyu
e67ffd66d5 Merge pull request 'develop' (#46) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/46
2025-06-07 17:15:26 +08:00
4b9764efa0 demand:1.新增客户秘钥管理界面增删改查接口 2.新增客户对接tms下单接口
committer: heyu
2025-06-07 17:03:14 +08:00
heyu
080defd184 Merge pull request 'develop' (#45) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/45
2025-06-05 14:23:45 +08:00
b220c5a40a demand: 1.定时任务批量更新新提成统计某月统计数据为空时不会更新金额bug修复 2.根据单号重新计算提成增加校验问题件及支付方式相关场景
committer: heyu
2025-06-05 14:17:16 +08:00
6d06ca6fcc demand: 问题件登记、运单修改、运单录入、网点费用申请等相关场景下触发提成重算
committer: heyu
2025-06-04 09:57:56 +08:00
be6e3279d1 demand: 航线查询不支持按账单号查询bug修复,航线查询/导出支持按多个运单号/账单号查询/导出
committer: heyu
2025-06-03 11:45:21 +08:00
linfso
fa78be9f46 md 2025-05-30 19:53:43 +08:00
linfso
2a9f0f6078 md 2025-05-30 08:14:27 +08:00
linfso
ca29695c77 md 2025-05-30 08:01:16 +08:00
linfso
034ad477ce md 2025-05-30 07:09:38 +08:00
linfso
4e477336da md 2025-05-29 19:12:50 +08:00
linfso
68e6ebc416 md 2025-05-29 19:03:46 +08:00
linfso
8cb2a6012b md 2025-05-29 17:51:10 +08:00
linfso
bb2e950338 md 2025-05-29 17:39:55 +08:00
linfso
eb78a46cd0 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-05-29 17:22:32 +08:00
linfso
97f0b26b2d md 2025-05-29 17:22:20 +08:00
heyu
b02453b134 Merge pull request 'demand: 航线查询/导出按财务要求调整' (#44) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/44
2025-05-29 17:08:01 +08:00
94f31075dd demand: 航线查询/导出按财务要求调整
committer: heyu
2025-05-29 17:07:29 +08:00
heyu
5e7aca0701 Merge pull request 'demand: TMS系统 - 客户账单管理 - 收款信息查询 - 缴款客户是必填项,但是此界面显示的缴款客户为空呢' (#43) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/43
2025-05-29 14:23:29 +08:00
1e2f0fea17 demand: TMS系统 - 客户账单管理 - 收款信息查询 - 缴款客户是必填项,但是此界面显示的缴款客户为空呢
committer: heyu
2025-05-29 14:22:33 +08:00
heyu
d25cfd7144 Merge pull request 'demand:检查月结客户首次签约日期bug修改' (#42) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/42
2025-05-28 13:27:02 +08:00
90357b26ee demand:检查月结客户首次签约日期bug修改
committer: heyu
2025-05-28 13:26:19 +08:00
heyu
780868584e Merge pull request 'develop' (#41) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/41
2025-05-28 10:54:06 +08:00