Commit Graph

Select branches

Hide Pull Requests

dev

Mono Color

• ac06ad62d0 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-12-02 17:16:34 +08:00
• 0a803c367d 累积量 潘荣晟 2025-12-02 17:14:58 +08:00
• 8a4c49059d 累积量 潘荣晟 2025-12-02 17:14:01 +08:00
• 2aed717aa1 累积量 潘荣晟 2025-12-02 17:12:44 +08:00
• d821b9616e 修复删除订单明细提示错误 潘荣晟 2025-12-02 16:47:09 +08:00
• 969882b618 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-12-02 14:06:45 +08:00
• 04e94b752f 修复工厂名称赋值 潘荣晟 2025-12-02 12:03:32 +08:00
• 0c49865166 修改删除订单明细时的错误提示 潘荣晟 2025-12-02 09:54:25 +08:00
• 7b8787d096 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-12-01 16:55:20 +08:00
• 4ffa9eeb8f 冲销接口 潘荣晟 2025-12-01 16:42:44 +08:00
• e803bee452 修复订单明细删除提示词错误的问题 潘荣晟 2025-12-01 16:10:44 +08:00
• c3c004804b Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-12-01 10:49:07 +08:00
• 67d77b1765 服务型订单修复物料信息不返回的问题 潘荣晟 2025-12-01 10:26:21 +08:00
• d2f460b62f Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-11-28 15:41:42 +08:00
• ad0312fc39 Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-11-28 15:40:50 +08:00
• c53ef7cd7e 订单删除修改该报错逻辑 潘荣晟 2025-11-28 15:40:18 +08:00
• 250c0d9700 合同提交erp，访问erp接口暂时返回成功 guojunyun 2025-11-28 15:33:24 +08:00
• f30abf806b Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-11-28 14:08:45 +08:00
• 48d6408e92 销售订单明细添加含税单价 潘荣晟 2025-11-28 10:12:54 +08:00
• 240ad85a60 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-11-28 09:52:12 +08:00
• 49fcf1086d Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-11-28 09:41:54 +08:00
• 64e93cc009 订单采购接口物料处理 潘荣晟 2025-11-28 09:41:43 +08:00
• bd873339ee 添加备注 qianshijiang 2025-11-27 17:12:21 +08:00
• b82e7f127f Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-11-27 17:07:31 +08:00
• d356f0af46 设置订单初始量默认为0 潘荣晟 2025-11-27 16:51:56 +08:00
• 843dc28373 设置订单初始量默认为0 潘荣晟 2025-11-27 16:51:06 +08:00
• c4095ebe01 设置订单初始量默认为0 潘荣晟 2025-11-27 16:38:35 +08:00
• c936f5a5d3 设置订单初始量默认为0 潘荣晟 2025-11-27 15:52:05 +08:00
• 66bb1f6334 设置订单初始量默认为0 潘荣晟 2025-11-27 15:51:29 +08:00
• 084cecd7a5 销售订单明细删除校验 潘荣晟 2025-11-27 15:25:49 +08:00
• 4a08a2bebd Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-11-27 15:11:23 +08:00
• 1273f2433a 订单明细删除校验 潘荣晟 2025-11-27 15:05:14 +08:00
• 4652df3572 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-11-27 14:41:19 +08:00
• 322a454afa 订单明细删除校验 潘荣晟 2025-11-27 14:40:30 +08:00
• 7a403d226c 订单明细删除校验 潘荣晟 2025-11-27 14:38:34 +08:00
• 8a77acfa8b Merge branch 'refs/heads/dev' into test liss 2025-11-26 17:21:59 +08:00
• 0b695b0ed9 库位api,合同删除公司ID liss 2025-11-26 17:07:18 +08:00
• bad4a03b39 Merge branch 'refs/heads/dev' into test liss 2025-11-26 16:51:21 +08:00
• a3fe2403a7 库位api,合同删除公司ID liss 2025-11-26 16:50:37 +08:00
• 6bb603ea94 错误信息未记录到日志文件 qianshijiang 2025-11-26 15:45:56 +08:00
• 770036aecd 日志配置修改 qianshijiang 2025-11-26 10:38:00 +08:00
• a9a12c3044 合同作废，状态校验错误提示修改 guojunyun 2025-11-26 10:00:40 +08:00
• 2a3c10a84d nacos配置 qianshijiang 2025-11-26 08:57:35 +08:00
• d212a14840 Merge branch 'dev' into test chenbowen 2025-11-25 18:56:51 +08:00
• 75341ca6a9 1. 同步 nacos 配置到业务系统 chenbowen 2025-11-25 18:54:38 +08:00
• f8522ef6ae Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-11-25 16:43:22 +08:00
• a533b1eb49 添加销售订单明细中的备注字段 潘荣晟 2025-11-25 16:40:58 +08:00
• 0a178dc3f5 Merge branch 'refs/heads/dev' into test liss 2025-11-25 15:58:17 +08:00
• 176933b606 内部订单新增公司编码 liss 2025-11-25 15:57:37 +08:00
• 7b6fd3b390 Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-11-25 15:50:32 +08:00
• 696accd8d2 修复Feign接口。订单明细信息缺失 潘荣晟 2025-11-25 15:50:19 +08:00
• 75d08e32b1 优化 qianshijiang 2025-11-25 15:25:24 +08:00
• b237f3ea7b 添加DTO注释 潘荣晟 2025-11-25 15:14:25 +08:00
• 2febb69147 添加DTO注释 潘荣晟 2025-11-25 15:11:10 +08:00
• 1690dfe87c Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-11-25 14:47:38 +08:00
• e19056f021 更新计量单为 潘荣晟 2025-11-25 14:45:52 +08:00
• 1b5f5f3874 Merge branch 'dev' into test chenbowen 2025-11-25 10:41:39 +08:00
• bbc1970215 1. 修复 base 编译错误 chenbowen 2025-11-25 10:41:27 +08:00
• 306d969bc1 Merge branch 'dev' into test chenbowen 2025-11-25 09:40:18 +08:00
• f4bb887f09 1. 升级私有包版本 chenbowen 2025-11-25 09:37:43 +08:00
• 6adda4ac72 1. 调整业务 pod 资源检查的延时 chenbowen 2025-11-06 14:04:29 +08:00
• 2e65960bf1 1. 新增物料相关接口 2. 修复部分服务因为包名设置错误导致无法采集日志的错误 chenbowen 2025-11-06 13:41:56 +08:00
• 4f50e517b8 调整业务服务的时区 chenbowen 2025-10-27 11:41:18 +08:00
• 116f2ba386 合同数据结构修改、合同审核接口部分代码 guojunyun 2025-10-09 09:34:08 +08:00
• 1b9e28be5a 新增业务逻辑 潘荣晟 2025-09-30 17:35:39 +08:00
• 26be89f0c7 日志打印 qianshijiang 2025-11-24 14:42:55 +08:00
• d6eaa44020 删除dto表 潘荣晟 2025-11-24 14:31:05 +08:00
• 68af18ffa3 采购订单非空校验 潘荣晟 2025-11-24 11:32:37 +08:00
• a3e3e1c2bc Merge branch 'dev' into 'test' 孙承赐 2025-11-21 10:32:58 +00:00
• a0a9d741dd 开票检验erp相关接口 潘荣晟 2025-11-21 17:59:15 +08:00
• b4905ba143 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-11-20 15:26:57 +08:00
• 584998b129 SZHGYL-289修改 guojunyun 2025-11-20 15:23:37 +08:00
• b2c7ca399a 收发货单提交erp接口 guojunyun 2025-11-20 11:07:16 +08:00
• 5a4d79449e 权限标识 潘荣晟 2025-11-20 09:44:43 +08:00
• 216ecf75c5 权限标识 潘荣晟 2025-11-20 09:40:06 +08:00
• b337a9412c Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-11-19 17:58:18 +08:00
• cff5a9d31d supplierNumber赋值修改 guojunyun 2025-11-19 17:56:59 +08:00
• feb7b490c9 SZHGYL-289修改 guojunyun 2025-11-19 17:26:09 +08:00
• 8b187a6ff8 客商erp更新优化 liss 2025-11-19 16:45:36 +08:00
• d325ceb06a erp提交默认返回成功修改 guojunyun 2025-11-19 16:30:20 +08:00
• 7e282e80e4 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-11-19 16:22:06 +08:00
• 7ca81a74b5 Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-11-19 16:21:00 +08:00
• 58612efd77 销售订单明细修复订单单位不显示的问题 潘荣晟 2025-11-19 16:20:17 +08:00
• adcafa3784 Merge branch 'dev' into test chenbowen 2025-11-19 15:44:24 +08:00
• 05069e2846 SZHGYL-289修改 guojunyun 2025-11-19 15:15:37 +08:00
• f596500151 1. 升级私有包版本 chenbowen 2025-11-19 14:48:07 +08:00
• c39ffa54ee Merge branch 'dev' into 'test' 付鹏飞 2025-11-19 03:35:46 +00:00
• d5572c200b 销售订单明细修复订单不显示的问题 潘荣晟 2025-11-19 11:32:52 +08:00
• fb3dfaec48 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-11-19 11:10:09 +08:00
• dc37a2f587 Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-11-19 11:05:43 +08:00
• b7cfe7485e 【销售订单-订单检索】查询条件字段需要支持模糊查询修复 潘荣晟 2025-11-19 11:02:03 +08:00
• ed94355886 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-11-18 17:41:04 +08:00
• 685ba9473b 查询结算公式列表：增加明细列表数据返回 guojunyun 2025-11-18 14:44:31 +08:00
• 09f8db69c4 SZHGYL-251修改 guojunyun 2025-11-18 10:19:16 +08:00
• 925f4ab650 Merge branch 'refs/heads/dev' into test liss 2025-11-17 18:34:09 +08:00
• cfdeb40a23 金属元素新增BUG liss 2025-11-17 18:33:33 +08:00
• 10bfece481 Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-11-17 18:15:05 +08:00
• 79a760a379 开票检验 潘荣晟 2025-11-17 18:14:50 +08:00
• a65938b6af Merge branch 'refs/heads/dev' into test liss 2025-11-17 18:08:26 +08:00
• dd9142a670 金属元素缩新增分页查询，生产订单erp分页查询 liss 2025-11-17 18:07:54 +08:00