潘荣晟
|
2c5ac2499b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-10-31 18:06:14 +08:00 |
|
潘荣晟
|
205d678a0e
|
1、修改bug
|
2025-10-31 18:05:55 +08:00 |
|
qianshijiang
|
928bb40dd5
|
订单分类
|
2025-10-31 17:04:02 +08:00 |
|
qianshijiang
|
662df70065
|
规范
|
2025-10-31 16:33:59 +08:00 |
|
潘荣晟
|
cf8ebc97bd
|
1、修改bug
|
2025-10-31 16:20:29 +08:00 |
|
潘荣晟
|
bc66fffde5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-10-31 16:15:57 +08:00 |
|
潘荣晟
|
d312926440
|
1、修改bug
|
2025-10-31 16:14:53 +08:00 |
|
qianshijiang
|
a43baf57a4
|
规范
|
2025-10-31 16:14:19 +08:00 |
|
guojunyun
|
2ba01afe48
|
修改合同：INSC_ID重复列名bug修改
|
2025-10-31 15:56:38 +08:00 |
|
guojunyun
|
3e0b0cab05
|
国贸2.0系统推送合同：接口逻辑修改
|
2025-10-31 15:21:09 +08:00 |
|
潘荣晟
|
f657cc8b76
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-10-31 11:28:08 +08:00 |
|
潘荣晟
|
6bec9f10fe
|
1、修改bug
|
2025-10-31 11:27:21 +08:00 |
|
guojunyun
|
bfe90f3892
|
修改合同：更新逻辑修改
|
2025-10-31 09:45:13 +08:00 |
|
guojunyun
|
559c36b78f
|
合同接口新增国贸2.0系统推送合同、国贸2.0系统合同分页查询接口
|
2025-10-31 09:27:52 +08:00 |
|
潘荣晟
|
8287b0aa25
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-10-30 18:03:41 +08:00 |
|
潘荣晟
|
90e145a4ad
|
1、新增批量提交审批的接口
|
2025-10-30 18:02:52 +08:00 |
|
qianshijiang
|
ff987c3397
|
规范
|
2025-10-30 17:42:02 +08:00 |
|
guojunyun
|
28fdeee248
|
合同提交erp：提交失败返回错误消息
|
2025-10-30 16:48:23 +08:00 |
|
潘荣晟
|
996bdd5623
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-10-30 16:16:41 +08:00 |
|
潘荣晟
|
9eb7efd088
|
1、修改bug
|
2025-10-30 16:15:15 +08:00 |
|
guojunyun
|
3b41c22f8a
|
更新合同：模板实例ID更新为null
|
2025-10-30 16:12:55 +08:00 |
|
guojunyun
|
172fa2be8e
|
删除合同：已驳回状态合同可删除
|
2025-10-30 15:25:04 +08:00 |
|
guojunyun
|
e76b5f0990
|
修改合同：执行中合同修改后重新提交erp；驳回状态合同修改后不修改合同状态为待审核
合同提交审核：驳回状态合同可提交审核，去除待审核状态
合同审核：bpm执行完成重新查询当前审批节点并更新合同审批信息
|
2025-10-30 15:10:55 +08:00 |
|
liss
|
24a774767b
|
分页查询，编码、名称优化为模糊查询
|
2025-10-30 10:11:45 +08:00 |
|
潘荣晟
|
d6fb9fcb22
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-10-30 09:38:42 +08:00 |
|
hxt
|
e6d3fe8584
|
erp查询接口修改
|
2025-10-30 09:29:53 +08:00 |
|
潘荣晟
|
a92e25c872
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-10-30 09:20:26 +08:00 |
|
hewencai
|
05a6278d18
|
update:移动计量单位管理模块位置
|
2025-10-29 18:59:47 +08:00 |
|
liss
|
09e76c0cdc
|
bug修改
|
2025-10-29 18:45:48 +08:00 |
|
chenbowen
|
ad54444ea8
|
ZT 远程仓库依赖强制更新
|
2025-10-29 18:23:26 +08:00 |
|
潘荣晟
|
0419b56b11
|
1、修改bug
|
2025-10-29 17:55:13 +08:00 |
|
hewencai
|
da23c67f41
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-10-29 17:35:49 +08:00 |
|
hewencai
|
d120479b12
|
feat:完善计量单位管理
|
2025-10-29 17:34:42 +08:00 |
|
guojunyun
|
fd9d83b430
|
获取合同详情接口返回是否内部企业（isInternal）字段
|
2025-10-29 17:22:11 +08:00 |
|
guojunyun
|
be4b1199ff
|
SZHGYL-56缺陷修正
|
2025-10-29 17:03:28 +08:00 |
|
guojunyun
|
c98605247f
|
SZHGYL-55缺陷修正
|
2025-10-29 16:48:49 +08:00 |
|
guojunyun
|
5e5db686c2
|
国贸2.0系统调用接口说明修改
|
2025-10-29 16:08:38 +08:00 |
|
chenbowen
|
21ac7f9828
|
物料、工艺基本增删改查逻辑
|
2025-10-29 16:05:51 +08:00 |
|
guojunyun
|
7a23d9ba3e
|
新增国贸2.0系统合同分页查询接口
修改国贸2.0系统合同创建接口：合同类型修改
合同主信息添加代理方名称字段
|
2025-10-29 15:59:58 +08:00 |
|
hewencai
|
d00aebb49d
|
feat:完善计量单位管理
|
2025-10-29 13:18:23 +08:00 |
|
hewencai
|
66845dcfab
|
feat:新增文档模板管理功能
|
2025-10-29 10:57:45 +08:00 |
|
潘荣晟
|
3ef662e1ec
|
1、修改bug
|
2025-10-29 10:17:34 +08:00 |
|
guojunyun
|
8edd99e0be
|
删除合同保存时erp公司校验
|
2025-10-29 09:36:34 +08:00 |
|
guojunyun
|
d35da7d10f
|
国贸2.0系统合同调用接口生成内部供应链的合同：常量设置
|
2025-10-29 09:27:33 +08:00 |
|
潘荣晟
|
73ca047ede
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-10-28 17:53:16 +08:00 |
|
潘荣晟
|
475609b3b2
|
1、修改bug
|
2025-10-28 17:52:42 +08:00 |
|
guojunyun
|
4106f89107
|
国贸2.0系统合同调用接口生成内部供应链的合同：修改删除操作逻辑
|
2025-10-28 17:43:50 +08:00 |
|
guojunyun
|
520673fd0e
|
国贸2.0系统合同调用接口生成内部供应链的合同：根据客商信息列表提交多个合同映射到erp
|
2025-10-28 17:14:25 +08:00 |
|
liss
|
1585b5611a
|
erp物料增加字段
|
2025-10-28 16:53:05 +08:00 |
|
guojunyun
|
ee3b372557
|
国贸2.0系统合同调用接口生成内部供应链的合同逻辑修改
|
2025-10-28 16:09:13 +08:00 |
|