Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-13 05:12:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
449 Commits 2 Branches 1 Tag
ed3700d8ef6114675e89ed2f052d4e2c3883d789
Commit Graph
200 Commits
Author SHA1 Message Date
gaoqr 69a679ff77 1、菜单权限问题修复； 
2、增加修改菜单权限刷新本地缓存；
 2024-06-13 16:38:17 +08:00
liuzhaotian e8e2052be6 标签错误修改 2024-06-13 10:51:57 +08:00
liuzhaotian 90aeeb35a4 生产工序查询SQL增加组织ID,事务添加，包裹表名修改 2024-06-13 10:44:34 +08:00
lym 2e1c673be2 余料库接口完善修改 2024-06-11 10:04:09 +08:00
lym 1d5c0dd0de 预料管理修改1 2024-06-06 09:25:27 +08:00
lym 671d3701e4 造型数据修改 2024-05-30 17:41:37 +08:00
liuzhaotian ed7b782f38 Merge remote-tracking branch 'origin/main' 2024-05-29 14:09:47 +08:00
liuzhaotian 62ec2c105a 排单接口 - bug和参数修改 2024-05-29 14:09:34 +08:00
lym a2e57e91e7 文件上产下载修改 2024-05-28 18:17:14 +08:00
lym a13c17ec3b bug修改 2024-05-27 09:14:09 +08:00
lym 9efeddba6c Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-05-21 17:41:45 +08:00
lym 3cb6d5d3b4 bug修改 2024-05-21 17:41:35 +08:00
liuzhaotian 01d8ebe45e Merge remote-tracking branch 'origin/main' 2024-05-20 17:32:16 +08:00
liuzhaotian f2d7b6dc30 MyCat分表Organ_Id字段自动添加-获得生产单数据源参数添加 2024-05-20 17:32:00 +08:00
lym f1f79e18bd bug修改 2024-05-20 17:01:11 +08:00
lym 7553f1d2d7 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-05-17 18:05:11 +08:00
lym f936c39cad 数据完善 2024-05-17 18:05:03 +08:00
liuzhaotian 5260d7c9a3 Merge remote-tracking branch 'origin/main' 2024-05-14 16:05:47 +08:00
liuzhaotian 24a49e2b97 生产单板件-造型信息添加注解 2024-05-14 16:05:35 +08:00
lym cc6b56b0cc excel读DO 2024-05-14 16:02:21 +08:00
liuzhaotian 643e0ee3a0 生产工序代码-打包接口修改 2024-05-10 16:27:43 +08:00
lym f847b52ba4 api数据 2024-05-09 15:28:35 +08:00
yangsb 83e5324257 添加组织联系人手机参数验证 2024-04-30 17:42:23 +08:00
yangsb 5a96ab08a9 修复组织分页接口 sql or连接异常 2024-04-30 16:27:44 +08:00
yangsb e362f74ee2 处理用户分页查询sql ，or连接异常 2024-04-30 16:12:33 +08:00
yangsb 3ad488c972 处理组织分页接口异常 2024-04-30 15:10:40 +08:00
lym d5705c9d4b 数据结构修改 2024-04-30 09:14:02 +08:00
lym 5b06fca087 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-04-29 09:22:55 +08:00
lym 5a56d2734c 数据结构修改 2024-04-29 09:22:49 +08:00
yangsb e25acb2125 机台下拉选项接口添加组织id参数 2024-04-29 09:21:01 +08:00
yangsb 2d7dd7cbfb 新增机台下拉选项接口 2024-04-29 09:10:30 +08:00
lym d3f84b08f1 bug修改 2024-04-28 20:02:19 +08:00
lym 79d271d7bb Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-04-28 16:14:14 +08:00
lym 95e6477f28 数据结构修改 2024-04-28 16:14:06 +08:00
yangsb 6abbf2c990 处理用户新增、修改对状态的修改 2024-04-28 14:19:13 +08:00
liuzhaotian 70e410cb6f 生产工序代码-错误枚举修改 2024-04-28 09:25:58 +08:00
刘照田 b0b1b58821 Merge branch 'main' into 'LiuZt' 
# Conflicts:
#   cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
#   cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessGroupService.java
#   cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/process/GroupServiceImplTest.java
 2024-04-26 09:03:38 +00:00
yangsb 522108aaa8 优化获取是否管理员自动的方式，去除登出接口组织id依赖 2024-04-26 15:25:03 +08:00
yangsb 4186fd6cff 处理单元测试代码编译失败 2024-04-26 13:45:39 +08:00
yangsb c911cb444a 处理新增用户的异常 2024-04-26 11:23:16 +08:00
yangsb 83ca67a2df token中添加大型组织参数 2024-04-26 10:22:32 +08:00
yangsb a7eff5f294 修改mybatis自动插入的creator updater 字段为用户昵称 2024-04-25 17:45:18 +08:00
yangsb b73028b192 组织分页添加套餐名称字段 2024-04-25 15:48:03 +08:00
lym c7b2c28aa2 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-04-25 14:47:06 +08:00
lym cc00b46d9a bug修改 2024-04-25 14:46:59 +08:00
yangsb 2153f13a71 处理机台模板权限 2024-04-25 14:46:33 +08:00
yangsb 992f073d12 用户赋角色、角色配用户添加组织id参数，添加根据角色id查询用户列表接口 2024-04-25 11:40:51 +08:00
lym 316d021980 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-04-25 11:09:48 +08:00
lym 82e388372c bug修改 2024-04-25 11:09:39 +08:00
yangsb 9d2baef834 修改部门负责人字段，添加组织备注字段 2024-04-25 09:27:56 +08:00