Commit Graph

3061 Commits

Author SHA1 Message Date
linfso
cfac49cb70 md 2025-07-07 16:52:08 +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
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
e49b4e960d md 2025-07-04 13:50:28 +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
heyu
75b249499f Merge pull request 'demand: 查询网点总部解禁' (#90) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/90
2025-07-04 13:29:35 +08:00
2d6a2da183 demand: 查询网点总部解禁
committer: heyu
2025-07-04 13:29:00 +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