Commit Graph

Select branches

Hide Pull Requests

dev

Mono Color

• 49fbe4c6f8 Merge remote-tracking branch 'origin/dev' into dev qianshijiang 2025-11-11 14:44:58 +08:00
• 80b81afbe0 订单分类 qianshijiang 2025-11-11 14:44:43 +08:00
• 750fdcc43d 模版修改 潘荣晟 2025-11-11 14:44:01 +08:00
• 81bde59906 模版修改 潘荣晟 2025-11-11 14:38:34 +08:00
• c30992fa75 模版修改 潘荣晟 2025-11-11 14:07:27 +08:00
• 717db0f3ce Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-11-11 14:05:14 +08:00
• ddfc7d8965 模版修改 潘荣晟 2025-11-11 11:52:35 +08:00
• 83c1f318e1 合同主信息do修改 guojunyun 2025-11-11 09:41:41 +08:00
• 10dd7966fa 合同主信息添加确实包导入 guojunyun 2025-11-11 09:37:29 +08:00
• e6aa0042d9 国贸2.0系统推送合同回调：消息固定R_JG_MY_00应答，_interfaceType__固定传R_MY_JG_10 合同主信息添加货权转移类型(字典：ASY_MTNG_TP)字段 guojunyun 2025-11-11 09:35:41 +08:00
• 08f6177007 Merge branch 'dev' into 'test' wencai he 2025-11-11 01:30:56 +00:00
• 37cb17bd7d Merge remote-tracking branch 'origin/dev' into dev hewencai 2025-11-11 09:29:22 +08:00
• 34ca30bb8b update:完善文档模板导出功能 hewencai 2025-11-11 09:27:22 +08:00
• c2fdfee149 国贸2.0系统推送合同：回调返回参数修改 guojunyun 2025-11-10 16:56:31 +08:00
• 1395e89633 Merge branch 'dev' into 'test' wencai he 2025-11-10 08:08:28 +00:00
• bb5375d256 金属元素新增排序 liss 2025-11-10 15:37:51 +08:00
• 1c11f52636 feat: 集成seata hewencai 2025-11-10 15:04:38 +08:00
• 712ce5606d 国贸2.0系统推送合同：日志修改 guojunyun 2025-11-10 14:23:02 +08:00
• 65d11fdc47 国贸2.0系统推送合同：处理结果异步返回 guojunyun 2025-11-10 11:21:30 +08:00
• b4540badbb Merge remote-tracking branch 'origin/dev' into dev hewencai 2025-11-10 10:54:35 +08:00
• e757aa4904 新增共享服务调用 guojunyun 2025-11-07 17:40:46 +08:00
• 886283cdf8 新增通过采购订单明细id获取明细 潘荣晟 2025-11-07 16:12:05 +08:00
• d7084b4f90 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-11-07 16:02:13 +08:00
• 3c121f6c1a 新增通过采购订单明细id获取明细 潘荣晟 2025-11-07 14:58:46 +08:00
• 42c8b75721 docs: 完善单位转换系统使用文档，添加Feign跨模块调用示例 hewencai 2025-11-06 18:09:57 +08:00
• 8b1e09736c 新增通过采购订单明细id获取明细 潘荣晟 2025-11-06 16:21:12 +08:00
• d8f495a94f Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-11-06 16:07:23 +08:00
• 292d4a534d 新增通过消费订单明细id获取明细 潘荣晟 2025-11-06 16:06:16 +08:00
• 758477f666 1. 调整业务 pod 资源检查的延时 chenbowen 2025-11-06 14:04:29 +08:00
• 1282ef43cc 1. 新增物料相关接口 2. 修复部分服务因为包名设置错误导致无法采集日志的错误 chenbowen 2025-11-06 13:41:56 +08:00
• 8acfaffb62 Merge branch 'dev' into test chenbowen 2025-11-06 09:24:50 +08:00
• d743175e4a 1. 修复 base 编译错误 2. build 追加 skywalking 集成 chenbowen 2025-11-06 09:23:41 +08:00
• 7cbb53856d Merge branch 'refs/heads/dev' into test chenbowen 2025-11-06 09:10:00 +08:00
• 72145fd402 1. 新增组织架构物料管理 2. 新增物料属性管理 3. 物料类别与信息管理 chenbowen 2025-11-06 09:09:26 +08:00
• d2b8f099ff Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-11-05 18:07:53 +08:00
• 48b9209fd1 提交erp暂时返回成功、方法注释修改 guojunyun 2025-11-05 14:57:53 +08:00
• 0e66bdd8c9 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-11-05 10:36:53 +08:00
• 73ae9563c5 新增通过消费订单明细id获取明细 潘荣晟 2025-11-05 10:08:06 +08:00
• a7872ab2c1 查询结果null值bug修改：查询不计价规则列表、查询参数降级规则列表接口、查询结算公式列表 guojunyun 2025-11-05 09:56:26 +08:00
• 078de8d7d4 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-11-04 17:49:53 +08:00
• 320913a626 分页修改&sql添加未删除条件：查询不计价规则列表接口、查询参数降级规则列表接口、查询结算公式列表 guojunyun 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
• 61387b5698 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-11-04 16:15:47 +08:00
• bb96b9b6dd 国贸2.0系统合同分页查询：添加查询条件：合同有效期起、合同有效期止、签约地、签约日期；去除查询条件：合同编号 guojunyun 2025-11-04 15:30:04 +08:00
• c6a19b93b9 BUG-erp库位重复编码优化异常抛出 liss 2025-11-03 17:51:13 +08:00
• 94313a6f57 新增-erp库位重复编码优化异常抛出 liss 2025-11-03 17:12:17 +08:00
• 2654acf624 Merge branch 'refs/heads/dev' into test liss 2025-11-03 16:31:29 +08:00
• 79fa52f39c 新增-erp物料查询接口api，post改get liss 2025-11-03 16:30:49 +08:00
• d7960a138c Merge branch 'refs/heads/dev' into test liss 2025-11-03 16:04:36 +08:00
• 189d2d6fb6 新增-erp物料查询接口api，get改post liss 2025-11-03 16:03:47 +08:00
• 25053c316e 国贸2.0系统合同分页查询：查询逻辑修改 guojunyun 2025-11-03 15:45:23 +08:00
• b6086b7118 Merge branch 'refs/heads/dev' into test liss 2025-11-03 15:38:51 +08:00
• 57022e04c0 新增-erp物料查询接口api liss 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
• 928bb40dd5 订单分类 qianshijiang 2025-10-31 17:04:02 +08:00
• e6458fbb68 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-10-31 16:34:33 +08:00
• 662df70065 规范 qianshijiang 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
• a43baf57a4 规范 qianshijiang 2025-10-31 16:14:19 +08:00
• 2ba01afe48 修改合同：INSC_ID重复列名bug修改 guojunyun 2025-10-31 15:56:38 +08:00
• 3e0b0cab05 国贸2.0系统推送合同：接口逻辑修改 guojunyun 2025-10-31 15:21:09 +08:00
• 2117db4f1d Merge remote-tracking branch 'origin/dev' into test qianshijiang 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
• bfe90f3892 修改合同：更新逻辑修改 guojunyun 2025-10-31 09:45:13 +08:00
• 559c36b78f 合同接口新增国贸2.0系统推送合同、国贸2.0系统合同分页查询接口 guojunyun 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
• ff987c3397 规范 qianshijiang 2025-10-30 17:42:02 +08:00
• b31d0a5ae1 Merge branch 'refs/heads/dev' into test liss 2025-10-30 16:48:46 +08:00
• 28fdeee248 合同提交erp：提交失败返回错误消息 guojunyun 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
• 3b41c22f8a 更新合同：模板实例ID更新为null guojunyun 2025-10-30 16:12:55 +08:00
• 172fa2be8e 删除合同：已驳回状态合同可删除 guojunyun 2025-10-30 15:25:04 +08:00
• e76b5f0990 修改合同：执行中合同修改后重新提交erp；驳回状态合同修改后不修改合同状态为待审核 合同提交审核：驳回状态合同可提交审核，去除待审核状态 合同审核：bpm执行完成重新查询当前审批节点并更新合同审批信息 guojunyun 2025-10-30 15:10:55 +08:00
• 24a774767b 分页查询，编码、名称优化为模糊查询 liss 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
• e6d3fe8584 erp查询接口修改 hxt 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
• f79074496b Merge branch 'dev' into 'test' wencai he 2025-10-29 11:01:41 +00:00
• 05a6278d18 update:移动计量单位管理模块位置 hewencai 2025-10-29 18:59:47 +08:00
• 09e76c0cdc bug修改 liss 2025-10-29 18:45:48 +08:00
• 0e14063fd7 Merge branch 'refs/heads/dev' into test chenbowen 2025-10-29 18:29:45 +08:00
• ad54444ea8 ZT 远程仓库依赖强制更新 chenbowen 2025-10-29 18:23:26 +08:00
• 0419b56b11 1、修改bug 潘荣晟 2025-10-29 17:55:13 +08:00
• ad83edbc58 Merge branch 'dev' into 'test' wencai he 2025-10-29 09:46:26 +00:00
• da23c67f41 Merge remote-tracking branch 'origin/dev' into dev hewencai 2025-10-29 17:35:49 +08:00
• d120479b12 feat:完善计量单位管理 hewencai 2025-10-29 17:34:42 +08:00
• fd9d83b430 获取合同详情接口返回是否内部企业（isInternal）字段 guojunyun 2025-10-29 17:22:11 +08:00
• be4b1199ff SZHGYL-56缺陷修正 guojunyun 2025-10-29 17:03:28 +08:00
• c98605247f SZHGYL-55缺陷修正 guojunyun 2025-10-29 16:48:49 +08:00
• 5e5db686c2 国贸2.0系统调用接口说明修改 guojunyun 2025-10-29 16:08:38 +08:00
• 0550711c90 Merge branch 'dev' into test chenbowen 2025-10-29 16:06:34 +08:00
• 21ac7f9828 物料、工艺基本增删改查逻辑 chenbowen 2025-10-29 16:05:51 +08:00
• 7a23d9ba3e 新增国贸2.0系统合同分页查询接口 修改国贸2.0系统合同创建接口：合同类型修改 合同主信息添加代理方名称字段 guojunyun 2025-10-29 15:59:58 +08:00