chenbowen
|
758477f666
|
1. 调整业务 pod 资源检查的延时
|
2025-11-06 14:04:29 +08:00 |
|
chenbowen
|
1282ef43cc
|
1. 新增物料相关接口
2. 修复部分服务因为包名设置错误导致无法采集日志的错误
|
2025-11-06 13:41:56 +08:00 |
|
chenbowen
|
8acfaffb62
|
Merge branch 'dev' into test
|
2025-11-06 09:24:50 +08:00 |
|
chenbowen
|
d743175e4a
|
1. 修复 base 编译错误
2. build 追加 skywalking 集成
|
2025-11-06 09:23:41 +08:00 |
|
chenbowen
|
7cbb53856d
|
Merge branch 'refs/heads/dev' into test
|
2025-11-06 09:10:00 +08:00 |
|
chenbowen
|
72145fd402
|
1. 新增组织架构物料管理
2. 新增物料属性管理
3. 物料类别与信息管理
|
2025-11-06 09:09:26 +08:00 |
|
qianshijiang
|
d2b8f099ff
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-11-05 18:07:53 +08:00 |
|
guojunyun
|
48b9209fd1
|
提交erp暂时返回成功、方法注释修改
|
2025-11-05 14:57:53 +08:00 |
|
qianshijiang
|
0e66bdd8c9
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-11-05 10:36:53 +08:00 |
|
潘荣晟
|
73ae9563c5
|
新增通过消费订单明细id获取明细
|
2025-11-05 10:08:06 +08:00 |
|
guojunyun
|
a7872ab2c1
|
查询结果null值bug修改：查询不计价规则列表、查询参数降级规则列表接口、查询结算公式列表
|
2025-11-05 09:56:26 +08:00 |
|
qianshijiang
|
078de8d7d4
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-11-04 17:49:53 +08:00 |
|
guojunyun
|
320913a626
|
分页修改&sql添加未删除条件：查询不计价规则列表接口、查询参数降级规则列表接口、查询结算公式列表
|
2025-11-04 17:24:56 +08:00 |
|
潘荣晟
|
00ac5c1aef
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-11-04 16:48:17 +08:00 |
|
潘荣晟
|
8420a67fc3
|
新增返回属性 税码
|
2025-11-04 16:48:02 +08:00 |
|
qianshijiang
|
61387b5698
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-11-04 16:15:47 +08:00 |
|
guojunyun
|
bb96b9b6dd
|
国贸2.0系统合同分页查询：添加查询条件：合同有效期起、合同有效期止、签约地、签约日期；去除查询条件：合同编号
|
2025-11-04 15:30:04 +08:00 |
|
liss
|
c6a19b93b9
|
BUG-erp库位重复编码优化异常抛出
|
2025-11-03 17:51:13 +08:00 |
|
liss
|
94313a6f57
|
新增-erp库位重复编码优化异常抛出
|
2025-11-03 17:12:17 +08:00 |
|
liss
|
2654acf624
|
Merge branch 'refs/heads/dev' into test
|
2025-11-03 16:31:29 +08:00 |
|
liss
|
79fa52f39c
|
新增-erp物料查询接口api，post改get
|
2025-11-03 16:30:49 +08:00 |
|
liss
|
d7960a138c
|
Merge branch 'refs/heads/dev' into test
|
2025-11-03 16:04:36 +08:00 |
|
liss
|
189d2d6fb6
|
新增-erp物料查询接口api，get改post
|
2025-11-03 16:03:47 +08:00 |
|
guojunyun
|
25053c316e
|
国贸2.0系统合同分页查询：查询逻辑修改
|
2025-11-03 15:45:23 +08:00 |
|
liss
|
b6086b7118
|
Merge branch 'refs/heads/dev' into test
|
2025-11-03 15:38:51 +08:00 |
|
liss
|
57022e04c0
|
新增-erp物料查询接口api
|
2025-11-03 14:39:56 +08:00 |
|
潘荣晟
|
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
|
e6458fbb68
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-10-31 16:34:33 +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 |
|
qianshijiang
|
2117db4f1d
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-10-31 14:54:42 +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 |
|
liss
|
b31d0a5ae1
|
Merge branch 'refs/heads/dev' into test
|
2025-10-30 16:48:46 +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 |
|