Commit Graph

2749 Commits

Author SHA1 Message Date
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