Commit Graph

3285 Commits

Author SHA1 Message Date
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
heyu
35c163c692 Merge pull request 'demand: 批量扫描漏组批次订单扫描过滤未接单/已取消的运单,扫描过滤进口的虚拟单' (#99) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/99
2025-07-08 09:46:33 +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
0209bd896f Merge pull request 'develop' (#94) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/94
2025-07-07 10:30:20 +08:00
585c15a803 demand: 批量修改批次拼接名称问题修复
committer: heyu
2025-07-07 10:27:39 +08:00
linfso
6998a2ee54 Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service 2025-07-07 09:40:38 +08:00
linfso
15fbf4d573 md 2025-07-07 09:40:18 +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
heyu
1ffcef43a8 Merge pull request 'demand: 组批次规则新增/导入/修改/批量修改校验时间是否交叉。 批量修改报价验重去除自身' (#93) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/93
2025-07-04 18:10:22 +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