周迪
|
52ae765c54
|
Merge branch 'dev' into 'test'
合并
See merge request jygk/dsc-base!12
|
2025-10-16 13:14:36 +00:00 |
|
guojunyun
|
f7155565d4
|
新增作废接口
新增完结接口
修改合同新增逻辑：设置erp甲乙方公司编号、名称
保存erp合同映射表是设置删除状态
|
2025-10-16 17:06:32 +08:00 |
|
guojunyun
|
a2d9178c8e
|
删除无用接口
添加归档接口
提交审批接口调整
合同状态校验修改
更新接口修改
|
2025-10-16 16:10:31 +08:00 |
|
guojunyun
|
c78a465d52
|
下载文件接口完善
合同更新接口修改
|
2025-10-16 14:26:41 +08:00 |
|
liss
|
45d943a2dc
|
Merge branch 'refs/heads/dev' into test
|
2025-10-16 10:31:49 +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 |
|
潘荣晟
|
e5acac8fe3
|
订单管理相关
|
2025-10-15 17:28:53 +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 |
|
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 |
|
潘荣晟
|
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
|
6f53f89d10
|
Merge branch 'refs/heads/dev' into test
|
2025-10-14 14:33:30 +08:00 |
|
guojunyun
|
f1b90a51ac
|
合同提交erp功能编写
|
2025-10-14 09:37:28 +08:00 |
|
liss
|
c7d7679b6b
|
Merge branch 'refs/heads/dev' into test
|
2025-10-13 17:12:22 +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
|
f4d33f7f10
|
Merge branch 'refs/heads/dev' into test
|
2025-10-13 11:43:42 +08:00 |
|
潘荣晟
|
b50ec80484
|
订单管理相关
|
2025-10-13 11:10:41 +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 |
|
guojunyun
|
2cd5df0d5f
|
字典枚举优化，合同提交erp功能编写，
|
2025-10-11 17:25:34 +08:00 |
|
liss
|
75280ec096
|
Merge branch 'refs/heads/dev' into test
|
2025-10-11 11:34:55 +08:00 |
|
guojunyun
|
47f445e2bb
|
数据结构调整，通过合同编号获取对应的结算条款数据feign接口完善
|
2025-10-11 11:25:59 +08:00 |
|
liss
|
9ac4547d60
|
Merge branch 'refs/heads/dev' into test
# Conflicts:
# zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/ErrorCodeConstants.java
# zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java
# zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractNotSaveReqVO.java
# zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractSaveReqVO.java
# zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewNotRespVO.java
# zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewRespVO.java
# zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DetailRespVO.java
# zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DetailSaveReqVO.java
# zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulaRespVO.java
# zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulaSaveReqVO.java
# zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java
# zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java
# zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java
|
2025-10-11 09:50:49 +08:00 |
|
guojunyun
|
22ddb33564
|
品位等级价配置数据结构修改
|
2025-10-11 09:41:00 +08:00 |
|
潘荣晟
|
9011d8fc5a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-10-10 18:00:33 +08:00 |
|
潘荣晟
|
ee7cf01c81
|
订单管理相关
|
2025-10-10 18:00:17 +08:00 |
|
guojunyun
|
bd62556640
|
通过合同编号获取对应的结算条款数据feign接口相关
|
2025-10-10 17:53:02 +08:00 |
|
guojunyun
|
0534fcd991
|
基础系数配置数据结构修改
|
2025-10-10 17:34:33 +08:00 |
|
guojunyun
|
868ad9c20f
|
新增接口：查询不计价规则列表、查询参数降级规则列表、查询结算公式列表
修改调整价配置数据结构
调整vo文件
修改接口权限
|
2025-10-10 17:26:27 +08:00 |
|
guojunyun
|
3ad87d6d29
|
新增时，判断甲方和乙方的ERP的公司编码和ERP公司名称是否存在，不存在则返回“请先绑定ERP公司信息”
合同主信息表结构修改
|
2025-10-10 10:41:12 +08:00 |
|
guojunyun
|
6cb5903305
|
合同数据结构修改
|
2025-10-10 09:51:54 +08:00 |
|
guojunyun
|
895aaf7c2e
|
合同数据结构修改、合同审核接口部分代码
|
2025-10-10 09:51:54 +08:00 |
|