Commit Graph

Select branches

Hide Pull Requests

dev

Mono Color

• 4b6bd9cec5 新增合同收发货规则 潘荣晟 2026-01-07 16:31:19 +08:00
• 7a0dbadf2e 新增合同收发货规则 潘荣晟 2026-01-07 16:20:01 +08:00
• cb554f35f3 新增合同收发货规则 潘荣晟 2026-01-07 16:10:45 +08:00
• 426c410818 refactor(material): 优化物料编码查询逻辑 wuzongyong 2026-01-07 11:14:46 +08:00
• 960c5b5b25 refactor(material): 优化物料编码查询逻辑 wuzongyong 2026-01-07 11:14:46 +08:00
• 9eb3198ce1 Merge branch 'dev' into test ranke 2026-01-07 09:28:46 +08:00
• 73df6ca1a5 组织架构物料管理增加克隆复制功能. http://172.16.46.63:31560/index.php?m=task&f=view&taskID=684 ranke 2026-01-07 09:13:05 +08:00
• 73b1a59a66 1. 统一计量单位菜单权限 chenbowen 2026-01-05 19:44:45 +08:00
• cbc1f0f853 1. 统一计量单位菜单权限 chenbowen 2026-01-05 19:44:45 +08:00
• 64fc98a479 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2026-01-04 17:46:23 +08:00
• 7a05d1bd3f 新增物料查询接口 潘荣晟 2026-01-04 17:44:10 +08:00
• 3c29066d5c 数据库配置修改 qianshijiang 2025-12-31 16:13:07 +08:00
• 92819cee70 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-12-31 15:43:59 +08:00
• 60f73d545a 新增物料查询接口 潘荣晟 2025-12-31 15:31:44 +08:00
• e09f094939 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-12-31 14:50:14 +08:00
• 9be0745c03 新增销售订单时默认销售状态为执行中 潘荣晟 2025-12-31 14:49:26 +08:00
• 7bc4577ff5 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-12-31 11:36:52 +08:00
• 90d3db4f6d fix： 1、联系人保存报错，去掉甲乙方必填选项 add： 1、新增工厂自动绑定的功能 2、新增工厂更新只能修改绑定的信息、绑定的编码和操作类型 潘荣晟 2025-12-31 11:35:15 +08:00
• be7bee1300 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-12-31 08:52:26 +08:00
• 69375988c2 物料拓展功能实现 潘荣晟 2025-12-30 18:08:59 +08:00
• 4bc69718d8 Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-12-30 18:08:46 +08:00
• 791fe644bf 物料拓展功能实现 潘荣晟 2025-12-30 17:55:08 +08:00
• b3cbd8cec1 打印日志 qianshijiang 2025-12-30 16:00:21 +08:00
• 9c02a24642 Merge branch 'dev' into test chenbowen 2025-12-30 10:59:17 +08:00
• 6c9cb29af2 1. 新增对应的物料信息 feign 接口 chenbowen 2025-12-30 10:58:44 +08:00
• 52a97db86e Merge branch 'dev' into test chenbowen 2025-12-29 17:58:07 +08:00
• 1ece64e911 新增物料拓展表 潘荣晟 2025-12-29 17:18:37 +08:00
• 960a34428e 计划定额代码迁移到改包后统一提交 jiangh 2025-12-29 16:52:46 +08:00
• 836b2ba65d fix:添加seata达梦数据库兼容补丁 hewencai 2025-12-29 16:14:09 +08:00
• 146f59c091 Revert "1. 临时切换集群配合测试" chenbowen 2025-12-27 13:16:10 +08:00
• 39034b257e 1. 临时切换集群配合测试 chenbowen 2025-12-27 12:19:22 +08:00
• d3df4bb2c7 Merge branch 'dev' into test chenbowen 2025-12-25 17:33:39 +08:00
• 529728fc0f 1. 物料新增统一展平属性的接口 2. 修正物料错误的名称 chenbowen 2025-12-25 17:33:15 +08:00
• 59067c07a5 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-12-25 11:12:50 +08:00
• 80128e275d 订单新增字段，元素实体类修改 潘荣晟 2025-12-25 10:41:39 +08:00
• cc5ba069b6 1. 同步主数据物料时，需要控制批次大小 chenbowen 2025-12-24 18:00:30 +08:00
• 3a682d0b23 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-12-23 17:14:41 +08:00
• 398432ddd1 国贸2.0推送接口与不提交erp 潘荣晟 2025-12-23 16:55:19 +08:00
• 84b44166ee Merge branch 'dev' into test chenbowen 2025-12-23 10:52:36 +08:00
• a2b9e04571 1. 升级版本 chenbowen 2025-12-23 10:50:22 +08:00
• c0958dc342 Merge branch 'dev' into test chenbowen 2025-12-15 14:28:36 +08:00
• d2471d3d8a 1. 修复主数据的物料信息ZT前缀时，存在层级判断错误的问题 chenbowen 2025-12-15 14:26:03 +08:00
• 8d0175a13d 1. 修复主数据的物料信息ZT前缀时，存在层级判断错误的问题 chenbowen 2025-12-15 14:26:03 +08:00
• ac27409776 Merge branch 'dev' into test chenbowen 2025-12-14 22:15:41 +08:00
• 7defbbed90 1. 修复主数据的物料信息ZT前缀时，存在层级判断错误的问题 chenbowen 2025-12-14 22:15:25 +08:00
• ec06f67098 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-12-10 17:12:29 +08:00
• 44d7945f0d 冲销接口路径优化 潘荣晟 2025-12-10 17:10:07 +08:00
• 227c9afc4c Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-12-09 09:44:04 +08:00
• ec1d99d06b 自定义sql添加删除过滤条件 潘荣晟 2025-12-08 18:17:58 +08:00
• 51ab71dc4c 自定义sql添加删除过滤条件 潘荣晟 2025-12-08 18:17:47 +08:00
• fe27a36e7c Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-12-08 17:30:36 +08:00
• f088f78338 自定义sql添加删除过滤条件 潘荣晟 2025-12-08 17:07:55 +08:00
• 2f82bf5d10 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-12-08 14:42:57 +08:00
• bb4043d8ce 订单旧接口新增字段meteringType 潘荣晟 2025-12-08 14:40:33 +08:00
• 6ff755a3da 合同批量更新字段 潘荣晟 2025-12-08 12:03:56 +08:00
• 823e66198c Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-12-05 09:12:35 +08:00
• a71c6756a4 合同批量更新字段 潘荣晟 2025-12-05 09:11:09 +08:00
• 9ac3405048 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-12-05 08:56:19 +08:00
• f4d4a2afe2 合同批量更新字段 潘荣晟 2025-12-04 17:49:31 +08:00
• 2cec8e01db Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-12-04 17:22:32 +08:00
• 088a7c3f2d 订单详情Feign老街接口优化订单没有单位 潘荣晟 2025-12-04 17:20:43 +08:00
• 93104c7cbb 把暂估数量改成数字类型 潘荣晟 2025-12-04 10:35:45 +08:00
• 37a9d622ee Merge remote-tracking branch 'origin/dev' into test qianshijiang 2025-12-04 08:58:50 +08:00
• 335ea4d9ec 1. 提出私服 skywalking 的依赖，使用 ZStack 自带链路追踪 chenbowen 2025-12-03 20:32:05 +08:00
• 3a5ec948fd 合同模版优化 潘荣晟 2025-12-03 17:58:05 +08:00
• b510dfa731 合同模版优化 潘荣晟 2025-12-03 17:37:13 +08:00
• 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