Commit Graph

Select branches

Hide Pull Requests

dev

Mono Color

• 9603c7f1a7 Merge branch 'refs/heads/dev' into test liss 2025-11-17 00:47:56 +08:00
• 8faa14d227 金属元素缩写重复校验，生产订单定时任务获取 liss 2025-11-17 00:45:26 +08:00
• 3230fb9a44 Merge branch 'dev' into 'test' 周迪 2025-11-14 14:06:38 +00:00
• 82219fd733 新增根据合同编号获得交易信息接口 guojunyun 2025-11-14 17:15:58 +08:00
• b5c7c9b479 Merge branch 'dev' into test hxt 2025-11-14 17:11:39 +08:00
• f797283021 订单单位 hxt 2025-11-14 17:10:39 +08:00
• 0d98763496 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-11-14 14:54:23 +08:00
• d382abba10 模版修改 潘荣晟 2025-11-14 14:51:20 +08:00
• a6922e57da 字符串转换 guojunyun 2025-11-14 14:43:15 +08:00
• 2d93ceda4f Merge branch 'refs/heads/dev' into test liss 2025-11-14 11:51:57 +08:00
• 1bcaca0d99 客商删除启用 liss 2025-11-14 11:51:31 +08:00
• c6b01740ea Merge branch 'dev' into 'test' wencai he 2025-11-14 01:49:37 +00:00
• d4998009a1 合同明细新增字段 guojunyun 2025-11-14 09:38:25 +08:00
• cc112ecec0 add:增加计量单位转换feign api hewencai 2025-11-13 19:23:54 +08:00
• e72e1c529c Merge branch 'refs/heads/dev' into test liss 2025-11-13 18:40:18 +08:00
• 5cf61ee5d2 bug修改，物料编辑、客商加税号、公司查询 liss 2025-11-13 18:39:42 +08:00
• 333cc203c3 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-11-13 17:53:25 +08:00
• 0ef0b5f060 模版修改 潘荣晟 2025-11-13 17:51:02 +08:00
• 057336c65a 模版修改 潘荣晟 2025-11-13 17:46:47 +08:00
• 1410eea250 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-11-13 09:17:08 +08:00
• 06cd342522 update:完善文档模板导出功能 hewencai 2025-11-12 17:52:56 +08:00
• bd306b7e45 模版修改 潘荣晟 2025-11-12 17:00:21 +08:00
• 4ce8386762 Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-11-12 15:33:41 +08:00
• e25df082b5 模版修改 潘荣晟 2025-11-12 15:27:37 +08:00
• f5c580cee6 Merge branch 'dev' into test chenbowen 2025-11-12 15:23:33 +08:00
• 75382dfbeb 1. 新增工序信息管理、工艺信息管理、组织工艺工序信息管理功能 chenbowen 2025-11-12 15:23:12 +08:00
• 33bea2cad0 更新合同接口：获取动态字段、表单报错修改 guojunyun 2025-11-12 11:08:12 +08:00
• 2ee461bef2 国贸推送合同接口：接口请求号参数名修改 guojunyun 2025-11-12 09:28:58 +08:00
• 1747b96d2b 国贸推送合同接口：接口请求号参数名修改 guojunyun 2025-11-12 09:28:20 +08:00
• e5e583d2c7 Merge branch 'dev' into 'test' 孙承赐 2025-11-11 10:31:06 +00:00
• 1f949f7013 合同动态字段及条款修改 guojunyun 2025-11-11 17:26:31 +08:00
• b0f4dbfb52 Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-11-11 17:10:15 +08:00
• 5b55175310 模版修改 潘荣晟 2025-11-11 17:10:00 +08:00
• edfd72ea68 国贸推送合同对接修改 guojunyun 2025-11-11 15:53:17 +08:00
• 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