潘荣晟
|
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 |
|
liss
|
40a2322cfb
|
erp 库位sql优化
|
2025-10-11 17:36:43 +08:00 |
|
guojunyun
|
2cd5df0d5f
|
字典枚举优化，合同提交erp功能编写，
|
2025-10-11 17:25:34 +08:00 |
|
liss
|
61802d4974
|
erp type 优化
|
2025-10-11 17:08:02 +08:00 |
|
liss
|
264596e542
|
Merge branch 'refs/heads/dev' into test
|
2025-10-11 16:55:15 +08:00 |
|
liss
|
42a81cbeb3
|
erp type 优化
|
2025-10-11 16:49:30 +08:00 |
|
liss
|
75280ec096
|
Merge branch 'refs/heads/dev' into test
|
2025-10-11 11:34:55 +08:00 |
|
liss
|
5923bfeb17
|
erp分页查询优化
|
2025-10-11 11:34:18 +08:00 |
|
liss
|
7fd3d4404c
|
erp分页查询优化
|
2025-10-11 11:27:27 +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 |
|
liss
|
72a9dff7c3
|
erp库位、物料优化
|
2025-10-10 19:11:48 +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 |
|
liss
|
30420ab96f
|
erp工厂新增、编辑、批量更新、定时任务、分页查询优化
|
2025-10-10 17:55:01 +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 |
|
liss
|
a271f1b8f5
|
ERP优化，物料TP默认ERP,合同查询直接查ERP
|
2025-10-10 15:05:51 +08:00 |
|
guojunyun
|
3ad87d6d29
|
新增时，判断甲方和乙方的ERP的公司编码和ERP公司名称是否存在，不存在则返回“请先绑定ERP公司信息”
合同主信息表结构修改
|
2025-10-10 10:41:12 +08:00 |
|
liss
|
9e87d811ef
|
测试
|
2025-10-10 09:54:23 +08:00 |
|
chenbowen
|
4956f81a83
|
修复 xxl-job 端口配置错误问题
|
2025-10-10 09:51:55 +08:00 |
|
guojunyun
|
6cb5903305
|
合同数据结构修改
|
2025-10-10 09:51:54 +08:00 |
|
guojunyun
|
895aaf7c2e
|
合同数据结构修改、合同审核接口部分代码
|
2025-10-10 09:51:54 +08:00 |
|
潘荣晟
|
f76338cf8a
|
新增业务逻辑
|
2025-10-10 09:51:54 +08:00 |
|
chenbowen
|
ad9116ef84
|
修复 xxl-job 端口配置错误问题
|
2025-10-10 09:50:25 +08:00 |
|
guojunyun
|
b3452902bc
|
合同数据结构修改
|
2025-10-09 16:53:38 +08:00 |
|
潘荣晟
|
968e13d1ba
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-10-09 14:22:39 +08:00 |
|
guojunyun
|
303ce4ec4d
|
合同数据结构修改、合同审核接口部分代码
|
2025-10-09 09:34:08 +08:00 |
|
chenbowen
|
556a7f5413
|
新增 xxl-job 回调端口映射
|
2025-10-09 09:17:54 +08:00 |
|
chenbowen
|
88063d84ae
|
新增 xxl-job 回调端口映射
|
2025-10-09 09:16:48 +08:00 |
|
潘荣晟
|
e0f1cb58aa
|
新增业务逻辑
|
2025-09-30 17:35:39 +08:00 |
|
liss
|
526ba98270
|
Merge branch 'refs/heads/dev' into test
|
2025-09-30 10:58:03 +08:00 |
|
liss
|
88b5ae2b64
|
优化异常抛出
|
2025-09-30 10:56:58 +08:00 |
|
zhangt
|
41250ab127
|
调整收货erp接口
|
2025-09-29 18:10:25 +08:00 |
|
guojunyun
|
1d9521b0d1
|
合同内容校验
|
2025-09-29 17:57:59 +08:00 |
|
guojunyun
|
a596b6f320
|
合同主信息字段添加、合同提交审核校验、合同新增接口修改
|
2025-09-29 16:19:38 +08:00 |
|
潘荣晟
|
db23f63cbf
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-29 15:50:38 +08:00 |
|
潘荣晟
|
7b304c1529
|
新增启用接口
|
2025-09-29 15:49:53 +08:00 |
|
liss
|
69680f83a2
|
Merge branch 'refs/heads/dev' into test
|
2025-09-29 12:01:33 +08:00 |
|
liss
|
e7a499fa01
|
账户添加字段
|
2025-09-29 12:00:59 +08:00 |
|
潘荣晟
|
9cdd7db87a
|
添加代码注释
|
2025-09-29 11:40:32 +08:00 |
|
潘荣晟
|
d1fa34f8e1
|
修复ErrorCodeConstants文件的内容
|
2025-09-29 11:27:21 +08:00 |
|