547 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
gaoqr	51663d06a7	报表基础模块：报表服务开启多数据源配置	2024-07-26 16:02:53 +08:00
lym	90b89f9da6	Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server	2024-07-26 11:18:46 +08:00
lym	f6e72c35b7	bug修改-权限获取	2024-07-26 11:18:37 +08:00
gaoqr	b6e7f88f20	报表基础模块：代码规范修复	2024-07-26 11:07:52 +08:00
liuzhaotian	d7d45accf2	Merge remote-tracking branch 'origin/main'	2024-07-24 17:20:38 +08:00
liuzhaotian	9ce3d2e57a	系统配置参数修改，新增空小板错误提示更改	2024-07-24 17:20:26 +08:00
Administrator	d1860e6796	Update pipeline.yml	2024-07-24 14:12:19 +08:00
liuzhaotian	320b6966fc	Merge remote-tracking branch 'origin/main'	2024-07-24 10:53:13 +08:00
liuzhaotian	738ee2bf73	分页打包接口参数修改，数据源字段key名称更改	2024-07-24 10:53:00 +08:00
gaoqr	89cf91fc07	报表基础模块：report-biz增加plugin配置includeSystemScope	2024-07-24 09:51:18 +08:00
gaoqr	4dc8b9e20b	权限问题修复：排单优化生产-删除小板调用接口 增加优化生产菜单的权限串	2024-07-24 09:37:13 +08:00
liuzhaotian	fb6752e05c	Merge remote-tracking branch 'origin/main'	2024-07-24 09:11:13 +08:00
liuzhaotian	540e840a8d	新增：机台获取数据源，新增数据源接口	2024-07-24 09:10:56 +08:00
gaoqr	426e37e67e	报表基础模块：1、模板接口补充校验；2、数据集实体补充organId；	2024-07-23 17:40:02 +08:00
gaoqr	e06e632f35	报表基础模块：获取模板信息、模板导出接口数据源不从xml中读取，走实际的数据库	2024-07-23 17:04:12 +08:00
liuzhaotian	86bf4f8cb8	Merge remote-tracking branch 'origin/main'	2024-07-23 14:30:14 +08:00
liuzhaotian	2eb3ca69b4	修改配件列表为全部返回	2024-07-23 14:30:03 +08:00
gaoqr	c744a66348	权限问题修复：排单优化生产-添加空小板调用接口 增加优化生产菜单的权限串	2024-07-23 14:29:47 +08:00
gaoqr	9db35ced9e	报表基础模块：模板导出支持pdf/word/excel	2024-07-23 14:13:35 +08:00
gaoqr	b8227c1494	Merge remote-tracking branch 'origin/main'	2024-07-23 11:31:26 +08:00
gaoqr	915e038219	报表基础模块：代码规范修复	2024-07-23 11:31:17 +08:00
刘照田	eb05c80eb0	Update cf-module-prod-executor/cf-module-prod-executor-biz/src/test/java/com/cf/imes/module/executor/service/plan/PlanServiceImplTest.java	2024-07-23 11:25:36 +08:00
gaoqr	c37b198611	Merge remote-tracking branch 'origin/main'	2024-07-23 11:23:49 +08:00
gaoqr	9f7f4aba72	报表基础模块：板材汇总-按板材报表excel导出实现：exec微服务rpc接口、report微服务rpc接口实现；	2024-07-23 11:23:41 +08:00
lym	30f276c355	Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server	2024-07-23 11:09:21 +08:00
lym	a95944a4a0	bug修改-plate	2024-07-23 11:09:13 +08:00
Administrator	d9999377c9	Update pom.xml	2024-07-22 17:33:12 +08:00
Administrator	4d51cf8c09	Update pipeline	2024-07-22 17:24:00 +08:00
Administrator	af7e19ce5d	上传新文件	2024-07-22 17:11:55 +08:00
Administrator	9dfe0f4b4f	Update .gitlab-ci.yml	2024-07-22 16:08:45 +08:00
Administrator	f480f199ea	Update pom.xml	2024-07-22 16:05:33 +08:00
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