Commit Graph

Select branches

Hide Pull Requests

dev

Mono Color

• 1b6772240e erp修改 dev qianshijiang 2026-01-28 11:40:27 +08:00
• 7e2473051b 销售提交erp 潘荣晟 2026-01-26 02:44:15 +08:00
• ea02e5af4e 来料加工订单 潘荣晟 2026-01-25 16:57:10 +08:00
• dad22ec7ec Merge branch 'dev' into test 潘荣晟 2026-01-23 18:34:19 +08:00
• ca62e80e37 Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2026-01-23 18:32:33 +08:00
• 75c1de4f90 来料加工订单 潘荣晟 2026-01-23 18:32:05 +08:00
• d2b814bb7d 来料加工订单 潘荣晟 2026-01-23 18:31:07 +08:00
• 5a6e561eb8 Merge branch 'dev' into 'test' 朝锦 杨 2026-01-23 07:05:21 +00:00
• 324d07d6c7 添加组织物料信息重复添加修改的简单验证 yangchaojin 2026-01-23 15:04:27 +08:00
• 240b64c41f Merge branch 'dev' into 'test' 朝锦 杨 2026-01-23 06:59:10 +00:00
• 2b7dd97c64 添加组织物料信息重复添加修改的简单验证 yangchaojin 2026-01-23 14:57:31 +08:00
• 7e08ec9ec4 委托加工订单 潘荣晟 2026-01-23 11:20:23 +08:00
• 923e420027 Merge branch 'dev' into test 潘荣晟 2026-01-23 11:15:33 +08:00
• be915bff5d 委托加工订单 潘荣晟 2026-01-23 11:13:07 +08:00
• 8d8a5eba9a Merge remote-tracking branch 'origin/dev' into test qianshijiang 2026-01-23 11:08:12 +08:00
• 9a82f22ce7 委托加工订单 潘荣晟 2026-01-23 11:02:50 +08:00
• b84faed0cc 委托加工订单 潘荣晟 2026-01-23 10:47:53 +08:00
• b934996b74 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2026-01-23 09:12:52 +08:00
• ec2d913bbf 物料产品查询接口优化 潘荣晟 2026-01-22 18:05:59 +08:00
• 8216466ee7 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2026-01-22 17:44:03 +08:00
• 707e7d779a 合同拆分金额与收发货规则优化 潘荣晟 2026-01-22 15:28:55 +08:00
• 1779f48a43 合同拆分金额与收发货规则优化 潘荣晟 2026-01-22 15:25:33 +08:00
• 6ba4bdec2c Merge branch 'dev' into test 潘荣晟 2026-01-22 15:03:26 +08:00
• 3352f6cbac 合同拆分金额与收发货规则优化 潘荣晟 2026-01-22 15:00:27 +08:00
• b8de5bfda7 合同拆分金额与收发货规则优化 潘荣晟 2026-01-22 11:49:37 +08:00
• 71ba93c7db 合同拆分金额 潘荣晟 2026-01-22 11:32:40 +08:00
• dc037e6abf Merge branch 'dev' into test 潘荣晟 2026-01-22 10:40:11 +08:00
• 515b79d115 个人配置文件 潘荣晟 2026-01-22 10:38:34 +08:00
• cc0f004288 个人配置文件 潘荣晟 2026-01-22 09:30:35 +08:00
• 07e921da06 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2026-01-22 09:28:51 +08:00
• 51638fa623 物料相关 潘荣晟 2026-01-22 09:27:09 +08:00
• 0b83979dfc 物料相关 潘荣晟 2026-01-21 18:31:11 +08:00
• d71300ee7f 物料相关 潘荣晟 2026-01-21 18:20:32 +08:00
• 8bb76b85ab 物料相关 潘荣晟 2026-01-21 17:22:59 +08:00
• 41634a720a Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2026-01-21 16:10:21 +08:00
• 1bb5c117d2 计划管理相关功能实现 潘荣晟 2026-01-21 16:09:35 +08:00
• 47473d9844 Merge branch 'dev' into test chenbowen 2026-01-21 11:25:53 +08:00
• 62fe6fb7cc 1. 修复 api 没有设置 requestbody 导致无法正常解析请求参数的bug chenbowen 2026-01-21 11:25:43 +08:00
• 33e5478ae3 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2026-01-21 09:09:45 +08:00
• 4007160524 计划管理相关功能实现 潘荣晟 2026-01-21 09:07:50 +08:00
• 15a3c07e8b Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2026-01-20 17:56:02 +08:00
• fec079e2fe 计划管理相关功能实现 潘荣晟 2026-01-20 17:55:35 +08:00
• 6d9dafe364 Merge branch 'dev' into 'test' 朝锦 杨 2026-01-20 09:36:41 +00:00
• a5f972db14 BUG712，组织机构物料信息功能中，扩展物料编码的属性查询条件支持 yangchaojin 2026-01-20 17:32:13 +08:00
• 7f271ce807 Merge branch 'dev' into 'test' 朝锦 杨 2026-01-20 03:02:32 +00:00
• b597920d55 修复BUG712，组织物料信息查询范围调整 yangchaojin 2026-01-20 09:23:25 +08:00
• 65dc1db9c1 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2026-01-19 17:53:04 +08:00
• 5f14fe798d 计划管理相关功能实现 潘荣晟 2026-01-19 17:47:34 +08:00
• 6602fcd6e3 计划管理相关功能实现 潘荣晟 2026-01-19 17:31:52 +08:00
• 2963fab2a6 feat(material): 修正提交（添加物料快捷添加功能） wuzongyong 2026-01-19 16:09:02 +08:00
• bee606926a feat(material): 修正提交（添加物料快捷添加功能） wuzongyong 2026-01-19 16:09:02 +08:00
• 78cd6e4cbd feat(material): 回退 提交 （feat(material): 添加物料快捷添加功能） 中的放开的createMaterialInfomation接口 wuzongyong 2026-01-19 15:47:26 +08:00
• 251176c88d feat(material): 添加物料快捷添加功能 wuzongyong 2026-01-19 15:44:47 +08:00
• 8d201b41f3 feat(material): 回退 提交 （feat(material): 添加物料快捷添加功能） 中的放开的createMaterialInfomation接口 wuzongyong 2026-01-19 15:47:26 +08:00
• 3ca290e274 feat(material): 添加物料快捷添加功能 wuzongyong 2026-01-19 15:44:47 +08:00
• 49b84fbf7b erp修改 qianshijiang 2026-01-19 14:49:18 +08:00
• bcf01d452d Merge remote-tracking branch 'origin/dev' into test qianshijiang 2026-01-16 17:07:09 +08:00
• 3ef89280ee 计划管理 潘荣晟 2026-01-16 17:04:06 +08:00
• 05de361806 计划管理 潘荣晟 2026-01-16 17:03:26 +08:00
• 79e1f91a1e Merge remote-tracking branch 'origin/dev' into test qianshijiang 2026-01-16 16:53:24 +08:00
• 38a6b695f0 新增销售订单明细装运地点非空校验 潘荣晟 2026-01-16 15:27:38 +08:00
• 27a61f78a3 新增通过销售订单明细id查询订单详情 潘荣晟 2026-01-16 15:24:07 +08:00
• 5bcf34ab44 Merge remote-tracking branch 'origin/dev' into test qianshijiang 2026-01-16 10:35:09 +08:00
• d77f4b1411 erp修改 qianshijiang 2026-01-16 10:34:44 +08:00
• 4d2c2ce6c4 1. 修复页面上传文件 500 错误 chenbowen 2026-01-16 10:26:01 +08:00
• d5df640fbf 1. 修复页面上传文件 500 错误 chenbowen 2026-01-16 10:06:06 +08:00
• 897d7e4d3e 1. 修复错误的权限校验信息 chenbowen 2026-01-16 10:00:32 +08:00
• ed8b9c808a 1. 统一物料类型以及物料信息的权限 chenbowen 2026-01-16 09:49:29 +08:00
• 5fd5b1fc35 1. 统一物料类型以及物料信息的权限 chenbowen 2026-01-16 09:45:57 +08:00
• 98dc345c5f 1. 新增帆软报表导入功能 2. 新增物料扩展牌号属性功能 chenbowen 2026-01-15 18:04:47 +08:00
• 3277fd5d89 Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2026-01-15 17:54:28 +08:00
• 08a0b4c1c9 物料权限 潘荣晟 2026-01-15 17:53:58 +08:00
• 2466b022cc erp修改 qianshijiang 2026-01-15 17:42:37 +08:00
• 6e5b24bb3a 联系人和税码去掉权限 潘荣晟 2026-01-15 17:40:14 +08:00
• 793a5acba9 联系人和税码去掉权限 潘荣晟 2026-01-15 17:25:24 +08:00
• 93aff069c5 联系人和税码去掉权限 潘荣晟 2026-01-15 17:13:42 +08:00
• f2f4170b0e Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2026-01-15 17:04:18 +08:00
• 5d812fb149 联系人和税码去掉权限 潘荣晟 2026-01-15 17:03:37 +08:00
• e7e1f0ace6 erp修改 qianshijiang 2026-01-15 16:55:01 +08:00
• cd5a942f7b 合同资金拆分实现 潘荣晟 2026-01-15 16:43:31 +08:00
• b819904205 Merge branch 'dev' into test ranke 2026-01-15 14:45:28 +08:00
• 7c61b8eacf 修改私服地址 ranke 2026-01-15 14:45:16 +08:00
• 22e0a30a74 1. 移除错误的引用 chenbowen 2026-01-15 12:01:47 +08:00
• a279414aef Merge branch 'refs/heads/dev' into test chenbowen 2026-01-15 11:29:57 +08:00
• 34205bc1a6 1. 移除错误的引用 chenbowen 2026-01-15 11:29:36 +08:00
• b2e56f1c7f Merge branch 'dev' into test ranke 2026-01-15 08:52:44 +08:00
• 5877705ac3 增加快照发布配置 ranke 2026-01-15 08:45:16 +08:00
• b5f142cc3e 数据库唯一校验 潘荣晟 2026-01-14 17:45:15 +08:00
• 62914e6055 Merge branch 'refs/heads/dev' into test chenbowen 2026-01-14 17:04:03 +08:00
• af6b6342c1 1. 提交主数据同步的数据源信息 chenbowen 2026-01-14 17:03:18 +08:00
• 11318f10b1 Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2026-01-14 15:50:26 +08:00
• 97b71a1e8c 数据库唯一校验 潘荣晟 2026-01-14 15:50:07 +08:00
• 1732d1424b erp修改 qianshijiang 2026-01-14 15:41:49 +08:00
• f8d83607a7 组织物料属性展示弹窗，新增通用物料属性的只读展示, 优化物料信息查询效率 http://172.16.46.63:31560/index.php?m=task&f=view&taskID=706 ranke 2026-01-14 15:25:00 +08:00
• 9ea70b0dc4 feat(job): 添加测试的xxljob wuzongyong 2026-01-14 15:21:42 +08:00
• bea4a3fe74 feat(job): 添加测试的xxljob wuzongyong 2026-01-14 15:21:42 +08:00
• f33259910b Merge remote-tracking branch 'origin/dev' into test qianshijiang 2026-01-14 14:37:38 +08:00
• c31b08f648 erp修改 qianshijiang 2026-01-14 14:37:15 +08:00
• cd294b3d3f erp修改 qianshijiang 2026-01-14 14:33:26 +08:00
• 3e93981058 权限标识相关功能修复 潘荣晟 2026-01-14 14:12:29 +08:00