Commit Graph

529 Commits

Author SHA1 Message Date
liss
63f377b4b5 公司关系,逻辑优化 2025-10-16 10:31:15 +08:00
guojunyun
665975f3a1 下载文件接口
附件对象存储字段请求类型修改
2025-10-15 18:00:28 +08:00
潘荣晟
a935055e70 Merge remote-tracking branch 'origin/dev' into dev 2025-10-15 17:58:02 +08:00
潘荣晟
5ee8d3e02d 订单管理相关 2025-10-15 17:57:36 +08:00
liss
806cf51cee Merge branch 'refs/heads/dev' into test 2025-10-15 17:45:10 +08:00
liss
5be2b280e6 公司关系,逻辑优化 2025-10-15 17:44:29 +08:00
潘荣晟
e5acac8fe3 订单管理相关 2025-10-15 17:28:53 +08:00
chenbowen
3173a7509e 升级版本 2025-10-15 16:15:45 +08:00
guojunyun
201bd5e88a TODO 接口添加说明
其它附件对象存储请求字段类型修改
提交erp客商名称字段修改
2025-10-15 15:53:57 +08:00
guojunyun
568c309226 关联合同接口 2025-10-15 14:29:45 +08:00
liss
35018c8695 Merge branch 'refs/heads/dev' into test 2025-10-15 11:51:03 +08:00
liss
413fc19bbd 账户条款查询api测试 2025-10-15 11:50:37 +08:00
guojunyun
33d6453eac 移除获得未关联合同列表
新增获得上游未关联合同列表
新增获得下游未关联合同列表
2025-10-15 11:32:43 +08:00
guojunyun
a00dd53d9f 获得上游关联的合同数据接口
获得下游关联的合同数据接口
2025-10-15 11:18:07 +08:00
guojunyun
1bfff8f234 获得未关联合同列表 2025-10-15 11:03:27 +08:00
liss
1e3be1c93e 账户条款查询api 2025-10-15 11:02:56 +08:00
潘荣晟
979acacd27 Merge remote-tracking branch 'origin/dev' into dev 2025-10-15 10:52:36 +08:00
hxt
9c2fa2667f Merge branch 'refs/heads/dev' into test 2025-10-15 10:44:08 +08:00
潘荣晟
99b01e9cc3 订单管理相关 2025-10-15 10:39:52 +08:00
guojunyun
a9a0f04da7 提交erp功能修改 2025-10-14 18:00:39 +08:00
潘荣晟
adc11f9a50 订单管理相关 2025-10-14 17:56:35 +08:00
潘荣晟
a1747fba8b 订单管理相关 2025-10-14 17:40:18 +08:00
guojunyun
db04862660 根据系统合同编号获得合同详情口 2025-10-14 16:11:56 +08:00
guojunyun
a25e85cb8e 删除合同接口、提erp接口 2025-10-14 15:42:17 +08:00
liss
ac7f461e85 Merge branch 'refs/heads/dev' into test 2025-10-14 15:14:52 +08:00
liss
d0e7938e4d erp调用接口测试 2025-10-14 15:14:11 +08:00
liss
7a2e1c478c Merge branch 'refs/heads/dev' into test 2025-10-14 14:48:02 +08:00
liss
2cdcf23a4c erp物料新增必填限制解除 2025-10-14 14:47:06 +08:00
liss
6f53f89d10 Merge branch 'refs/heads/dev' into test 2025-10-14 14:33:30 +08:00
liss
f042ab88b3 erp注解修改 2025-10-14 10:14:27 +08:00
guojunyun
f1b90a51ac 合同提交erp功能编写 2025-10-14 09:37:28 +08:00
liss
b09e813518 Merge branch 'refs/heads/dev' into test 2025-10-13 18:01:46 +08:00
liss
8b584ab1af yml 修改 2025-10-13 18:01:23 +08:00
liss
c7d7679b6b Merge branch 'refs/heads/dev' into test 2025-10-13 17:12:22 +08:00
liss
8cce3a2aaa 优化erp查询异常抛出测试 2025-10-13 17:11:36 +08:00
潘荣晟
2268b802df 订单管理相关 2025-10-13 16:52:00 +08:00
潘荣晟
a2c39613d7 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/ContractApi.java
#	zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java
2025-10-13 16:43:37 +08:00
潘荣晟
bfdce8c90a 订单管理相关 2025-10-13 16:40:46 +08:00
guojunyun
83a11132b7 合同提交erp功能编写
通过合同编号获取对应的结算条款数据feign接口修改为通过合同编号获取对应的合同信息
2025-10-13 14:56:16 +08:00
liss
1e9666e574 Merge branch 'refs/heads/dev' into test 2025-10-13 11:53:27 +08:00
liss
b8be2bce92 优化erp查询异常抛出 2025-10-13 11:52:45 +08:00
liss
f4d33f7f10 Merge branch 'refs/heads/dev' into test 2025-10-13 11:43:42 +08:00
liss
0e7bea0e4d 优化缓存查询异常抛出 2025-10-13 11:42:42 +08:00
潘荣晟
b50ec80484 订单管理相关 2025-10-13 11:10:41 +08:00
liss
53e8820378 Merge branch 'refs/heads/dev' into test 2025-10-13 10:34:50 +08:00
liss
beb4f5ddaf 公司sql改为只查询公司级别 2025-10-13 10:34:16 +08:00
周迪
491ac810db Merge branch 'dev' into 'test'
toTest

See merge request jygk/dsc-base!11
2025-10-11 11:04:23 +00:00
潘荣晟
6531737f5d Merge remote-tracking branch 'origin/dev' into dev 2025-10-11 18:01:55 +08:00
潘荣晟
5119c6cdd5 订单管理相关 2025-10-11 18:01:39 +08:00
liss
f4cb41323a Merge branch 'refs/heads/dev' into test 2025-10-11 17:37:39 +08:00