Commit Graph

Select branches

Hide Pull Requests

dev

Mono Color

• 9cdd7db87a 添加代码注释 潘荣晟 2025-09-29 11:40:32 +08:00
• d1fa34f8e1 修复ErrorCodeConstants文件的内容 潘荣晟 2025-09-29 11:27:21 +08:00
• 4d79d1c676 修复mapper的xml文件内容 潘荣晟 2025-09-29 11:07:30 +08:00
• c2170cb7e4 Merge branch 'dev' into 'test' 付鹏飞 2025-09-29 01:17:19 +00:00
• b95b35896d Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-09-28 17:53:17 +08:00
• 5d16c8b9ab 修改TemplateInstanceItemSaveReqVO类属性val的校验规则为可以为空 潘荣晟 2025-09-28 17:53:00 +08:00
• 26ecb030c9 合同提交审批、合同主信息字段修改、合同明细字段修改、合同内容校验、zt-module-base-server引入版本号引用变量修改 guojunyun 2025-09-28 17:45:19 +08:00
• 2dc7e2b312 Merge branch 'refs/heads/dev' into test liss 2025-09-28 17:06:47 +08:00
• 3860d7578e Merge remote-tracking branch 'origin/dev' into dev liss 2025-09-28 17:05:46 +08:00
• 04949bb027 物料管理decimal字段关键字冲突，改为decimalValue liss 2025-09-28 17:05:30 +08:00
• 86724233c8 Merge branch 'dev' into 'test' 付鹏飞 2025-09-28 08:51:35 +00:00
• 982506eabd Bug修复。主要修复内容校验条款和字段在同一个合同实例中的唯一性。 潘荣晟 2025-09-28 16:50:16 +08:00
• ccf3cf125f Merge branch 'dev' into 'test' 付鹏飞 2025-09-28 08:44:05 +00:00
• 9cd8a41863 Bug修复。主要修复内容校验条款和字段在同一个合同实例中的唯一性。 潘荣晟 2025-09-28 16:36:09 +08:00
• ced4c519dc 模版编制相关实现 潘荣晟 2025-09-28 16:26:00 +08:00
• a3611ee6f8 Merge branch 'dev' into 'test' 付鹏飞 2025-09-28 08:17:43 +00:00
• 66ef2a9264 Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-09-28 16:07:04 +08:00
• ca2b1c0b63 模版编制相关实现 潘荣晟 2025-09-28 16:06:21 +08:00
• 7965aa6eca 升级 3.0.41 chenbowen 2025-09-28 16:02:54 +08:00
• 646d847d46 模版编制相关实现 潘荣晟 2025-09-28 15:26:54 +08:00
• 6b77c9033e Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-09-28 15:11:53 +08:00
• 5463bc3d16 模版编制相关实现 潘荣晟 2025-09-28 15:11:23 +08:00
• 2e629b8dc9 统一设置 api 调用时路由的服务 chenbowen 2025-09-28 12:17:55 +08:00
• 32a5bb7d0a Merge branch 'refs/heads/dev' into test liss 2025-09-28 11:10:08 +08:00
• 1fb32bc43f 仓库最大code查询优化 liss 2025-09-28 11:09:32 +08:00
• 0723c45b96 公司、工厂新增ui对应缺少字段 liss 2025-09-28 10:47:10 +08:00
• 08c3ffef4f 1.升级版本 3.0.40 chenbowen 2025-09-28 00:39:22 +08:00
• 128f97f073 Merge branch 'dev' into 'test' 付鹏飞 2025-09-26 09:43:44 +00:00
• dca1830c1b 模版编制相关实现 潘荣晟 2025-09-26 17:41:55 +08:00
• da3065c637 Merge branch 'dev' into 'test' 付鹏飞 2025-09-26 09:17:41 +00:00
• fa7c08a493 模版编制相关实现 潘荣晟 2025-09-26 17:13:10 +08:00
• ba69d40776 Merge branch 'dev' into 'test' 付鹏飞 2025-09-26 08:45:10 +00:00
• abf9607c43 模版编制相关实现 潘荣晟 2025-09-26 16:43:34 +08:00
• 3e70de3977 Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-09-26 16:42:33 +08:00
• 7507a53c8a 模版编制相关实现 潘荣晟 2025-09-26 16:41:11 +08:00
• e3b918f0cb Merge branch 'refs/heads/dev' into test liss 2025-09-26 15:50:21 +08:00
• 163da2f79d 公司关系表因供应链公司没有，暂时用id代替code，优化import liss 2025-09-26 15:49:55 +08:00
• 7683356829 Merge branch 'refs/heads/dev' into test liss 2025-09-26 15:10:02 +08:00
• c347e3beb3 Merge remote-tracking branch 'origin/dev' into dev liss 2025-09-26 15:09:00 +08:00
• 72b1097c0f 联系人，账户条款新增字段，公司配置字段优化 liss 2025-09-26 15:08:27 +08:00
• eab5668023 模版编制相关实现 潘荣晟 2025-09-26 14:59:38 +08:00
• b373f9c308 1.升级版本 3.0.39 chenbowen 2025-09-26 14:03:28 +08:00
• 94cf112651 Merge branch 'refs/heads/dev' into test liss 2025-09-26 12:02:17 +08:00
• a2ec48fd94 仓库配置编码自动生成，公司配置批量更新 liss 2025-09-26 12:01:03 +08:00
• c81e96a80d Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-09-26 11:12:50 +08:00
• 73cc6f6ee3 模版编制相关实现 潘荣晟 2025-09-26 11:12:36 +08:00
• ecd27a3510 工厂配置编码自动生成 liss 2025-09-26 10:06:11 +08:00
• 8f677c0b4c 工厂配置编码自动生成 liss 2025-09-26 10:04:09 +08:00
• 4a760c70d5 1.升级版本 3.0.38 chenbowen 2025-09-25 19:36:34 +08:00
• b53dac572f Merge branch 'dev' into 'test' 付鹏飞 2025-09-25 10:11:39 +00:00
• 0149b66631 Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-09-25 18:08:35 +08:00
• 7f940ff257 新增管理的发布时间字段 潘荣晟 2025-09-25 18:08:09 +08:00
• 9404ce576c Merge remote-tracking branch 'origin/dev' into dev zhangt 2025-09-25 18:07:37 +08:00
• 409173e854 调整收货erp接口 zhangt 2025-09-25 18:07:28 +08:00
• 17f73bd5c2 基础数据批量更新接口 liss 2025-09-25 17:46:30 +08:00
• a2699537d9 修改调用erp方法参数错误问题 zhangt 2025-09-25 16:19:38 +08:00
• b7c88f8e16 Merge remote-tracking branch 'origin/dev' into dev zhangt 2025-09-25 15:43:05 +08:00
• 0f6d7de996 新增发货单ERP接口 zhangt 2025-09-25 15:42:24 +08:00
• ff18060b06 修改合同接口 guojunyun 2025-09-25 15:27:50 +08:00
• 327fd9bdcb 新增管理的发布时间字段 潘荣晟 2025-09-25 15:12:10 +08:00
• 26bdf3cbdf 模版编制的相关实现 潘荣晟 2025-09-25 15:09:05 +08:00
• 0929c14629 Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-09-25 15:07:35 +08:00
• df4be30cf3 模版编制的相关实现 潘荣晟 2025-09-25 15:03:39 +08:00
• 451db1f909 模版编制的相关实现 潘荣晟 2025-09-25 15:00:29 +08:00
• a902e61b02 金属元素实体继承修改 liss 2025-09-25 14:54:26 +08:00
• aa0a77370b 金属元素编码自动生成，公司中间表关联查询 liss 2025-09-25 14:31:43 +08:00
• 1eb013a7ac 优化import，部分回滚 liss 2025-09-25 10:58:19 +08:00
• cf232a2a79 优化import liss 2025-09-25 10:52:49 +08:00
• d02873140a 模版编制的相关实现 潘荣晟 2025-09-25 10:28:27 +08:00
• f3139a5edd Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-09-25 10:27:29 +08:00
• 0f197f0aa5 模版编制的相关实现 潘荣晟 2025-09-25 10:26:57 +08:00
• 44eb76d547 基础数据代码生成 liss 2025-09-25 10:19:11 +08:00
• 45d5ce0f3d 1.升级版本 3.0.37 chenbowen 2025-09-24 18:39:41 +08:00
• 41e1e139a3 生产订单查询直接调用ASP liss 2025-09-24 18:23:21 +08:00
• 4073af58ef 合同管理相关 guojunyun 2025-09-24 18:19:47 +08:00
• a9bbcf1090 Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-09-24 18:12:49 +08:00
• f945e9bfbd 模版编制的相关实现 潘荣晟 2025-09-24 18:12:14 +08:00
• 1266bb23c5 Pom，工艺路线测试 liss 2025-09-24 17:16:34 +08:00
• 071790f01a 优化封装post提交asp liss 2025-09-24 16:05:09 +08:00
• d49d5ae37d Merge remote-tracking branch 'origin/dev' into dev liss 2025-09-24 16:04:46 +08:00
• c3cd026f93 Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-09-24 15:57:41 +08:00
• 08e3b37e52 模版编制的相关实现 潘荣晟 2025-09-24 15:57:05 +08:00
• b8d8660356 pom，工艺路线，封装post提交asp liss 2025-09-24 15:27:45 +08:00
• 5937f38e83 合同编制保存 guojunyun 2025-09-24 14:21:29 +08:00
• 02f65c4f74 修改定时任务返回 liss 2025-09-24 12:07:45 +08:00
• 1dd55a02ae 测试url,erp改为base liss 2025-09-24 11:18:39 +08:00
• efab6957a3 测试url,sply改为erp liss 2025-09-24 10:02:03 +08:00
• 4b629100de Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-09-23 18:09:49 +08:00
• 9cd63f144a 模版编制的相关实现 潘荣晟 2025-09-23 18:08:50 +08:00
• 0fb22a2ee4 统一调整业务模块名称 chenbowen 2025-09-23 17:12:37 +08:00
• b998dade75 封装erp接口 liss 2025-09-23 16:38:37 +08:00
• 204e2ea510 Merge remote-tracking branch 'origin/dev' into dev 潘荣晟 2025-09-23 16:28:09 +08:00
• 41b8c3c323 模版编制的相关实现 潘荣晟 2025-09-23 16:27:46 +08:00
• db4d708978 封装接口，erp定时任务，调用缓存map替换list liss 2025-09-23 15:52:48 +08:00
• b3e65d4732 模版编制的相关实现 潘荣晟 2025-09-22 17:50:36 +08:00
• 0de35c9dde 模版编制的相关实现 潘荣晟 2025-09-22 17:42:09 +08:00
• c14837b5e2 模版编制的相关实现 潘荣晟 2025-09-22 17:12:46 +08:00
• 58e2827a21 统一修改包 chenbowen 2025-09-22 03:44:58 +08:00
• f014ca7cf3 合同管理相关 guojunyun 2025-09-21 21:01:15 +08:00
• aa0135707d Merge remote-tracking branch 'origin/dev' into dev guojunyun 2025-09-21 20:58:56 +08:00