666 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Administrator	1089f1b500	更新.gitlab-ci.yml文件	2024-07-22 15:51:28 +08:00
Administrator	a16bf976ae	Update .gitlab-ci.yml	2024-07-22 15:03:54 +08:00
章高华	5ceb748c29	sonarqube-check文件	2024-07-22 11:52:33 +08:00
liuzhaotian	80d623fe51	sonarqube代码检查文件	2024-07-22 11:28:36 +08:00
liuzhaotian	954304d722	Merge remote-tracking branch 'origin/main'	2024-07-22 11:17:31 +08:00
liuzhaotian	87a285c6af	允许外部配件重复，新增预打包接口	2024-07-22 11:17:13 +08:00
lym	366bd5084c	板材库去掉价格2	2024-07-19 18:12:49 +08:00
lym	6ffcdba99f	Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server	2024-07-19 16:00:58 +08:00
lym	e0253d3011	板材库去掉价格	2024-07-19 16:00:47 +08:00
liuzhaotian	24d35363f4	新增用户配置-缺少类增加-2.0	2024-07-19 14:53:27 +08:00
liuzhaotian	18b97d273b	新增用户配置-缺少类增加	2024-07-19 14:48:17 +08:00
liuzhaotian	d9ca5486ce	Merge remote-tracking branch 'origin/main'	2024-07-19 14:44:34 +08:00
liuzhaotian	43f705f602	新增用户配置	2024-07-19 14:44:21 +08:00
gaoqr	c398a02b0a	Merge remote-tracking branch 'origin/main'	2024-07-19 11:09:15 +08:00
gaoqr	7dddbd95e6	报表基础模块：1、模板获取、预览接口完善；2、增加ureport需要的第三方包及版本规范；	2024-07-19 11:09:09 +08:00
liuzhaotian	c9788110fb	排单参数修改	2024-07-19 09:40:02 +08:00
liuzhaotian	e7447c4a8c	Merge remote-tracking branch 'origin/main'	2024-07-18 18:39:30 +08:00
liuzhaotian	ccd6a390cc	排单-去除排单号-planNo	2024-07-18 18:39:08 +08:00
lym	14e326c251	文件导入新改-修改	2024-07-18 18:20:10 +08:00
lym	6e99cb7399	Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server	2024-07-18 15:45:13 +08:00
lym	5116e6d74a	文件导入新改	2024-07-18 15:45:05 +08:00
gaoqr	0d2f4d234d	代码规范修正	2024-07-18 15:24:48 +08:00
gaoqr	640c7f89fe	报表基础模块：1、测试连接、获取数据源表列表、获取表字段接口实现，部分入参检查、swagger参数、do类型转换完善；2、增加resources/lib下的ureport包依赖；	2024-07-18 15:16:59 +08:00
liuzhaotian	5f26418d08	Merge remote-tracking branch 'origin/main'	2024-07-17 10:22:05 +08:00
liuzhaotian	1ca74cf233	优化生产-加工组信息Bug修改	2024-07-17 10:21:54 +08:00
gaoqr	82885b9ca8	1、增加配置，system_notify_message_readinfo表暂不走多机构，移除DO中的organId；2、消息记录列表暂和我的消息走相同service实现；3、查询消息列表时userId作用于关联readinfo而不筛选message表本身	2024-07-16 15:18:21 +08:00
gaoqr	0e3a2a33d2	1、站内信相关查询移除redis中查询状态，改为已读后新增一条message_readinfo，相关方法逻辑修改，移除无用方法；2、全局GlobalExceptionHandler捕获BindException时丢出错误值而不是堆栈异常；	2024-07-16 10:51:07 +08:00
lym	aa09d8e96c	首页-新统计1	2024-07-15 18:20:42 +08:00
liuzhaotian	497cb3c88b	打包状态Bug修改	2024-07-12 18:52:19 +08:00
liuzhaotian	e6cd2b9540	打包状态，生产单状态，工序加逻辑修改	2024-07-12 18:44:39 +08:00
liuzhaotian	7b1c85a06d	Merge remote-tracking branch 'origin/main'	2024-07-12 14:47:35 +08:00
liuzhaotian	ec26101796	解决-计算用板量和优化生产小板重复-参数缺少解决	2024-07-12 14:47:21 +08:00
gaoqr	403f180611	Merge remote-tracking branch 'origin/main'	2024-07-12 14:45:33 +08:00
gaoqr	e9b8db8d04	报表基础模块：springbean数据源列表、加载bean数据源类方法接口实现	2024-07-12 14:45:24 +08:00
liuzhaotian	7343b4c5ec	解决-计算用板量和优化生产小板重复	2024-07-12 14:41:41 +08:00
liuzhaotian	96906201be	Merge remote-tracking branch 'origin/main'	2024-07-11 17:42:45 +08:00
liuzhaotian	70e5a394c2	分堆打包Bug修改-2.0	2024-07-11 17:42:33 +08:00
lym	87d9ebb22e	Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server	2024-07-11 17:36:25 +08:00
lym	02c4da859b	首页-统计1	2024-07-11 17:36:18 +08:00
gaoqr	5515d5d158	报表基础模块：目录结构细分调整	2024-07-11 16:55:46 +08:00
gaoqr	6081aa8487	Merge remote-tracking branch 'origin/main'	2024-07-11 16:01:06 +08:00
gaoqr	f75cf19fdc	报表基础模块：1、模拟前端保存、获取模板列表、查询模板详情接口对接及啊对应字段的调整；2、移除没用部分引用和代码（积木等）；	2024-07-11 16:00:22 +08:00
liuzhaotian	786df04d1d	分堆打包Bug修改	2024-07-11 15:55:49 +08:00
liuzhaotian	89fde5cc29	Merge remote-tracking branch 'origin/main'	2024-07-11 09:55:52 +08:00
liuzhaotian	6ca7c1d5aa	配件列表分页，查询参数修改	2024-07-11 09:55:42 +08:00
lym	0aafe646b6	Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server	2024-07-11 09:31:23 +08:00
lym	044bdb3163	生产单管理-列表时间修改	2024-07-11 09:31:15 +08:00
liuzhaotian	129f919405	Merge remote-tracking branch 'origin/main'	2024-07-10 18:47:54 +08:00
liuzhaotian	e3b5567acf	机台,标签接口返回错误修改,打包分页接口条件修改	2024-07-10 18:47:39 +08:00
lym	4bd39e579a	Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server	2024-07-10 10:00:13 +08:00